projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix: only level 1 title and statistics were being displayed in worldmap.
[supertux.git]
/
src
/
supertux.cpp
diff --git
a/src/supertux.cpp
b/src/supertux.cpp
index
00fd2e1
..
c29d7f3
100644
(file)
--- a/
src/supertux.cpp
+++ b/
src/supertux.cpp
@@
-23,38
+23,44
@@
#include <iostream>
#include <exception>
#include <iostream>
#include <exception>
-#include "exceptions.h"
+#include "
utils/
exceptions.h"
#include "defines.h"
#include "defines.h"
-#include "globals.h"
-#include "setup.h"
+#include "
app/
globals.h"
+#include "
app/
setup.h"
#include "intro.h"
#include "title.h"
#include "gameloop.h"
#include "leveleditor.h"
#include "intro.h"
#include "title.h"
#include "gameloop.h"
#include "leveleditor.h"
-#include "
screen
/screen.h"
+#include "
video
/screen.h"
#include "worldmap.h"
#include "resources.h"
#include "worldmap.h"
#include "resources.h"
-#include "
screen
/surface.h"
+#include "
video
/surface.h"
#include "tile_manager.h"
#include "tile_manager.h"
-#include "gettext.h"
+#include "app/gettext.h"
+#include "player.h"
+#include "misc.h"
+#include "utils/configfile.h"
int main(int argc, char * argv[])
{
#ifndef DEBUG
try {
#endif
int main(int argc, char * argv[])
{
#ifndef DEBUG
try {
#endif
+ config = new MyConfig;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
-
- st_directory_setup();
- parseargs(argc, argv);
+
+ Setup::info(PACKAGE_NAME,PACKAGE,PACKAGE_VERSION);
+
+ Setup::directories();
+ Setup::parseargs(argc, argv);
-
st_audio_setup
();
-
st_video_setup(
);
-
st_joystick_setup
();
-
st_general_setup
();
+
Setup::audio
();
+
Setup::video(SCREEN_W,SCREEN_H
);
+
Setup::joystick
();
+
Setup::general
();
st_menu();
loadshared();
st_menu();
loadshared();
@@
-93,12
+99,13
@@
int main(int argc, char * argv[])
//SDL_Flip(screen);
unloadshared();
//SDL_Flip(screen);
unloadshared();
- st_general_free();
+ Setup::general_free();
+ st_menu_free();
TileManager::destroy_instance();
#ifdef DEBUG
Surface::debug_check();
#endif
TileManager::destroy_instance();
#ifdef DEBUG
Surface::debug_check();
#endif
-
st_
shutdown();
+
Termination::
shutdown();
#ifndef DEBUG // we want to see the backtrace in gdb when in debug mode
}
catch (SuperTuxException &e)
#ifndef DEBUG // we want to see the backtrace in gdb when in debug mode
}
catch (SuperTuxException &e)