projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fixes (timing and animation) on nolok
[supertux.git]
/
src
/
misc.h
diff --git
a/src/misc.h
b/src/misc.h
index
c95cb91
..
bef8878
100644
(file)
--- a/
src/misc.h
+++ b/
src/misc.h
@@
-19,15
+19,14
@@
#define SUPERTUX_MISC_H
#include "app/setup.h"
#define SUPERTUX_MISC_H
#include "app/setup.h"
-#include "app/globals.h"
-#include "resources.h"
+#include "app/gettext.h"
#include "gui/menu.h"
#include "utils/configfile.h"
#include "gui/menu.h"
#include "utils/configfile.h"
-#include "player.h"
#include "title.h"
#include "title.h"
+#include "resources.h"
#include "worldmap.h"
#include "gameloop.h"
#include "worldmap.h"
#include "gameloop.h"
-#include "
app/gettext
.h"
+#include "
object/player
.h"
class MyConfig : public Config
{
class MyConfig : public Config
{
@@
-44,16
+43,11
@@
enum OptionsMenuIDs {
MNID_SHOWFPS
};
MNID_SHOWFPS
};
-/* Screen proprities: */
-/* Don't use this to test for the actual screen sizes. Use screen->w/h instead! */
-#define SCREEN_W 800
-#define SCREEN_H 600
-
/* Handle changes made to global settings in the options menu. */
/* Handle changes made to global settings in the options menu. */
-void process_options_menu(
void
);
+void process_options_menu();
/* Create and setup menus. */
/* Create and setup menus. */
-void st_menu(
void
);
+void st_menu();
void st_menu_free();
#endif //SUPERTUX_MISC_H
void st_menu_free();
#endif //SUPERTUX_MISC_H