X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmisc.h;h=33902f0f48d8301819085bec782ec74607aad3b4;hb=810053f3d4fbacb77f22bb4c2c60f5615ad5ec36;hp=0fba8c7927476a651c8bd711f52bee3b7149de02;hpb=361c04772c1edc35e5c58c00489d77068560b546;p=supertux.git

diff --git a/src/misc.h b/src/misc.h
index 0fba8c792..33902f0f4 100644
--- 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);
 };
 
@@ -43,13 +41,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
-