testing Yeti image version, feel free to revert

[supertux.git] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index e74a854..26ac338 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -14,41 +14,29 @@
 //  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 "resources.h"
+#include "app/gettext.h"
 #include "gui/menu.h"
-#include "utils/configfile.h"
-#include "player.h"
+#include "gameconfig.h"
 #include "title.h"
+#include "resources.h"
 #include "worldmap.h"
-#include "gameloop.h"
-#include "app/gettext.h"
-
-class MyConfig : public Config
-{
-  public:
-    void customload(LispReader& reader);
-    void customsave(FILE * config);
-};
+#include "object/player.h"
 
 enum OptionsMenuIDs {
-  MNID_OPENGL,
   MNID_FULLSCREEN,
   MNID_SOUND,
-  MNID_MUSIC,
-  MNID_SHOWFPS
-  };
+  MNID_MUSIC
+};
 
 /* Handle changes made to global settings in the options menu. */
 void process_options_menu();
 
 /* Create and setup menus. */
-void st_menu();
-void st_menu_free();
-
-#endif //SUPERTUX_MISC_H
+void setup_menu();
+void free_menu();
 
+#endif