more level work

[supertux.git] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index c95cb91..33902f0 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -14,25 +14,23 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #ifndef SUPERTUX_MISC_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 "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);
 };
 
@@ -44,17 +42,11 @@ enum OptionsMenuIDs {
   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. */
-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
-