projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Huge code merge. This reflects the current status of my rewrite/restructuring. A...
[supertux.git]
/
src
/
supertux.c
diff --git
a/src/supertux.c
b/src/supertux.c
index
89216aa
..
ad86fd6
100644
(file)
--- a/
src/supertux.c
+++ b/
src/supertux.c
@@
-7,31
+7,11
@@
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/supertux/
bill@newbreedsoftware.com
http://www.newbreedsoftware.com/supertux/
- April 11, 2000 -
April 12, 2000
+ April 11, 2000 -
December 29, 2003
*/
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <SDL.h>
-#include <SDL_image.h>
-
-#ifdef LINUX
-#include <pwd.h>
-#include <sys/types.h>
-#include <ctype.h>
-#endif
-
-#include "defines.h"
-#include "globals.h"
-#include "setup.h"
-#include "intro.h"
-#include "title.h"
-#include "gameloop.h"
-#include "screen.h"
+#include "supertux.h"
/* --- MAIN --- */
/* --- MAIN --- */
@@
-46,15
+26,26
@@
int main(int argc, char * argv[])
parseargs(argc, argv);
parseargs(argc, argv);
- st_setup();
-
+ st_directory_setup();
+ st_audio_setup();
+ st_video_setup();
+ st_joystick_setup();
+ st_general_setup();
+
done = intro();
done = intro();
+ done = 0;
+
while (!done)
{
done = title();
if (!done)
while (!done)
{
done = title();
if (!done)
+ {
+ if(game_started)
done = gameloop();
done = gameloop();
+ else if(level_editor_started)
+ done = leveleditor(1);
+ }
}
clearscreen(0, 0, 0);
}
clearscreen(0, 0, 0);