Whoops, nasty malloc bug.

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 0eae638af8864af97cce3cad2c745d07bd9540e7..4c8326915dc57cb5e63dc1cd1fd4d9eed69c2ff5 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -227,7 +227,7 @@ Game * pgame = 0;
 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++)
     {
@@ -457,6 +457,8 @@ static inline int clamp_sdl_mouse_button(Uint8 button)
 static void sdlEventProc(const SDL_Event &e, Game &game)
 {
     int val;
+    SDLMod mod;
+
     switch(e.type)
        {
         case SDL_MOUSEMOTION:
@@ -529,13 +531,14 @@ static void sdlEventProc(const SDL_Event &e, Game &game)
                     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;
@@ -547,13 +550,14 @@ static void sdlEventProc(const SDL_Event &e, Game &game)
                     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;
     }
@@ -887,9 +891,6 @@ Boolean SetUp (Game & game)
 
     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)
@@ -898,6 +899,8 @@ Boolean SetUp (Game & game)
         return false;
     }
 
+    if (!cmdline("nomousegrab"))
+        SDL_WM_GrabInput(SDL_GRAB_ON);
 
 #elif (defined WIN32)
        //------------------------------------------------------------------
@@ -1389,7 +1392,34 @@ static bool try_launch_browser(const char *browser, const char *url)
         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
 
@@ -1639,8 +1669,16 @@ int main(int argc, char **argv)
 //             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)
@@ -2193,6 +2231,7 @@ int main(int argc, char **argv)
                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;
        }
@@ -2209,6 +2248,7 @@ int main(int argc, char **argv)
                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;
        }
@@ -2220,7 +2260,7 @@ int main(int argc, char **argv)
 
                while (true)
                {
-                       if(whichres<=0 || whichres>7){
+                       if(whichres<=0 || whichres>8){
                                whichres = 0;
                                width=640;
                                height=480;
@@ -2253,6 +2293,16 @@ int main(int argc, char **argv)
                                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))
                        {
@@ -2268,7 +2318,9 @@ int main(int argc, char **argv)
                                detail = 0;
                                break;
                        }
-                       else if (0 == whichres)
+                       else
+
+            if (0 == whichres)
                        {
                                break;
                        }
@@ -2348,7 +2400,7 @@ int main(int argc, char **argv)
 
        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)
        {
@@ -2627,10 +2679,6 @@ static bool load_png(const char *file_name, TGAImageRec &tex)
     if (!row_pointers)
         goto png_done;
 
-    retval = malloc(width * height * 4);
-    if (!retval)
-        goto png_done;
-
     if (!hasalpha)
     {
         png_byte *dst = tex.data;