projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added PoisonIvy badguy contributed by Stephen Groundwater
[supertux.git]
/
src
/
supertux.cpp
diff --git
a/src/supertux.cpp
b/src/supertux.cpp
index
23a3fcf
..
81856f6
100644
(file)
--- a/
src/supertux.cpp
+++ b/
src/supertux.cpp
@@
-25,7
+25,6
@@
#include <exception>
#include <locale.h>
#include <exception>
#include <locale.h>
-#include "utils/exceptions.h"
#include "defines.h"
#include "app/globals.h"
#include "app/setup.h"
#include "defines.h"
#include "app/globals.h"
#include "app/setup.h"
@@
-39,7
+38,6
@@
#include "video/surface.h"
#include "tile_manager.h"
#include "app/gettext.h"
#include "video/surface.h"
#include "tile_manager.h"
#include "app/gettext.h"
-#include "player.h"
#include "misc.h"
#include "utils/configfile.h"
#include "misc.h"
#include "utils/configfile.h"
@@
-95,14
+93,11
@@
int main(int argc, char * argv[])
unloadshared();
Setup::general_free();
st_menu_free();
unloadshared();
Setup::general_free();
st_menu_free();
- TileManager::destroy_instance();
#ifdef DEBUG
Surface::debug_check();
#endif
Termination::shutdown();
#ifndef DEBUG // we want to see the backtrace in gdb when in debug mode
#ifdef DEBUG
Surface::debug_check();
#endif
Termination::shutdown();
#ifndef DEBUG // we want to see the backtrace in gdb when in debug mode
- } catch (SuperTuxException &e) {
- std::cerr << "Unhandled SuperTux exception:\n " << e.what_file() << ":" << e.what_line() << ": " << e.what() << std::endl;
} catch (std::exception &e) {
std:: cerr << "Unhandled exception: " << e.what() << std::endl;
}
} catch (std::exception &e) {
std:: cerr << "Unhandled exception: " << e.what() << std::endl;
}