#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <dirent.h>
#include <unistd.h>
#include <assert.h>
#include <physfs.h>
#include "physfs/physfs_sdl.hpp"
#include "random_generator.hpp"
#include "worldmap/worldmap.hpp"
+#include "binreloc/binreloc.h"
SDL_Surface* screen = 0;
JoystickKeyboardController* main_controller = 0;
TinyGetText::DictionaryManager dictionary_manager;
+int SCREEN_WIDTH;
+int SCREEN_HEIGHT;
+
static void init_config()
{
config = new Config();
sprintf(mkdir, ".%s", application);
if(!PHYSFS_setWriteDir(userdir) || !PHYSFS_mkdir(mkdir)) {
std::ostringstream msg;
- msg << "Failed creating configuration directory '"
+ msg << "Failed creating configuration directory '"
<< writedir << "': " << PHYSFS_getLastError();
delete[] writedir;
delete[] mkdir;
throw std::runtime_error(msg.str());
}
delete[] mkdir;
-
+
if(!PHYSFS_setWriteDir(writedir)) {
std::ostringstream msg;
- msg << "Failed to use configuration directory '"
+ msg << "Failed to use configuration directory '"
<< writedir << "': " << PHYSFS_getLastError();
delete[] writedir;
throw std::runtime_error(msg.str());
}
}
}
-
+
PHYSFS_freeList(rc);
// when started from source dir...
if(f) {
fclose(f);
if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
- msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
+ log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
} else {
sourcedir = true;
}
}
#endif
+#ifdef _WIN32
+ PHYSFS_addToSearchPath(".\\data", 1);
+#endif
+
if(!sourcedir) {
#if defined(APPDATADIR) || defined(ENABLE_BINRELOC)
std::string datadir;
#ifdef ENABLE_BINRELOC
- char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME);
- datadir = brdatadir;
- free(brdatadir);
+
+ char* dir;
+ br_init (NULL);
+ dir = br_find_data_dir(APPDATADIR);
+ datadir = dir;
+ datadir += "/" PACKAGE_NAME;
+ free(dir);
+
#else
datadir = APPDATADIR;
#endif
" -f, --fullscreen Run in fullscreen mode\n"
" -w, --window Run in window mode\n"
" -g, --geometry WIDTHxHEIGHT Run SuperTux in given resolution\n"
+ " -a, --aspect WIDTH:HEIGHT Run SuperTux with given aspect ratio\n"
" --disable-sfx Disable sound effects\n"
" --disable-music Disable music\n"
" --help Show this help message\n"
" --version Display SuperTux version and quit\n"
+ " --console Enable ingame scripting console\n"
+ " --noconsole Disable ingame scripting console\n"
" --show-fps Display framerate in levels\n"
+ " --no-show-fps Do not display framerate in levels\n"
" --record-demo FILE LEVEL Record a demo to FILE\n"
" --play-demo FILE LEVEL Play a recorded demo\n"
"\n"));
}
+/**
+ * Options that should be evaluated prior to any initializations at all go here
+ */
+static bool pre_parse_commandline(int argc, char** argv)
+{
+ for(int i = 1; i < argc; ++i) {
+ std::string arg = argv[i];
+
+ if(arg == "--help") {
+ print_usage(argv[0]);
+ return true;
+ } else if(arg == "--version") {
+ std::cout << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
+ return true;
+ }
+ }
+
+ return false;
+}
+
+/**
+ * Options that should be evaluated after config is read go here
+ */
static bool parse_commandline(int argc, char** argv)
{
for(int i = 1; i < argc; ++i) {
print_usage(argv[0]);
throw std::runtime_error("Invalid geometry spec, should be WIDTHxHEIGHT");
}
+ } else if(arg == "--aspect" || arg == "-a") {
+ if(i+1 >= argc) {
+ print_usage(argv[0]);
+ throw std::runtime_error("Need to specify a parameter for aspect switch");
+ }
+ if(sscanf(argv[++i], "%d:%d", &config->aspectwidth, &config->aspectheight)
+ != 2) {
+ print_usage(argv[0]);
+ throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT");
+ }
} else if(arg == "--show-fps") {
config->show_fps = true;
+ } else if(arg == "--no-show-fps") {
+ config->show_fps = false;
+ } else if(arg == "--console") {
+ config->console_enabled = true;
+ } else if(arg == "--noconsole") {
+ config->console_enabled = false;
} else if(arg == "--disable-sfx") {
config->sound_enabled = false;
} else if(arg == "--disable-music") {
config->record_demo = argv[++i];
} else if(arg == "-d") {
config->enable_script_debugger = true;
- } else if(arg == "--help") {
- print_usage(argv[0]);
- return true;
- } else if(arg == "--version") {
- log_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
- return true;
} else if(arg[0] != '-') {
config->start_level = arg;
} else {
log_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl;
+ return true;
}
}
{
if(texture_manager != NULL)
texture_manager->save_textures();
-
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
-
+
int flags = SDL_OPENGL;
if(config->use_fullscreen)
flags |= SDL_FULLSCREEN;
}
#endif
+ // use aspect ratio to calculate logical resolution
+ if (config->aspectwidth > config->aspectheight) {
+ SCREEN_HEIGHT=600;
+ SCREEN_WIDTH=600*config->aspectwidth/config->aspectheight;
+ }
+ else {
+ SCREEN_WIDTH=600;
+ SCREEN_HEIGHT=600*config->aspectheight/config->aspectwidth;
+ }
+
// setup opengl state and transform
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
// logical resolution here not real monitor resolution
- glOrtho(0, 800, 600, 0, -1.0, 1.0);
+ glOrtho(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glTranslatef(0, 0, 0);
static void init_audio()
{
sound_manager = new SoundManager();
-
+
sound_manager->enable_sound(config->sound_enabled);
sound_manager->enable_music(config->music_enabled);
}
void wait_for_event(float min_delay, float max_delay)
{
assert(min_delay <= max_delay);
-
+
Uint32 min = (Uint32) (min_delay * 1000);
Uint32 max = (Uint32) (max_delay * 1000);
static inline void timelog(const char* component)
{
Uint32 current_ticks = SDL_GetTicks();
-
+
if(last_timelog_component != 0) {
log_info << "Component '" << last_timelog_component << "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl;
}
}
#endif
-int main(int argc, char** argv)
+int main(int argc, char** argv)
{
int result = 0;
-
+
try {
+
+ if(pre_parse_commandline(argc, argv))
+ return 0;
+
Console::instance = new Console();
init_physfs(argv[0]);
init_sdl();
-
+
timelog("controller");
- main_controller = new JoystickKeyboardController();
+ main_controller = new JoystickKeyboardController();
timelog("config");
init_config();
timelog("tinygettext");
init_audio();
timelog("video");
init_video();
- Console::instance->init_graphics();
+ Console::instance->init_graphics();
timelog("scripting");
Scripting::init_squirrel(config->enable_script_debugger);
timelog("resources");
- load_shared();
+ load_shared();
timelog(0);
- main_loop = new MainLoop();
+ main_loop = new MainLoop();
if(config->start_level != "") {
// we have a normal path specified at commandline not physfs paths.
// So we simply mount that path here...
// rain particles before we do this:
std::auto_ptr<GameSession> session (
new GameSession(FileSystem::basename(config->start_level)));
-
+
config->random_seed =session->get_demo_random_seed(config->start_demo);
init_rand();//initialise generator with seed from session
//init_rand(); PAK: this call might subsume the above 3, but I'm chicken!
main_loop->run();
-
} catch(std::exception& e) {
log_fatal << "Unexpected exception: " << e.what() << std::endl;
result = 1;
texture_manager = NULL;
SDL_Quit();
PHYSFS_deinit();
-
+
return result;
}
projects / supertux.git / blobdiff