Fixed crash on level editor by making a pos test.

[supertux.git] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index 0fba8c7..e005087 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -19,20 +19,19 @@
 #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 "player.h"
 #include "title.h"
+#include "resources.h"
 #include "worldmap.h"
 #include "gameloop.h"
-#include "app/gettext.h"
+#include "object/player.h"
 
 class MyConfig : public Config
 {
   public:
-    void customload(LispReader& reader);
+    void customload(const lisp::Lisp& reader);
     void customsave(FILE * config);
 };
 
@@ -43,12 +42,12 @@ enum OptionsMenuIDs {
   MNID_MUSIC,
   MNID_SHOWFPS
   };
-  
+
 /* Handle changes made to global settings in the options menu. */
-void process_options_menu(void);
+void process_options_menu();
 
 /* Create and setup menus. */
-void st_menu(void);
+void st_menu();
 void st_menu_free();
 
 #endif //SUPERTUX_MISC_H