static int _argc = 0;
static char **_argv = NULL;
-static bool cmdline(const char *cmd)
+bool cmdline(const char *cmd)
{
for (int i = 1; i < _argc; i++)
{
static void sdlEventProc(const SDL_Event &e, Game &game)
{
int val;
+ SDLMod mod;
+
switch(e.type)
{
case SDL_MOUSEMOTION:
SetKey(KeyTable[e.key.keysym.sym]);
}
- if (e.key.keysym.mod & KMOD_CTRL)
+ mod = SDL_GetModState();
+ if (mod & KMOD_CTRL)
SetKey(MAC_CONTROL_KEY);
- if (e.key.keysym.mod & KMOD_ALT)
+ if (mod & KMOD_ALT)
SetKey(MAC_OPTION_KEY);
- if (e.key.keysym.mod & KMOD_SHIFT)
+ if (mod & KMOD_SHIFT)
SetKey(MAC_SHIFT_KEY);
- if (e.key.keysym.mod & KMOD_CAPS)
+ if (mod & KMOD_CAPS)
SetKey(MAC_CAPS_LOCK_KEY);
return;
ClearKey(KeyTable[e.key.keysym.sym]);
}
- if (e.key.keysym.mod & KMOD_CTRL)
+ mod = SDL_GetModState();
+ if ((mod & KMOD_CTRL) == 0)
ClearKey(MAC_CONTROL_KEY);
- if (e.key.keysym.mod & KMOD_ALT)
+ if ((mod & KMOD_ALT) == 0)
ClearKey(MAC_OPTION_KEY);
- if (e.key.keysym.mod & KMOD_SHIFT)
+ if ((mod & KMOD_SHIFT) == 0)
ClearKey(MAC_SHIFT_KEY);
- if (e.key.keysym.mod & KMOD_CAPS)
+ if ((mod & KMOD_CAPS) == 0)
ClearKey(MAC_CAPS_LOCK_KEY);
return;
}
SDL_WM_SetCaption("Lugaru", "lugaru");
- if (!cmdline("nomousegrab"))
- SDL_WM_GrabInput(SDL_GRAB_ON);
-
SDL_ShowCursor(0);
if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
return false;
}
+ if (!cmdline("nomousegrab"))
+ SDL_WM_GrabInput(SDL_GRAB_ON);
#elif (defined WIN32)
//------------------------------------------------------------------
strcat(dst, " ");
strcat(dst, url);
}
- return(system(buf) == 0);
+
+ #define MAX_BROWSER_ARGS 512
+ char *args[MAX_BROWSER_ARGS];
+ char *path = NULL;
+ memset(args, '\0', sizeof (args));
+ path = args[0] = strtok(buf, " ");
+ if (path == NULL)
+ return false;
+
+ size_t i = 0;
+ for (i = 1; i < MAX_BROWSER_ARGS; i++)
+ {
+ args[i] = strtok(NULL, " ");
+ if (args[i] == NULL)
+ break;
+ }
+
+ if (i == MAX_BROWSER_ARGS)
+ return false;
+ #undef MAX_BROWSER_ARGS
+
+ //printf("calling execvp(\"%s\"", path);
+ //for (i = 0; args[i]; i++)
+ // printf(", \"%s\"", args[i]);
+ //printf("); ...\n\n\n");
+
+ execvp(path, args);
+ return(false); // exec shouldn't return unless there's an error.
}
#endif
// if(game.registernow){
if(regnow)
{
+ #if PLATFORM_LINUX // (this may not be necessary any more.)
+ launch_web_browser("http://www.wolfire.com/registerlinux.html");
+ #else
launch_web_browser("http://www.wolfire.com/registerpc.html");
+ #endif
}
+
+ #if PLATFORM_LINUX // (this may not be necessary any more.)
+ _exit(0); // !!! FIXME: hack...crashes on exit!
+ #endif
return 0;
}
catch (const std::exception& error)
if(width==840 && height==524)whichres=5;
if(width==1024 && height==640)whichres=6;
if(width==1344 && height==840)whichres=7;
+ if(width==1920 && height==1200)whichres=8;
return whichres;
}
if(width==840 && height==524)whichres=5;
if(width==1024 && height==640)whichres=6;
if(width==1344 && height==840)whichres=7;
+ if(width>=1920 && height>=1200)whichres=8;
return whichres;
}
while (true)
{
- if(whichres<=0 || whichres>7){
+ if(whichres<=0 || whichres>8){
whichres = 0;
width=640;
height=480;
width=1344;
height=840;
}
+ if(whichres==8){
+ width=1920;
+ height=1200;
+ }
+
+ // currently with SDL, we just use whatever the native bitdepth
+ // of the display is and don't care.
+ #if USE_SDL
+ break;
+ #endif
if ((detail != 0) && (resolutionDepths[whichres][1] != 0))
{
detail = 0;
break;
}
- else if (0 == whichres)
+ else
+
+ if (0 == whichres)
{
break;
}
extern int channels[100];
extern FSOUND_SAMPLE * samp[100];
- extern FSOUND_STREAM * strm[10];
+ extern FSOUND_STREAM * strm[20];
extern "C" void PlaySoundEx(int chan, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused)
{
if (!row_pointers)
goto png_done;
- retval = malloc(width * height * 4);
- if (!retval)
- goto png_done;
-
if (!hasalpha)
{
png_byte *dst = tex.data;