projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more work on forest level
[supertux.git]
/
src
/
supertux.cpp
diff --git
a/src/supertux.cpp
b/src/supertux.cpp
index
81856f6
..
46efc59
100644
(file)
--- a/
src/supertux.cpp
+++ b/
src/supertux.cpp
@@
-25,10
+25,8
@@
#include <exception>
#include <locale.h>
#include <exception>
#include <locale.h>
-#include "defines.h"
#include "app/globals.h"
#include "app/setup.h"
#include "app/globals.h"
#include "app/setup.h"
-#include "intro.h"
#include "title.h"
#include "gameloop.h"
#include "leveleditor.h"
#include "title.h"
#include "gameloop.h"
#include "leveleditor.h"
@@
-53,7
+51,7
@@
int main(int argc, char * argv[])
Setup::parseargs(argc, argv);
Setup::audio();
Setup::parseargs(argc, argv);
Setup::audio();
- Setup::video(
800, 600
);
+ Setup::video(
screen_width, screen_height
);
Setup::joystick();
Setup::general();
st_menu();
Setup::joystick();
Setup::general();
st_menu();