projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed problem with last_menu not being able to handle menues deeper than two submenues
[supertux.git]
/
src
/
supertux.cpp
diff --git
a/src/supertux.cpp
b/src/supertux.cpp
index
b4da511
..
0e9c7ce
100644
(file)
--- a/
src/supertux.cpp
+++ b/
src/supertux.cpp
@@
-10,13
+10,23
@@
April 11, 2000 - March 15, 2004
*/
April 11, 2000 - March 15, 2004
*/
-#include "supertux.h"
+
+#include <sys/types.h>
+#include <ctype.h>
+
+#include "defines.h"
+#include "globals.h"
+#include "setup.h"
+#include "intro.h"
+#include "title.h"
+#include "gameloop.h"
+#include "leveleditor.h"
+#include "screen.h"
+#include "worldmap.h"
#include "resources.h"
int main(int argc, char * argv[])
{
#include "resources.h"
int main(int argc, char * argv[])
{
- bool done;
-
st_directory_setup();
parseargs(argc, argv);
st_directory_setup();
parseargs(argc, argv);
@@
-25,10
+35,12
@@
int main(int argc, char * argv[])
st_joystick_setup();
st_general_setup();
st_menu();
st_joystick_setup();
st_general_setup();
st_menu();
+ loadshared();
if (launch_worldmap_mode)
{
if (launch_worldmap_mode)
{
- worldmap_run();
+ WorldMapNS::WorldMap worldmap;
+ worldmap.display();
}
else if (level_startup_file)
{
}
else if (level_startup_file)
{
@@
-37,18
+49,13
@@
int main(int argc, char * argv[])
}
else
{
}
else
{
- done = false;
- while (!done)
- {
- loadshared();
- done = title();
- unloadshared();
- }
+ title();
}
clearscreen(0, 0, 0);
updatescreen();
}
clearscreen(0, 0, 0);
updatescreen();
+ unloadshared();
st_shutdown();
return 0;
st_shutdown();
return 0;