X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmisc.h;h=26ac3387cabda21679296cc4d27f931467910365;hb=c0093d25093395cb62fc2526ab42be65a9f015b8;hp=c95cb9151c0691ff921707472ffa9d43b7eb7223;hpb=6d682d915eb92b08f2a92906a07d77f0749f0b6c;p=supertux.git

diff --git a/src/misc.h b/src/misc.h
index c95cb9151..26ac3387c 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -14,47 +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 "app/globals.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
+};
 
-/* 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_free();
-
-#endif //SUPERTUX_MISC_H
+void setup_menu();
+void free_menu();
 
+#endif