#include <stdexcept>
#include <sstream>
-#include <time.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cstdlib>
#include <sys/stat.h>
#include <sys/types.h>
-#include <dirent.h>
#include <unistd.h>
-#include <assert.h>
#include <physfs.h>
#include <SDL.h>
#include <SDL_image.h>
JoystickKeyboardController* main_controller = 0;
TinyGetText::DictionaryManager dictionary_manager;
+int SCREEN_WIDTH;
+int SCREEN_HEIGHT;
+
static void init_config()
{
config = new Config();
}
#endif
+#ifdef _WIN32
+ PHYSFS_addToSearchPath(".\\data", 1);
+#endif
+
if(!sourcedir) {
#if defined(APPDATADIR) || defined(ENABLE_BINRELOC)
std::string datadir;
#ifdef ENABLE_BINRELOC
char* dir;
- br_init (NULL);
- dir = br_find_data_dir(APPDATADIR);
+ br_init (NULL);
+ dir = br_find_data_dir(APPDATADIR);
datadir = dir;
datadir += "/" PACKAGE_NAME;
- free(dir);
+ free(dir);
#else
datadir = APPDATADIR;
PHYSFS_permitSymbolicLinks(1);
//show search Path
- for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++)
+ char** searchpath = PHYSFS_getSearchPath();
+ for(char** i = searchpath; *i != NULL; i++)
log_info << "[" << *i << "] is in the search path" << std::endl;
+ PHYSFS_freeList(searchpath);
}
static void print_usage(const char* argv0)
" -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"
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") {
static void init_rand()
{
- const char *how = config->random_seed? ", user fixed.": ", from time().";
-
config->random_seed = systemRandom.srand(config->random_seed);
- log_info << "Using random seed " << config->random_seed << how << std::endl;
+ //const char *how = config->random_seed? ", user fixed.": ", from time().";
+ //log_info << "Using random seed " << config->random_seed << how << std::endl;
}
void init_video()
}
#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);
{
int result = 0;
+#ifndef NO_CATCH
try {
+#endif
if(pre_parse_commandline(argc, argv))
return 0;
//init_rand(); PAK: this call might subsume the above 3, but I'm chicken!
main_loop->run();
+#ifndef NO_CATCH
} catch(std::exception& e) {
log_fatal << "Unexpected exception: " << e.what() << std::endl;
result = 1;
log_fatal << "Unexpected exception" << std::endl;
result = 1;
}
+#endif
delete main_loop;
main_loop = NULL;