projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved over some changes from cvs
[supertux.git]
/
src
/
supertux.cpp
diff --git
a/src/supertux.cpp
b/src/supertux.cpp
index
088222f
..
06cbbe7
100644
(file)
--- a/
src/supertux.cpp
+++ b/
src/supertux.cpp
@@
-23,12
+23,10
@@
#include <cctype>
#include <iostream>
#include <exception>
#include <cctype>
#include <iostream>
#include <exception>
+#include <locale.h>
-#include "utils/exceptions.h"
-#include "defines.h"
#include "app/globals.h"
#include "app/setup.h"
#include "app/globals.h"
#include "app/setup.h"
-#include "intro.h"
#include "title.h"
#include "gameloop.h"
#include "leveleditor.h"
#include "title.h"
#include "gameloop.h"
#include "leveleditor.h"
@@
-38,7
+36,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"
@@
-48,14
+45,9
@@
int main(int argc, char * argv[])
try {
#endif
config = new MyConfig;
try {
#endif
config = new MyConfig;
- setlocale(LC_ALL, "");
- (void) bindtextdomain(PACKAGE, LOCALEDIR);
- (void) textdomain(PACKAGE);
- (void) bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+
+ Setup::init(PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION);
- Setup::info(PACKAGE_NAME, PACKAGE, PACKAGE_VERSION);
-
- Setup::directories();
Setup::parseargs(argc, argv);
Setup::audio();
Setup::parseargs(argc, argv);
Setup::audio();
@@
-99,14
+91,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;
}