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;
}
// the context is destroyed and libGL unloaded by SDL_Quit().
pglDeleteTextures = glDeleteTextures_doNothing;
+ #if PLATFORM_LINUX
+ _exit(0); // !!! FIXME: hack...crashes on exit!
+ #endif
+
#elif (defined WIN32)
if (hRC)
{
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)
{