// 02111-1307, USA.
#include <sys/types.h>
-#include <ctype.h>
+#include <cctype>
#include <iostream>
-
#include <exception>
-#include "exceptions.h"
+#include "utils/exceptions.h"
#include "defines.h"
-#include "globals.h"
-#include "setup.h"
+#include "app/globals.h"
+#include "app/setup.h"
#include "intro.h"
#include "title.h"
#include "gameloop.h"
#include "leveleditor.h"
-#include "screen.h"
+#include "video/screen.h"
#include "worldmap.h"
#include "resources.h"
-#include "texture.h"
-#include "tile.h"
+#include "video/surface.h"
+#include "tile_manager.h"
+#include "app/gettext.h"
+#include "player.h"
+#include "misc.h"
+#include "utils/configfile.h"
int main(int argc, char * argv[])
{
+#ifndef DEBUG
try {
- st_directory_setup();
- parseargs(argc, argv);
+#endif
+ config = new MyConfig;
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+ bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+
+ Setup::info(PACKAGE_NAME,PACKAGE,PACKAGE_VERSION);
+
+ Setup::directories();
+ Setup::parseargs(argc, argv);
- st_audio_setup();
- st_video_setup();
- st_joystick_setup();
- st_general_setup();
+ Setup::audio();
+ Setup::video(SCREEN_W,SCREEN_H);
+ Setup::joystick();
+ Setup::general();
st_menu();
loadshared();
- if (launch_leveleditor_mode && level_startup_file)
+ if (launch_leveleditor_mode)
{
- leveleditor(level_startup_file);
+ LevelEditor leveleditor;
+
+ if(level_startup_file)
+ leveleditor.run(level_startup_file);
+ else
+ leveleditor.run();
+ }
+ else if (launch_worldmap_mode && level_startup_file)
+ {
+ // hack to make it possible for someone to give an absolute path
+ std::string str(level_startup_file);
+ unsigned int i = str.find_last_of("/", str.size());
+ if(i != std::string::npos)
+ str.erase(0, i+1);
+
+ WorldMapNS::WorldMap worldmap;
+ worldmap.loadmap(str);
+ worldmap.display();
}
else if (level_startup_file)
{
- GameSession session(level_startup_file, 1, ST_GL_LOAD_LEVEL_FILE);
+ GameSession session(level_startup_file, ST_GL_LOAD_LEVEL_FILE);
session.run();
}
else
title();
}
- clearscreen(0, 0, 0);
- updatescreen();
+ SDL_FillRect(screen, 0, 0);
+ //SDL_Flip(screen);
unloadshared();
- st_general_free();
+ Setup::general_free();
+ st_menu_free();
TileManager::destroy_instance();
#ifdef DEBUG
Surface::debug_check();
#endif
- st_shutdown();
+ Termination::shutdown();
+#ifndef DEBUG // we want to see the backtrace in gdb when in debug mode
}
catch (SuperTuxException &e)
{
{
std:: cerr << "Unhandled exception: " << e.what() << std::endl;
}
+#endif
return 0;
}