yeti cleanup and death animation rework, hitbox fix ups

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 71aa862..0520a31 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -311,9 +311,11 @@ static void check_gl_error()
       case GL_OUT_OF_MEMORY:
         errormsg = "out of memory";
         break;
+#ifdef GL_TABLE_TOO_LARGE
       case GL_TABLE_TOO_LARGE:
         errormsg = "table too large";
         break;
+#endif
       default:
         errormsg = "unknown error number";
         break;
@@ -538,8 +540,6 @@ int main(int argc, char** argv)
   main_loop = NULL;
 
   free_menu();
-  delete ScriptManager::instance;
-  ScriptManager::instance = NULL;
   unload_shared();
   quit_audio();
 
@@ -551,6 +551,8 @@ int main(int argc, char** argv)
   main_controller = NULL;
   delete Console::instance;
   Console::instance = NULL;
+  delete ScriptManager::instance;
+  ScriptManager::instance = NULL; 
   delete texture_manager;
   texture_manager = NULL;
   SDL_Quit();