projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
script/picnic scene cleanup of images
[supertux.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
ac8d85d
..
494209f
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-31,6
+31,7
@@
#include <sys/types.h>
#include <dirent.h>
#include <unistd.h>
#include <sys/types.h>
#include <dirent.h>
#include <unistd.h>
+#include <assert.h>
#ifndef WIN32
#include <libgen.h>
#endif
#ifndef WIN32
#include <libgen.h>
#endif
@@
-50,6
+51,10
@@
#include "game_session.h"
#include "file_system.h"
#include "game_session.h"
#include "file_system.h"
+#ifdef WIN32
+#define mkdir(dir, mode) mkdir(dir)
+#endif
+
SDL_Surface* screen = 0;
JoystickKeyboardController* main_controller = 0;
TinyGetText::DictionaryManager dictionary_manager;
SDL_Surface* screen = 0;
JoystickKeyboardController* main_controller = 0;
TinyGetText::DictionaryManager dictionary_manager;
@@
-276,14
+281,14
@@
void init_video()
// set icon
SDL_Surface* icon = IMG_Load(
// set icon
SDL_Surface* icon = IMG_Load(
- get_resource_filename("images/supertux.xpm").c_str());
+ get_resource_filename("images/
engine/icons/
supertux.xpm").c_str());
if(icon != 0) {
SDL_WM_SetIcon(icon, 0);
SDL_FreeSurface(icon);
}
#ifdef DEBUG
else {
if(icon != 0) {
SDL_WM_SetIcon(icon, 0);
SDL_FreeSurface(icon);
}
#ifdef DEBUG
else {
- std::cerr << "Warning: Couldn't find icon 'images/supertux.xpm'.\n";
+ std::cerr << "Warning: Couldn't find icon 'images/
engine/icons/
supertux.xpm'.\n";
}
#endif
}
#endif