]> git.jsancho.org Git - lugaru.git/blobdiff - Source/OpenGL_Windows.cpp
Merged with parent
[lugaru.git] / Source / OpenGL_Windows.cpp
index 302ec1dd6d94961f3743d83c1c8191cb5c379b67..f118ce7a6810413cd863ddeca95e54504db72b6e 100644 (file)
@@ -1,28 +1,58 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 
 #ifdef WIN32
-#include <vld.h>
+#define UINT8 WIN32API_UINT8
+#define UINT16 WIN32API_UINT16
+#define boolean WIN32API_boolean
+#include <windows.h>
+#undef UINT8
+#undef UINT16
+#undef boolean
 #endif
 
+
+
 #include "Game.h"
+extern "C" {
+       #include "zlib.h"
+       #include "png.h"
+   #ifdef WIN32
+               #define INT32 INT32_jpeg
+               #include "jpeglib.h"
+               #undef INT32
+       #else
+               #include "jpeglib.h"
+       #endif
+}
 
-#ifndef USE_DEVIL
-#  ifdef WIN32
-#    define USE_DEVIL
-#  endif
-#endif
+static bool load_image(const char * fname, TGAImageRec & tex);
+static bool load_png(const char * fname, TGAImageRec & tex);
+static bool load_jpg(const char * fname, TGAImageRec & tex);
+static bool save_image(const char * fname);
+static bool save_png(const char * fname);
 
-#if USE_DEVIL
-    #include "IL/il.h"
-    #include "IL/ilu.h"
-    #include "IL/ilut.h"
-#else
-    // just use libpng and libjpg directly; it's lighter-weight and easier
-    //  to manage the dependencies on Linux...
-    #include "png.h"
-    static bool load_image(const char * fname, TGAImageRec & tex);
-    static bool load_png(const char * fname, TGAImageRec & tex);
-    static bool load_jpg(const char * fname, TGAImageRec & tex);
-#endif
+
+#include "openal_wrapper.h"
 
 // ADDED GWC
 #ifdef _MSC_VER
@@ -87,15 +117,27 @@ extern float volume;
 #include "gamegl.h"
 #include "MacCompatibility.h"
 
+
 #ifdef WIN32
 #include <shellapi.h>
+#include "win-res/resource.h"
 #endif
 
-#include "fmod.h"
+using namespace std;
+
 
-#include "res/resource.h"
 
-using namespace std;
+SDL_Rect **resolutions = NULL;
+static SDL_Rect rect_1024_768 = { 0, 0, 1024, 768 };
+static SDL_Rect rect_800_600  = { 0, 0, 800,  600 };
+static SDL_Rect rect_640_480  = { 0, 0, 640,  480 };
+static SDL_Rect *hardcoded_resolutions[] = {
+    &rect_1024_768,
+    &rect_800_600,
+    &rect_640_480,
+    NULL
+};
+
 
 
 unsigned int resolutionDepths[8][2] = {0};
@@ -128,7 +170,53 @@ typedef struct tagPOINT {
 } POINT, *PPOINT; 
 #endif
 
-#if USE_SDL
+
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4273)
+#endif
+
+#define GL_FUNC(ret,fn,params,call,rt) \
+    extern "C" { \
+        static ret (GLAPIENTRY *p##fn) params = NULL; \
+        ret GLAPIENTRY fn params { rt p##fn call; } \
+    }
+#include "glstubs.h"
+#undef GL_FUNC
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+static bool lookup_glsym(const char *funcname, void **func)
+{
+    *func = SDL_GL_GetProcAddress(funcname);
+    if (*func == NULL)
+    {
+        fprintf(stderr, "Failed to find OpenGL symbol \"%s\"\n", funcname);
+        return false;
+    }
+    return true;
+}
+
+static bool lookup_all_glsyms(void)
+{
+    bool retval = true;
+    #define GL_FUNC(ret,fn,params,call,rt) \
+        if (!lookup_glsym(#fn, (void **) &p##fn)) retval = false;
+    #include "glstubs.h"
+    #undef GL_FUNC
+    return retval;
+}
+
+static void GLAPIENTRY glDeleteTextures_doNothing(GLsizei n, const GLuint *textures)
+{
+    // no-op.
+}
+
+
+
 void sdlGetCursorPos(POINT *pt)
 {
     int x, y;
@@ -140,17 +228,13 @@ void sdlGetCursorPos(POINT *pt)
 #define SetCursorPos(x, y) SDL_WarpMouse(x, y)
 #define ScreenToClient(x, pt)
 #define ClientToScreen(x, pt)
-#define MessageBox(hwnd,text,title,flags) STUBBED("msgbox")
+#ifdef MessageBox
+#undef MessageBox
 #endif
+#define MessageBox(hwnd,text,title,flags) STUBBED("msgbox")
 
-Point delta;
 
-#ifdef WIN32
-static const char g_wndClassName[]={ "LUGARUWINDOWCLASS" };
-static HINSTANCE g_appInstance;
-static HWND g_windowHandle;
-static HGLRC hRC;
-#endif
+Point delta;
 
 static bool g_button, fullscreen = true;
 
@@ -181,13 +265,31 @@ Boolean gDone = false, gfFrontProcess = true;
 
 Game * pgame = 0;
 
-static bool gMouseGrabbed = true;
+#ifndef __MINGW32__
+static int _argc = 0;
+static char **_argv = NULL;
+#endif
+
+bool cmdline(const char *cmd)
+{
+    for (int i = 1; i < _argc; i++)
+    {
+        char *arg = _argv[i];
+        while (*arg == '-')
+            arg++;
+        if (strcasecmp(arg, cmd) == 0)
+            return true;
+    }
+
+    return false;
+}
+
 
 // --------------------------------------------------------------------------
 
 void ReportError (char * strError)
 {
-#ifdef WIN32  // !!! FIXME.  --ryan.
+#ifdef _MSC_VER  // !!! FIXME.  --ryan.
        throw std::exception( strError);
 #endif
 
@@ -204,44 +306,11 @@ void ReportError (char * strError)
 
 void SetupDSpFullScreen ()
 {
-#ifdef WIN32
-       LOGFUNC;
-
-       if (fullscreen)
-       {
-               DEVMODE dmScreenSettings;
-               memset( &dmScreenSettings, 0, sizeof( dmScreenSettings));
-               dmScreenSettings.dmSize = sizeof( dmScreenSettings);
-               dmScreenSettings.dmPelsWidth    = kContextWidth;
-               dmScreenSettings.dmPelsHeight   = kContextHeight;
-               dmScreenSettings.dmBitsPerPel   = kBitsPerPixel;
-               dmScreenSettings.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-
-               // set video mode
-               if (ChangeDisplaySettings( &dmScreenSettings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
-               {
-                       ReportError( "Could not set display mode");
-                       return;
-               }
-       }
-
-       ShowCursor(FALSE);
-#endif
 }
 
 
 void ShutdownDSp ()
 {
-#ifdef WIN32
-       LOGFUNC;
-
-       if (fullscreen)
-       {
-               ChangeDisplaySettings( NULL, 0);
-       }
-
-       ShowCursor(TRUE);
-#endif
 }
 
 
@@ -251,12 +320,12 @@ void ShutdownDSp ()
 
 void DrawGL (Game & game)
 {
-#ifdef WIN32
-       if (hDC == 0)
-               return;
-#endif
-
-       game.DrawGLScene();
+       if ( stereomode == stereoNone ) {
+               game.DrawGLScene(stereoCenter);
+       } else {
+               game.DrawGLScene(stereoLeft);
+               game.DrawGLScene(stereoRight);
+       }
 }
 
 
@@ -282,9 +351,7 @@ Boolean Button()
     return g_button;
 }
 
-#if !USE_SDL
-static void initSDLKeyTable(void) {}
-#else
+
 #define MAX_SDLKEYS SDLK_LAST
 static unsigned short KeyTable[MAX_SDLKEYS];
 
@@ -385,30 +452,36 @@ static void initSDLKeyTable(void)
 
 static inline int clamp_sdl_mouse_button(Uint8 button)
 {
+    if (button == 2)   // right mouse button is button 3 in SDL.
+        button = 3;
+    else if (button == 3)
+        button = 2;
+
     if ((button >= 1) && (button <= 3))
         return button - 1;
     return -1;
 }
 
-static void sdlEventProc(const SDL_Event &e)
+static void sdlEventProc(const SDL_Event &e, Game &game)
 {
     int val;
+    bool skipkey = false;
+    SDLMod mod;
+
     switch(e.type)
        {
+        case SDL_MOUSEMOTION:
+            game.deltah += e.motion.xrel;
+            game.deltav += e.motion.yrel;
+            return;
+
                case SDL_MOUSEBUTTONDOWN:
                        {
                 val = clamp_sdl_mouse_button(e.button.button);
-                if (val >= 0)
+                if ((val >= 0) && (val <= 2))
                 {
                     if (val == 0)
-                    {
                                    g_button = true;
-                        SetKey(MAC_MOUSEBUTTON1);
-                    }
-
-                    else if (val == 1)
-                        SetKey(MAC_MOUSEBUTTON2);
-
                                buttons[val] = true;
                 }
                        }
@@ -417,17 +490,10 @@ static void sdlEventProc(const SDL_Event &e)
                case SDL_MOUSEBUTTONUP:
                        {
                 val = clamp_sdl_mouse_button(e.button.button);
-                if (val >= 0)
+                if ((val >= 0) && (val <= 2))
                 {
                     if (val == 0)
-                    {
                                    g_button = false;
-                        ClearKey(MAC_MOUSEBUTTON1);
-                    }
-
-                    else if (val == 1)
-                        ClearKey(MAC_MOUSEBUTTON2);
-
                                buttons[val] = false;
                 }
                        }
@@ -437,28 +503,43 @@ static void sdlEventProc(const SDL_Event &e)
             if (e.key.keysym.sym == SDLK_g)
             {
                 if (e.key.keysym.mod & KMOD_CTRL)
-                    gMouseGrabbed = !gMouseGrabbed;
+                {
+                    skipkey = true;
+                    SDL_GrabMode mode = SDL_GRAB_ON;
+                    if ((SDL_GetVideoSurface()->flags & SDL_FULLSCREEN) == 0)
+                    {
+                        mode = SDL_WM_GrabInput(SDL_GRAB_QUERY);
+                        mode = (mode==SDL_GRAB_ON) ? SDL_GRAB_OFF:SDL_GRAB_ON;
+                    }
+                    SDL_WM_GrabInput(mode);
+                }
             }
 
             else if (e.key.keysym.sym == SDLK_RETURN)
             {
                 if (e.key.keysym.mod & KMOD_ALT)
+                {
+                    skipkey = true;
                     SDL_WM_ToggleFullScreen(SDL_GetVideoSurface());
+                }
             }
 
-            if (e.key.keysym.sym < SDLK_LAST)
+            if ((!skipkey) && (e.key.keysym.sym < SDLK_LAST))
             {
                 if (KeyTable[e.key.keysym.sym] != 0xffff)
                     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_META)
+                SetKey(MAC_COMMAND_KEY);
+            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;
@@ -470,18 +551,21 @@ static void sdlEventProc(const SDL_Event &e)
                     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_META) == 0)
+                ClearKey(MAC_COMMAND_KEY);
+            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;
     }
 }
-#endif
+
 
 // --------------------------------------------------------------------------
 
@@ -496,8 +580,7 @@ Boolean SetUp (Game & game)
        randSeed = UpTime().lo;
 
        osx = 0;
-//     ifstream ipstream(":Data:config.txt", std::ios::in /*| std::ios::nocreate*/);
-       ifstream ipstream("./Data/config.txt", std::ios::in /*| std::ios::nocreate*/);
+       ifstream ipstream(ConvertFileName(":Data:config.txt"), std::ios::in /*| std::ios::nocreate*/);
        detail=1;
        ismotionblur=0;
        usermousesensitivity=1;
@@ -547,8 +630,7 @@ Boolean SetUp (Game & game)
        selectDetail(kContextWidth, kContextHeight, kBitsPerPixel, detail);
 
        if(!ipstream) {
-               //ofstream opstream(":Data:config.txt"); 
-               ofstream opstream("./Data/config.txt"); 
+               ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
                opstream << "Screenwidth:\n";
                opstream << kContextWidth;
                opstream << "\nScreenheight:\n";
@@ -771,10 +853,9 @@ Boolean SetUp (Game & game)
 
                if(detail>2)detail=2;
                if(detail<0)detail=0;
-               if(screenwidth>3000)screenwidth=640;
                if(screenwidth<0)screenwidth=640;
-               if(screenheight>3000)screenheight=480;
                if(screenheight<0)screenheight=480;
+
        }
        if(kBitsPerPixel!=32&&kBitsPerPixel!=16){
                kBitsPerPixel=16;
@@ -785,7 +866,7 @@ Boolean SetUp (Game & game)
 
        SetupDSpFullScreen();
 
-#if USE_SDL
+
     if (!SDL_WasInit(SDL_INIT_VIDEO))
     {
         if (SDL_Init(SDL_INIT_VIDEO) == -1)
@@ -793,126 +874,98 @@ Boolean SetUp (Game & game)
             fprintf(stderr, "SDL_Init() failed: %s\n", SDL_GetError());
             return false;
         }
-    }
-
-    Uint32 sdlflags = SDL_OPENGL;
-    SDL_WM_SetCaption("Lugaru", "lugaru");
-    SDL_ShowCursor(0);
-    if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
-    {
-        fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
-        return false;
-    }
 
-#elif (defined WIN32)
-       //------------------------------------------------------------------
-       // create window
-       int x = 0, y = 0;
-       RECT r = {0, 0, kContextWidth-1, kContextHeight-1};
-       DWORD dwStyle = WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE;
-       DWORD dwExStyle = WS_EX_APPWINDOW;
+        if (SDL_GL_LoadLibrary(NULL) == -1)
+        {
+            fprintf(stderr, "SDL_GL_LoadLibrary() failed: %s\n", SDL_GetError());
+            SDL_Quit();
+            return false;
+        }
 
-       if (fullscreen)
-       {
-               dwStyle |= WS_POPUP;
-       }
-       else
-       {
+        SDL_Rect **res = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_OPENGL);
+        if ( (res == NULL) || (res == ((SDL_Rect **)-1)) || (res[0] == NULL) || (res[0]->w < 640) || (res[0]->h < 480) )
+            res = hardcoded_resolutions;
 
-               dwStyle |= WS_OVERLAPPEDWINDOW;
-               dwExStyle |= WS_EX_WINDOWEDGE;
-       }
+        // reverse list (it was sorted biggest to smallest by SDL)...
+        int count;
+        for (count = 0; res[count]; count++)
+        {
+            if ((res[count]->w < 640) || (res[count]->h < 480))
+                break;   // sane lower limit.
+        }
 
-       AdjustWindowRectEx(&r, dwStyle, FALSE, dwExStyle);
+        static SDL_Rect *resolutions_block = NULL;
+        resolutions_block = (SDL_Rect*) realloc(resolutions_block, sizeof (SDL_Rect) * count);
+        resolutions = (SDL_Rect**) realloc(resolutions, sizeof (SDL_Rect *) * (count + 1));
+        if ((resolutions_block == NULL) || (resolutions == NULL))
+        {
+            SDL_Quit();
+            fprintf(stderr, "Out of memory!\n");
+            return false;
+        }
 
-       if (!fullscreen)
-       {
-               x = (GetSystemMetrics(SM_CXSCREEN) >> 1) - ((r.right - r.left + 1) >> 1);
-               y = (GetSystemMetrics(SM_CYSCREEN) >> 1) - ((r.bottom - r.top + 1) >> 1);
-       }
+        resolutions[count--] = NULL;
+        for (int i = 0; count >= 0; i++, count--)
+        {
+            memcpy(&resolutions_block[count], res[i], sizeof (SDL_Rect));
+            resolutions[count] = &resolutions_block[count];
+        }
 
-       g_windowHandle=CreateWindowEx(
-               dwExStyle,
-               g_wndClassName, "Lugaru", dwStyle,
-               x, y,
-//             kContextWidth, kContextHeight,
-               r.right - r.left + 1, r.bottom - r.top + 1,
-               NULL,NULL,g_appInstance,NULL );
-       if (!g_windowHandle)
-       {
-               ReportError("Could not create window");
-               return false;
-       }
+        if (cmdline("showresolutions"))
+        {
+            printf("Resolutions we think are okay:\n");
+            for (int i = 0; resolutions[i]; i++)
+                printf("  %d x %d\n", (int) resolutions[i]->w, (int) resolutions[i]->h);
+        }
+    }
 
-       //------------------------------------------------------------------
-       // setup OpenGL
+    Uint32 sdlflags = SDL_OPENGL;
+    if (!cmdline("windowed"))
+        sdlflags |= SDL_FULLSCREEN;
 
-       static PIXELFORMATDESCRIPTOR pfd =
-       {
-               sizeof(PIXELFORMATDESCRIPTOR),                          // Size Of This Pixel Format Descriptor
-                       1,                                                                                      // Version Number
-                       PFD_DRAW_TO_WINDOW |                                            // Format Must Support Window
-                       PFD_SUPPORT_OPENGL |                                            // Format Must Support OpenGL
-                       PFD_DOUBLEBUFFER,                                                       // Must Support Double Buffering
-                       PFD_TYPE_RGBA,                                                          // Request An RGBA Format
-                       kBitsPerPixel,                                                          // Select Our Color Depth
-                       0, 0, 0, 0, 0, 0,                                                       // Color Bits Ignored
-                       0,                                                                                      // No Alpha Buffer
-                       0,                                                                                      // Shift Bit Ignored
-                       0,                                                                                      // No Accumulation Buffer
-                       0, 0, 0, 0,                                                                     // Accumulation Bits Ignored
-                       16,                                                                                     // 16Bit Z-Buffer (Depth Buffer)  
-                       0,                                                                                      // No Stencil Buffer
-                       0,                                                                                      // No Auxiliary Buffer
-                       PFD_MAIN_PLANE,                                                         // Main Drawing Layer
-                       0,                                                                                      // Reserved
-                       0, 0, 0                                                                         // Layer Masks Ignored
-       };
-
-       if (!(hDC = GetDC( g_windowHandle)))
-               ReportError( "Could not get device context");
-
-       GLuint PixelFormat;
-       if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd)))
-       {
-               ReportError( "Could not find appropriate pixel format");
-               return false;
-       }
+    SDL_WM_SetCaption("Lugaru", "Lugaru");
 
-       if (!DescribePixelFormat(hDC, PixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd))
-       {
-               ReportError( "Could not retrieve pixel format");
-               return false;
-       }
+    SDL_ShowCursor(0);
 
-       if (!SetPixelFormat( hDC, PixelFormat, &pfd))
-       {
-               ReportError( "Could not set pixel format");
-               return false;
-       }
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+    SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
+    
+    if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
+    {
+        fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
+        fprintf(stderr, "forcing 640x480...\n");
+        kContextWidth = 640;
+        kContextHeight = 480;
+        if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
+        {
+            fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
+            fprintf(stderr, "forcing 640x480 windowed mode...\n");
+            sdlflags &= ~SDL_FULLSCREEN;
+            if (SDL_SetVideoMode(kContextWidth, kContextHeight, 0, sdlflags) == NULL)
+            {
+                fprintf(stderr, "SDL_SetVideoMode() failed: %s\n", SDL_GetError());
+                return false;
+            }
+        }
+    }
 
-       if (!(hRC = wglCreateContext(hDC)))
-       {
-               ReportError( "Could not create rendering context");
-               return false;
-       }
+    int dblbuf = 0;
+    if ((SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &dblbuf) == -1) || (!dblbuf))
+    {
+        fprintf(stderr, "Failed to get double buffered GL context!\n");
+        SDL_Quit();
+        return false;
+    }
 
-       if (!wglMakeCurrent(hDC, hRC))
-       {
-               ReportError( "Could not activate rendering context");
-               return false;
-       }
+    if (!lookup_all_glsyms())
+    {
+        SDL_Quit();
+        return false;
+    }
 
-       if (fullscreen)
-       {
-               // Place the window above all topmost windows
-               SetWindowPos( g_windowHandle, HWND_TOPMOST, 0,0,0,0,
-                       SWP_NOMOVE | SWP_NOSIZE );
-       }
+    if (!cmdline("nomousegrab"))
+        SDL_WM_GrabInput(SDL_GRAB_ON);
 
-       SetForegroundWindow(g_windowHandle);
-       SetFocus(g_windowHandle);
-#endif
 
        glClear( GL_COLOR_BUFFER_BIT );
        swap_gl_buffers();
@@ -925,7 +978,6 @@ Boolean SetUp (Game & game)
        glDisable( GL_FOG);
        glDisable( GL_LIGHTING);
        glDisable( GL_LOGIC_OP);
-       glDisable( GL_STENCIL_TEST);
        glDisable( GL_TEXTURE_1D);
        glDisable( GL_TEXTURE_2D);
        glPixelTransferi( GL_MAP_COLOR, GL_FALSE);
@@ -956,25 +1008,6 @@ Boolean SetUp (Game & game)
        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
        glAlphaFunc( GL_GREATER, 0.5f);
 
-#if USE_DEVIL
-       if (ilGetInteger(IL_VERSION_NUM) < IL_VERSION ||
-               iluGetInteger(ILU_VERSION_NUM) < ILU_VERSION ||
-               ilutGetInteger(ILUT_VERSION_NUM) < ILUT_VERSION)
-       {
-               ReportError("DevIL version is different...exiting!\n");
-               return false;
-       }
-
-       ilInit();
-       iluInit();
-       ilutInit();
-
-       ilutRenderer(ILUT_OPENGL);
-
-       ilEnable(IL_ORIGIN_SET);
-       ilOriginFunc(IL_ORIGIN_LOWER_LEFT);
-#endif
-
        GLint width = kContextWidth;
        GLint height = kContextHeight;
        gMidPoint.h = width / 2;
@@ -986,6 +1019,56 @@ Boolean SetUp (Game & game)
        game.newscreenwidth=screenwidth;
        game.newscreenheight=screenheight;
 
+       GLint stencilbits = 0;
+       glGetIntegerv(GL_STENCIL_BITS, &stencilbits);
+       if ( stencilbits < 1 ) {
+               fprintf(stderr, "Failed to get a stencil buffer!\n");
+               SDL_Quit();
+               return false; 
+       }
+       
+       fprintf(stderr, "Stencil buffer has %i bits, good.\n", stencilbits);
+       fprintf(stderr, "Screen width is %i, height is %i\n", kContextWidth, kContextHeight);
+       
+       glEnable( GL_STENCIL_TEST);
+       glClearStencil(0);
+       glClear(  GL_STENCIL_BUFFER_BIT );
+       glStencilFunc(GL_ALWAYS, 0x1, 0x1);
+       glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
+       
+       
+       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+       glPixelStorei(GL_UNPACK_ROW_LENGTH, 3);
+       glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+       glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+       glColorMask( 1.0, 1.0, 1.0, 1.0 );
+       char stencil[] = {64,127,255};
+       
+       glViewport(0,0, kContextWidth, kContextHeight);
+       glMatrixMode(GL_PROJECTION);
+       glLoadIdentity();
+       glOrtho((GLdouble)0, (GLdouble)kContextWidth, (GLdouble)kContextHeight, 0, -1, 1);
+       glMatrixMode(GL_MODELVIEW);
+       glLoadIdentity();
+       
+       for(int y=0;y<kContextHeight;y+=2) {
+               
+               for(int x=0;x<kContextWidth;x++) {
+                       glRasterPos2i(x, y);
+                       glDrawPixels(1, 1, GL_RGB, GL_UNSIGNED_BYTE, &stencil);
+               }
+       }
+       
+       glStencilFunc(GL_NOTEQUAL, 0x01, 0x01);
+       glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+
+       // Something gets screwed up due to the changes above
+       // revert to default.
+       glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
+       glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+       glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+       glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+
        game.InitGame();
 
        return true;
@@ -994,49 +1077,23 @@ Boolean SetUp (Game & game)
 
 static void DoMouse(Game & game)
 {
-       static Point lastMouse = {-1,-1};
-       Point globalMouse;
-
-       POINT pos;
-       GetCursorPos(&pos);
-       ScreenToClient(g_windowHandle, &pos);
-       globalMouse.h = pos.x;
-       globalMouse.v = pos.y;
 
-       if (lastMouse.h == globalMouse.h && lastMouse.v == globalMouse.v)
+       if(mainmenu||(abs(game.deltah)<10*realmultiplier*1000&&abs(game.deltav)<10*realmultiplier*1000))
        {
-               game.deltah=0;
-               game.deltav=0;
+               game.deltah *= usermousesensitivity;
+               game.deltav *= usermousesensitivity;
+               game.mousecoordh += game.deltah;
+               game.mousecoordv += game.deltav;
+        if (game.mousecoordh < 0)
+            game.mousecoordh = 0;
+        else if (game.mousecoordh >= kContextWidth)
+            game.mousecoordh = kContextWidth - 1;
+        if (game.mousecoordv < 0)
+            game.mousecoordv = 0;
+        else if (game.mousecoordv >= kContextHeight)
+            game.mousecoordv = kContextHeight - 1;
        }
-       else
-       {
-               static Point virtualMouse = {0,0};
-               delta = globalMouse;
-
-               delta.h -= lastMouse.h;
-               delta.v -= lastMouse.v;
-               lastMouse.h = pos.x;
-               lastMouse.v = pos.y;
-
-               if(mainmenu||(abs(delta.h)<10*realmultiplier*1000&&abs(delta.v)<10*realmultiplier*1000)){
-                       game.deltah=delta.h*usermousesensitivity;
-                       game.deltav=delta.v*usermousesensitivity;
-                       game.mousecoordh=globalMouse.h;
-                       game.mousecoordv=globalMouse.v;
-               }
 
-               if((!mainmenu)&&(gMouseGrabbed))
-               {
-                       if(lastMouse.h>gMidPoint.h+100||lastMouse.h<gMidPoint.h-100||lastMouse.v>gMidPoint.v+100||lastMouse.v<gMidPoint.v-100){
-                               pos.x = gMidPoint.h;
-                               pos.y = gMidPoint.v;
-                               ClientToScreen(g_windowHandle, &pos);
-                               //SetCursorPos( gMidPoint.h,gMidPoint.v);
-                               SetCursorPos(pos.x, pos.y);
-                               lastMouse = gMidPoint;
-                       }
-               }
-       }
 }
 
 
@@ -1133,7 +1190,7 @@ void DoUpdate (Game & game)
        AbsoluteTime currTime = UpTime ();
        static int num_channels = 0;
        
-       num_channels += FSOUND_GetChannelsPlaying();
+       num_channels += OPENAL_GetChannelsPlaying();
        double deltaTime = (float) AbsoluteDeltaToDuration (currTime, start);
 
        if (0 > deltaTime)      // if negative microseconds
@@ -1172,68 +1229,168 @@ void CleanUp (void)
 
 //     game.Dispose();
 
-#if USE_DEVIL
-       ilShutDown();
-#endif
 
-#if USE_SDL
+
+
     SDL_Quit();
+    #define GL_FUNC(ret,fn,params,call,rt) p##fn = NULL;
+    #include "glstubs.h"
+    #undef GL_FUNC
+    // cheat here...static destructors are calling glDeleteTexture() after
+    //  the context is destroyed and libGL unloaded by SDL_Quit().
+    pglDeleteTextures = glDeleteTextures_doNothing;
 
-#elif (defined WIN32)
-       if (hRC)
-       {
-               wglMakeCurrent( NULL, NULL);
-               wglDeleteContext( hRC);
-               hRC = NULL;
-       }
+}
 
-       if (hDC)
-       {
-               ReleaseDC( g_windowHandle, hDC);
-               hDC = NULL;
-       }
+// --------------------------------------------------------------------------
 
-       if (g_windowHandle)
-       {
-               ShowWindow( g_windowHandle, SW_HIDE );
-               DestroyWindow( g_windowHandle);
-               g_windowHandle = NULL;
-       }
+static bool IsFocused()
+{
+    return ((SDL_GetAppState() & SDL_APPINPUTFOCUS) != 0);
+}
 
-       ShutdownDSp ();
-       ClipCursor(NULL);
+
+static void launch_web_browser(const char *url)
+{
+#ifdef WIN32
+    ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+
+#elif (defined(__APPLE__) && defined(__MACH__))
+    const char *fmt = "open '%s'";
+    const size_t len = strlen(fmt) + strlen(url) + 16;
+    char *buf = new char[len];
+    snprintf(buf, len, fmt, url);
+    system(buf);
+    delete[] buf;
+
+#elif PLATFORM_LINUX
+    const char *fmt = "PATH=$PATH:. xdg-open '%s'";
+    const size_t len = strlen(fmt) + strlen(url) + 16;
+    char *buf = new char[len];
+    snprintf(buf, len, fmt, url);
+    system(buf);
+    delete[] buf;
 #endif
 }
 
-// --------------------------------------------------------------------------
 
-static bool g_focused = true;
+#ifndef WIN32
+// (code lifted from physfs: http://icculus.org/physfs/ ... zlib license.)
+static char *findBinaryInPath(const char *bin, char *envr)
+{
+    size_t alloc_size = 0;
+    char *exe = NULL;
+    char *start = envr;
+    char *ptr;
 
+    do
+    {
+        size_t size;
+        ptr = strchr(start, ':');  /* find next $PATH separator. */
+        if (ptr)
+            *ptr = '\0';
 
-static bool IsFocused()
+        size = strlen(start) + strlen(bin) + 2;
+        if (size > alloc_size)
+        {
+            char *x = (char *) realloc(exe, size);
+            if (x == NULL)
+            {
+                if (exe != NULL)
+                    free(exe);
+                return(NULL);
+            } /* if */
+
+            alloc_size = size;
+            exe = x;
+        } /* if */
+
+        /* build full binary path... */
+        strcpy(exe, start);
+        if ((exe[0] == '\0') || (exe[strlen(exe) - 1] != '/'))
+            strcat(exe, "/");
+        strcat(exe, bin);
+
+        if (access(exe, X_OK) == 0)  /* Exists as executable? We're done. */
+        {
+            strcpy(exe, start);  /* i'm lazy. piss off. */
+            return(exe);
+        } /* if */
+
+        start = ptr + 1;  /* start points to beginning of next element. */
+    } while (ptr != NULL);
+
+    if (exe != NULL)
+        free(exe);
+
+    return(NULL);  /* doesn't exist in path. */
+} /* findBinaryInPath */
+
+
+char *calcBaseDir(const char *argv0)
 {
-#ifdef WIN32
-       if (!g_focused)
-               return false;
+    /* If there isn't a path on argv0, then look through the $PATH for it. */
+    char *retval;
+    char *envr;
 
-       if (GetActiveWindow() != g_windowHandle)
-               return false;
+    const char *ptr = strrchr((char *)argv0, '/');
+    if (strchr(argv0, '/'))
+    {
+        retval = strdup(argv0);
+        if (retval)
+            *((char *) strrchr(retval, '/')) = '\0';
+        return(retval);
+    }
 
-       if (IsIconic( g_windowHandle))
-               return false;
-#endif
+    envr = getenv("PATH");
+    if (!envr) return NULL;
+    envr = strdup(envr);
+    if (!envr) return NULL;
+    retval = findBinaryInPath(argv0, envr);
+    free(envr);
+    return(retval);
+}
 
-       return true;
+static inline void chdirToAppPath(const char *argv0)
+{
+    char *dir = calcBaseDir(argv0);
+    if (dir)
+    {
+        #if (defined(__APPLE__) && defined(__MACH__))
+        // Chop off /Contents/MacOS if it's at the end of the string, so we
+        //  land in the base of the app bundle.
+        const size_t len = strlen(dir);
+        const char *bundledirs = "/Contents/MacOS";
+        const size_t bundledirslen = strlen(bundledirs);
+        if (len > bundledirslen)
+        {
+            char *ptr = (dir + len) - bundledirslen;
+            if (strcasecmp(ptr, bundledirs) == 0)
+                *ptr = '\0';
+        }
+        #endif
+        chdir(dir);
+        free(dir);
+    }
 }
+#endif
+
 
-int main (void)
+int main(int argc, char **argv)
 {
+#ifndef __MINGW32__
+    _argc = argc;
+    _argv = argv;
+#endif
+
+    // !!! FIXME: we could use a Win32 API for this.  --ryan.
+#ifndef WIN32
+    chdirToAppPath(argv[0]);
+#endif
+
        LOGFUNC;
 
-#ifndef WIN32  // this is in WinMain, too.
-       logger.start(true);
        memset( &g_theKeys, 0, sizeof( KeyMap));
-#endif
 
     initSDLKeyTable();
 
@@ -1249,16 +1406,19 @@ int main (void)
                        //ofstream os("log.txt");
                        //os.close();
 
-                       SetUp (game);
+                       if (!SetUp (game))
+                return 42;
 
-                       while (!gDone&&!game.quit&&(!game.tryquit||!game.registered))
+                       while (!gDone&&!game.quit&&(!game.tryquit))
                        {
                                if (IsFocused())
                                {
                                        gameFocused = true;
 
                                        // check windows messages
-                    #if USE_SDL
+                       
+                                       game.deltah = 0;
+                                       game.deltav = 0;
                                        SDL_Event e;
                                        // message pump
                                        while( SDL_PollEvent( &e ) )
@@ -1268,25 +1428,9 @@ int main (void)
                                                        gDone=true;
                                                        break;
                                                }
-                        sdlEventProc(e);
+                                               sdlEventProc(e, game);
                                        }
-                    #elif (defined WIN32)
-                                       MSG msg;
-                                       // message pump
-                                       while( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE | PM_NOYIELD ) )
-                                       {
-                                               if( msg.message == WM_QUIT )
-                                               {
-                                                       gDone=true;
-                                                       break;
-                                               }
-                                               else
-                                               {
-                                                       TranslateMessage( &msg );
-                                                       DispatchMessage( &msg );
-                                               }
-                                       }
-                    #endif
+                               
 
                                        // game
                                        DoUpdate(game);
@@ -1301,31 +1445,7 @@ int main (void)
                                        }
 
                                        // game is not in focus, give CPU time to other apps by waiting for messages instead of 'peeking'
-                    #ifdef WIN32
-                                       MSG msg;
-                                       BOOL bRet;
-                                       //if (GetMessage( &msg, g_windowHandle, 0, 0 ))
-                                       /*if (GetMessage( &msg, NULL, 0, 0 ))
-                                       {
-                                               TranslateMessage(&msg);
-                                               DispatchMessage(&msg);
-                                       }*/
-                                       if ( (bRet = GetMessage( &msg, NULL, 0, 0 )) != 0)
-                                       { 
-                                               if (bRet <= 0)
-                                               {
-                                                       // handle the error and possibly exit
-                                                       gDone=true;
-                                               }
-                                               else
-                                               {
-                                                       TranslateMessage(&msg); 
-                                                       DispatchMessage(&msg); 
-                                               }
-                                       }
-                    #else
                     STUBBED("give up CPU but sniff the event queue");
-                    #endif
                                }
                        }
 
@@ -1337,15 +1457,18 @@ int main (void)
 //             if(game.registernow){
                if(regnow)
                {
-            #ifndef WIN32
-            STUBBED("launch a web browser");
+            #if (defined(__APPLE__) && defined(__MACH__))
+            launch_web_browser("http://www.wolfire.com/purchase/lugaru/mac");
+            #elif PLATFORM_LINUX
+            launch_web_browser("http://www.wolfire.com/purchase/lugaru/linux");
             #else
-                       char url[100];
-                       sprintf(url,"http://www.wolfire.com/registerpc.html");
-                       //                      LaunchURL(url);
-                       ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+            launch_web_browser("http://www.wolfire.com/purchase/lugaru/pc");
             #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)
@@ -1355,7 +1478,7 @@ int main (void)
                std::string e = "Caught exception: ";
                e += error.what();
 
-               LOG(e, Logger::LOG_ERR);
+               LOG(e);
 
                MessageBox(g_windowHandle, error.what(), "ERROR", MB_OK | MB_ICONEXCLAMATION);
        }
@@ -1369,744 +1492,76 @@ int main (void)
 
        // --------------------------------------------------------------------------
 
-#ifdef WIN32
-#define MAX_WINKEYS 256
-       static unsigned short KeyTable[MAX_WINKEYS]=
-       {
-               0xffff,  // (0)
-                       MAC_MOUSEBUTTON1,  // VK_LBUTTON        (1)
-                       MAC_MOUSEBUTTON2,  // VK_RBUTTON        (2)
-                       0xffff,  // VK_CANCEL   (3)
-                       0xffff,  // VK_MBUTTON  (4)
-                       0xffff,  // (5)
-                       0xffff,  // (6)
-                       0xffff,  // (7)
-                       MAC_DELETE_KEY,  // VK_BACK     (8)
-                       MAC_TAB_KEY,  // VK_TAB (9)
-                       0xffff,  // (10)
-                       0xffff,  // (11)
-                       0xffff,  // VK_CLEAR    (12)
-                       MAC_RETURN_KEY,  // VK_RETURN   (13)
-                       0xffff,  // (14)
-                       0xffff,  // (15)
-                       MAC_SHIFT_KEY,  // VK_SHIFT     (16)
-                       MAC_CONTROL_KEY,  // VK_CONTROL (17)
-                       MAC_OPTION_KEY,  // VK_MENU     (18)
-                       0xffff,  // VK_PAUSE    (19)
-                       MAC_CAPS_LOCK_KEY,  // #define VK_CAPITAL       (20)
-                       0xffff,  // (21)
-                       0xffff,  // (22)
-                       0xffff,  // (23)
-                       0xffff,  // (24)
-                       0xffff,  // (25)
-                       0xffff,  // (26)
-                       MAC_ESCAPE_KEY,  // VK_ESCAPE   (27)
-                       0xffff,  // (28)
-                       0xffff,  // (29)
-                       0xffff,  // (30)
-                       0xffff,  // (31)
-                       MAC_SPACE_KEY,  // VK_SPACE     (32)
-                       MAC_PAGE_UP_KEY,  // VK_PRIOR   (33)
-                       MAC_PAGE_DOWN_KEY,  // VK_NEXT  (34)
-                       MAC_END_KEY,  // VK_END (35)
-                       MAC_HOME_KEY,  // VK_HOME       (36)
-                       MAC_ARROW_LEFT_KEY,  // VK_LEFT (37)
-                       MAC_ARROW_UP_KEY,  // VK_UP     (38)
-                       MAC_ARROW_RIGHT_KEY,  // VK_RIGHT       (39)
-                       MAC_ARROW_DOWN_KEY,  // VK_DOWN (40)
-                       0xffff,  // VK_SELECT   (41)
-                       0xffff,  // VK_PRINT    (42)
-                       0xffff,  // VK_EXECUTE  (43)
-                       0xffff,  // VK_SNAPSHOT (44)
-                       MAC_INSERT_KEY,  // VK_INSERT   (45)
-                       MAC_DEL_KEY,  // VK_DELETE      (46)
-                       0xffff,  // VK_HELP     (47)
-                       MAC_0_KEY,  // VK_0     (48)
-                       MAC_1_KEY,  // VK_1     (49)
-                       MAC_2_KEY,  // VK_2     (50)
-                       MAC_3_KEY,  // VK_3     (51)
-                       MAC_4_KEY,  // VK_4     (52)
-                       MAC_5_KEY,  // VK_5     (53)
-                       MAC_6_KEY,  // VK_6     (54)
-                       MAC_7_KEY,  // VK_7     (55)
-                       MAC_8_KEY,  // VK_8     (56)
-                       MAC_9_KEY,  // VK_9     (57)
-                       0xffff,  // (58)
-                       0xffff,  // (59)
-                       0xffff,  // (60)
-                       0xffff,  // (61)
-                       0xffff,  // (62)
-                       0xffff,  // (63)
-                       0xffff,  // (64)
-                       MAC_A_KEY,  // VK_A     (65)
-                       MAC_B_KEY,  // VK_B     (66)
-                       MAC_C_KEY,  // VK_C     (67)
-                       MAC_D_KEY,  // VK_D     (68)
-                       MAC_E_KEY,  // VK_E     (69)
-                       MAC_F_KEY,  // VK_F     (70)
-                       MAC_G_KEY,  // VK_G     (71)
-                       MAC_H_KEY,  // VK_H     (72)
-                       MAC_I_KEY,  // VK_I     (73)
-                       MAC_J_KEY,  // VK_J     (74)
-                       MAC_K_KEY,  // VK_K     (75)
-                       MAC_L_KEY,  // VK_L     (76)
-                       MAC_M_KEY,  // VK_M     (77)
-                       MAC_N_KEY,  // VK_N     (78)
-                       MAC_O_KEY,  // VK_O     (79)
-                       MAC_P_KEY,  // VK_P     (80)
-                       MAC_Q_KEY,  // VK_Q     (81)
-                       MAC_R_KEY,  // VK_R     (82)
-                       MAC_S_KEY,  // VK_S     (83)
-                       MAC_T_KEY,  // VK_T     (84)
-                       MAC_U_KEY,  // VK_U     (85)
-                       MAC_V_KEY,  // VK_V     (86)
-                       MAC_W_KEY,  // VK_W     (87)
-                       MAC_X_KEY,  // VK_X     (88)
-                       MAC_Y_KEY,  // VK_Y     (89)
-                       MAC_Z_KEY,  // VK_Z     (90)
-                       0xffff,  // (91)
-                       0xffff,  // (92)
-                       0xffff,  // (93)
-                       0xffff,  // (94)
-                       0xffff,  // (95)
-                       MAC_NUMPAD_0_KEY,  // VK_NUMPAD0        (96)
-                       MAC_NUMPAD_1_KEY,  // VK_NUMPAD1        (97)
-                       MAC_NUMPAD_2_KEY,  // VK_NUMPAD2        (98)
-                       MAC_NUMPAD_3_KEY,  // VK_NUMPAD3        (99)
-                       MAC_NUMPAD_4_KEY,  // VK_NUMPAD4        (100)
-                       MAC_NUMPAD_5_KEY,  // VK_NUMPAD5        (101)
-                       MAC_NUMPAD_6_KEY,  // VK_NUMPAD6        (102)
-                       MAC_NUMPAD_7_KEY,  // VK_NUMPAD7        (103)
-                       MAC_NUMPAD_8_KEY,  // VK_NUMPAD8        (104)
-                       MAC_NUMPAD_9_KEY,  // VK_NUMPAD9        (105)
-                       MAC_NUMPAD_ASTERISK_KEY,  // VK_MULTIPLY        (106)
-                       MAC_NUMPAD_PLUS_KEY,  // VK_ADD (107)
-                       MAC_NUMPAD_ENTER_KEY,  // VK_SEPARATOR  (108)
-                       MAC_NUMPAD_MINUS_KEY,  // VK_SUBTRACT   (109)
-                       MAC_NUMPAD_PERIOD_KEY,  // VK_DECIMAL   (110)
-                       MAC_NUMPAD_SLASH_KEY,  // VK_DIVIDE     (111)
-                       MAC_F1_KEY,  // VK_F1   (112)
-                       MAC_F2_KEY,  // VK_F2   (113)
-                       MAC_F3_KEY,  // VK_F3   (114)
-                       MAC_F4_KEY,  // VK_F4   (115)
-                       MAC_F5_KEY,  // VK_F5   (116)
-                       MAC_F6_KEY,  // VK_F6   (117)
-                       MAC_F7_KEY,  // VK_F7   (118)
-                       MAC_F8_KEY,  // VK_F8   (119)
-                       MAC_F9_KEY,  // VK_F9   (120)
-                       MAC_F10_KEY,  // VK_F10 (121)
-                       MAC_F11_KEY,  // VK_F11 (122)
-                       MAC_F12_KEY,  // VK_F12 (123)
-                       0xffff,  // (124)
-                       0xffff,  // (125)
-                       0xffff,  // (126)
-                       0xffff,  // (127)
-                       0xffff,  // (128)
-                       0xffff,  // (129)
-                       0xffff,  // (130)
-                       0xffff,  // (131)
-                       0xffff,  // (132)
-                       0xffff,  // (133)
-                       0xffff,  // (134)
-                       0xffff,  // (135)
-                       0xffff,  // (136)
-                       0xffff,  // (137)
-                       0xffff,  // (138)
-                       0xffff,  // (139)
-                       0xffff,  // (130)
-                       0xffff,  // (141)
-                       0xffff,  // (142)
-                       0xffff,  // (143)
-                       0xffff,  // VK_NUMLOCK  (144)
-                       0xffff,  // VK_SCROLL   (145)
-                       0xffff,  // (146)
-                       0xffff,  // (147)
-                       0xffff,  // (148)
-                       0xffff,  // (149)
-                       0xffff,  // (150)
-                       0xffff,  // (151)
-                       0xffff,  // (152)
-                       0xffff,  // (153)
-                       0xffff,  // (154)
-                       0xffff,  // (155)
-                       0xffff,  // (156)
-                       0xffff,  // (157)
-                       0xffff,  // (158)
-                       0xffff,  // (159)
-                       MAC_SHIFT_KEY,  // VK_LSHIFT    (160)
-                       MAC_SHIFT_KEY,  // VK_RSHIFT    (161)
-                       MAC_CONTROL_KEY,  // VK_LCONTROL        (162)
-                       MAC_CONTROL_KEY,  // VK_RCONTROL        (163)
-                       MAC_OPTION_KEY,  // VK_LMENU    (164)
-                       MAC_OPTION_KEY,  // VK_RMENU    (165)
-                       0xffff,  // (166)
-                       0xffff,  // (167)
-                       0xffff,  // (168)
-                       0xffff,  // (169)
-                       0xffff,  // (170)
-                       0xffff,  // (171)
-                       0xffff,  // (172)
-                       0xffff,  // (173)
-                       0xffff,  // (174)
-                       0xffff,  // (175)
-                       0xffff,  // (176)
-                       0xffff,  // (177)
-                       0xffff,  // (178)
-                       0xffff,  // (179)
-                       0xffff,  // (180)
-                       0xffff,  // (181)
-                       0xffff,  // (182)
-                       0xffff,  // (183)
-                       0xffff,  // (184)
-                       0xffff,  // (185)
-                       MAC_SEMICOLON_KEY,  // (186)
-                       MAC_PLUS_KEY,  // (187)
-                       MAC_COMMA_KEY,  // (188)
-                       MAC_MINUS_KEY,  // (189)
-                       MAC_PERIOD_KEY,  // (190)
-                       MAC_SLASH_KEY,  // (191)
-                       MAC_TILDE_KEY,  // (192)
-                       0xffff,  // (193)
-                       0xffff,  // (194)
-                       0xffff,  // (195)
-                       0xffff,  // (196)
-                       0xffff,  // (197)
-                       0xffff,  // (198)
-                       0xffff,  // (199)
-                       0xffff,  // (200)
-                       0xffff,  // (201)
-                       0xffff,  // (202)
-                       0xffff,  // (203)
-                       0xffff,  // (204)
-                       0xffff,  // (205)
-                       0xffff,  // (206)
-                       0xffff,  // (207)
-                       0xffff,  // (208)
-                       0xffff,  // (209)
-                       0xffff,  // (210)
-                       0xffff,  // (211)
-                       0xffff,  // (212)
-                       0xffff,  // (213)
-                       0xffff,  // (214)
-                       0xffff,  // (215)
-                       0xffff,  // (216)
-                       0xffff,  // (217)
-                       0xffff,  // (218)
-                       MAC_LEFTBRACKET_KEY,  // (219)
-                       MAC_BACKSLASH_KEY,  // (220)
-                       MAC_RIGHTBRACKET_KEY,  // (221)
-                       MAC_APOSTROPHE_KEY,  // (222)
-                       0xffff,  // (223)
-                       0xffff,  // (224)
-                       0xffff,  // (225)
-                       0xffff,  // (226)
-                       0xffff,  // (227)
-                       0xffff,  // (228)
-                       0xffff,  // (229)
-                       0xffff,  // (230)
-                       0xffff,  // (231)
-                       0xffff,  // (232)
-                       0xffff,  // (233)
-                       0xffff,  // (234)
-                       0xffff,  // (235)
-                       0xffff,  // (236)
-                       0xffff,  // (237)
-                       0xffff,  // (238)
-                       0xffff,  // (239)
-                       0xffff,  // (240)
-                       0xffff,  // (241)
-                       0xffff,  // (242)
-                       0xffff,  // (243)
-                       0xffff,  // (244)
-                       0xffff,  // (245)
-                       0xffff,  // (246)
-                       0xffff,  // (247)
-                       0xffff,  // (248)
-                       0xffff,  // (249)
-                       0xffff,  // (250)
-                       0xffff,  // (251)
-                       0xffff,  // (252)
-                       0xffff,  // (253)
-                       0xffff,  // (254)
-                       0xffff,  // (255)
-       };
-
-       void ClipMouseToWindow(HWND window)
-       {
-               RECT wRect;
-
-               GetClientRect(window, &wRect);
-
-               ClientToScreen(window, (LPPOINT)&wRect.left);
-               ClientToScreen(window, (LPPOINT)&wRect.right);
-
-               ClipCursor(&wRect);
-
-               return;
-       }
-
-       LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
-       {
-               /* this is where we receive all messages concerning this window
-               * we can either process a message or pass it on to the default
-               * message handler of windows */
-
-               static PAINTSTRUCT ps;
-
-               switch(msg)
-               {
-               case WM_ACTIVATE:       // Watch For Window Activate Message
-                       {
-                               // Check Minimization State
-                               BOOL iconified = HIWORD(wParam) ? TRUE : FALSE;
-
-                               if (LOWORD(wParam) == WA_INACTIVE)
-                               {
-                                       ClipCursor(NULL);
-
-                                       if (fullscreen)
-                                       {
-                                               if( !iconified )
-                                               {
-                                                       // Minimize window
-                                                       CloseWindow( hWnd );
-
-                                                       // The window is now iconified
-                                                       iconified = GL_TRUE;
-                                               }
-                                       }
-
-                                       ShutdownDSp();
-
-                                       g_focused=false;                                // Program Is Active
-                               }
-                               else
-                               {
-                                       SetupDSpFullScreen();
-
-                                       if( iconified )
-                                       {
-                                               // Minimize window
-                                               OpenIcon( hWnd );
-
-                                               // The window is now iconified
-                                               iconified = GL_FALSE;
-
-                                               // Activate window
-                                               ShowWindow( hWnd, SW_SHOW );
-                                               SetForegroundWindow( hWnd );
-                                               SetFocus( hWnd );
-                                       }
-
-                                       ClipMouseToWindow(hWnd);
-                                       g_focused=true;                 // Program Is No Longer Active
-                               }
-
-                               return 0;                                               // Return To The Message Loop
-                       }
-
-               case WM_KEYDOWN:
-               case WM_SYSKEYDOWN:
-                       {
-                               // check for Alt-F4 (exit hotkey)
-                               if (wParam == VK_F4)
-                               {
-                                       if (GetKeyState( VK_MENU) & 0x8080)
-                                       {
-                                               gDone = true;
-                                               break;
-                                       }
-                               }
-                               if (wParam < MAX_WINKEYS)
-                               {
-                                       if (KeyTable[wParam] != 0xffff)
-                                               SetKey( KeyTable[wParam]);
-                               }
-                               return (0);
-                       }
-
-               case WM_KEYUP:
-               case WM_SYSKEYUP:
-                       {
-                               if (wParam < MAX_WINKEYS)
-                                       if (KeyTable[wParam] != 0xffff)
-                                               ClearKey( KeyTable[wParam]);
-                               return (0);
-                       }
-
-               case WM_CHAR:
-               case WM_DEADCHAR:
-               case WM_SYSCHAR:
-               case WM_SYSDEADCHAR:
-                       return (0);
-
-               case WM_NCLBUTTONDOWN:
-               case WM_LBUTTONDOWN:
-                       {
-                               g_button = true;
-                               buttons[ 0] = true;
-                       }
-                       return (0);
-
-               case WM_NCRBUTTONDOWN:
-               case WM_RBUTTONDOWN:
-                       {
-                               buttons[ 1] = true;
-                       }
-                       return (0);
-
-               case WM_NCMBUTTONDOWN:
-               case WM_MBUTTONDOWN:
-                       {
-                               buttons[ 2] = true;
-                       }
-                       return (0);
 
-               case WM_NCLBUTTONUP:
-               case WM_LBUTTONUP:
-                       {
-                               g_button = false;
-                               buttons[ 0] = false;
-                       }
-                       return (0);
-
-               case WM_NCRBUTTONUP:
-               case WM_RBUTTONUP:
-                       {
-                               buttons[ 1] = false;
-                       }
-                       return (0);
-
-               case WM_NCMBUTTONUP:
-               case WM_MBUTTONUP:
-                       {
-                               buttons[ 2] = false;
-                       }
-                       return (0);
-
-               case WM_NCLBUTTONDBLCLK:
-               case WM_NCRBUTTONDBLCLK:
-               case WM_NCMBUTTONDBLCLK:
-               case WM_LBUTTONDBLCLK:
-                       return (0);
-               case WM_RBUTTONDBLCLK:
-               case WM_MBUTTONDBLCLK:
-                       return (0);
-
-               case WM_NCMOUSEMOVE:
-               case WM_MOUSEMOVE:
-                       /*                      ((WindowInfo *)g_lastWindow->GetInfo())->m_mouseX = (signed short)(lParam & 0xffff);
-                       ((WindowInfo *)g_lastWindow->GetInfo())->m_mouseY = (signed short)(lParam >> 16);
-                       if (g_lastWindow->m_mouseCallbacksEnabled) g_lastWindow->MouseMoveCallback();
-                       *///                    goto winmessage;
-                       return (0);
-
-               case WM_SYSCOMMAND:                                             // Intercept System Commands
-                       {
-                               switch (wParam)                                         // Check System Calls
-                               {
-                               case SC_SCREENSAVE:                             // Screensaver Trying To Start?
-                               case SC_MONITORPOWER:                   // Monitor Trying To Enter Powersave?
-                                       return 0;                                       // Prevent From Happening
-
-                                       // User trying to access application menu using ALT?
-                               case SC_KEYMENU:
-                                       return 0;
-                               }
-                       }
-                       break;
-
-               case WM_MOVE:
-//                     {
-//                             ReleaseCapture();
-//                             ClipMouseToWindow(hWnd);
-//                     }
-                       break;
-
-               case WM_SIZE:
-                       break;
-
-               case WM_CLOSE:
-                       {
-                               //gDone =  true;
-                               //game.tryquit=1;
-                       }
-                       //return (0);
-
-               case WM_DESTROY:
-                       {
-                               //ClipCursor(NULL);
-                               PostQuitMessage(0);  /* Terminate Application */
-                       }
-                       return (0);
-
-               case WM_ERASEBKGND:
-                       break;
-
-               case WM_PAINT:
-//                     BeginPaint( g_windowHandle,&ps);
-//                     EndPaint( g_windowHandle,&ps);
-                       break;
-
-               default:
-                       break;
-               }
-
-               /* We processed the message and there
-               * is no processing by Windows necessary */
-
-               /* We didn't process the message so let Windows do it */
-               return DefWindowProc(hWnd,msg,wParam,lParam);
-       }
-
-
-       static BOOL RegisterWindowClasses(HINSTANCE hFirstInstance)
-       {
-               WNDCLASSEX wc;
-               memset( &wc, 0, sizeof( wc));
-
-               /* Register the window class. */
-               wc.cbSize = sizeof(wc);
-#undef style
-               wc.style = (CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_OWNDC);  /* Combination of Class Styles */
-               wc.lpfnWndProc = AppWndProc;       /* Adress of Window Procedure */
-               wc.cbClsExtra = 0;                 /* Extra Bytes allocated for this Class */
-               wc.cbWndExtra = 0;                 /* Extra Bytes allocated for each Window */
-               wc.hInstance = hFirstInstance;     /* Handle of program instance */
-               wc.hIcon = LoadIcon( hFirstInstance, MAKEINTRESOURCE(IDI_LUGARU) );
-               wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-               wc.hbrBackground = NULL;
-               wc.lpszMenuName  = NULL;
-               wc.lpszClassName = g_wndClassName; /* Name of the Window Class */
-               wc.hIconSm = LoadIcon( hFirstInstance, MAKEINTRESOURCE(IDI_LUGARU) );
-
-               if (!RegisterClassEx(&wc)) return FALSE;  /* Register Class failed */
-
-               return TRUE;
-       }
-#endif
-
-       int resolutionID(int width, int height)
-       {
-               int whichres;
-               whichres=-1;
-               if(width==640 && height==480)whichres=0;
-               if(width==800 && height==600)whichres=1;
-               if(width==1024 && height==768)whichres=2;
-               if(width==1280 && height==1024)whichres=3;
-               if(width==1600 && height==1200)whichres=4;
-               if(width==840 && height==524)whichres=5;
-               if(width==1024 && height==640)whichres=6;
-               if(width==1344 && height==840)whichres=7;
-
-               return whichres;
-       }
-
-       int closestResolution(int width, int height)
-       {
-               int whichres;
-               whichres=-1;
-               if(width>=640 && height>=480)whichres=0;
-               if(width>=800 && height>=600)whichres=1;
-               if(width>=1024 && height>=768)whichres=2;
-               if(width>=1280 && height>=1024)whichres=3;
-               if(width>=1600 && height>=1200)whichres=4;
-               if(width==840 && height==524)whichres=5;
-               if(width==1024 && height==640)whichres=6;
-               if(width==1344 && height==840)whichres=7;
-
-               return whichres;
-       }
 
        bool selectDetail(int & width, int & height, int & bpp, int & detail)
        {
                bool res = true;
-               int whichres = closestResolution(width, height);
 
-               while (true)
-               {
-                       if(whichres<=0 || whichres>7){
-                               whichres = 0;
-                               width=640;
-                               height=480;
-                       }
-                       if(whichres==1){
-                               width=800;
-                               height=600;
-                       }
-                       if(whichres==2){
-                               width=1024;
-                               height=768;
-                       }
-                       if(whichres==3){
-                               width=1280;
-                               height=1024;
-                       }
-                       if(whichres==4){
-                               width=1600;
-                               height=1200;
-                       }
-                       if(whichres==5){
-                               width=840;
-                               height=524;
-                       }
-                       if(whichres==6){
-                               width=1024;
-                               height=640;
-                       }
-                       if(whichres==7){
-                               width=1344;
-                               height=840;
-                       }
-
-                       if ((detail != 0) && (resolutionDepths[whichres][1] != 0))
-                       {
-                               break;
-                       }
-                       else if ((detail == 0) && (resolutionDepths[whichres][0] != 0))
-                       {
-                               break;
-                       }
-                       else if ((detail != 0) && (resolutionDepths[whichres][0] != 0))
-                       {
-                               res = false;
-                               detail = 0;
-                               break;
-                       }
-                       else if (0 == whichres)
-                       {
-                               break;
-                       }
-
-                       --whichres;
-               }
-
-               bpp = resolutionDepths[whichres][(detail != 0)];
+               // currently with SDL, we just use whatever is requested
+               //  and don't care.  --ryan.
+               
 
                return res;
        }
 
-    #ifdef WIN32
-       int __stdcall WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine,int nShowCmd)
-       {
-               int argc = 0;
-               LPWSTR * cl = CommandLineToArgvW(GetCommandLineW(), &argc);
-               if (argc > 1)
-               {
-                       if (0 == _wcsicmp(cl[1], L"-windowed"))
-                       {
-                               fullscreen = false;
-                       }
-               }
-
-               logger.start(true);
-
-               memset( &g_theKeys, 0, sizeof( KeyMap));
-
-               unsigned int i = 0;
-               DEVMODE mode;
-               memset(&mode, 0, sizeof(mode));
-               mode.dmSize = sizeof(mode);
-               while (EnumDisplaySettings(NULL, i++, &mode))
-               {
-                       if (mode.dmBitsPerPel < 16)
-                       {
-                               continue;
-                       }
-
-                       int res = resolutionID(mode.dmPelsWidth, mode.dmPelsHeight);
-
-                       if (res > -1 && res < 8)
-                       {
-                               if (DISP_CHANGE_SUCCESSFUL != ChangeDisplaySettings(&mode, CDS_TEST))
-                               {
-                                       continue;
-                               }
-
-                               switch(mode.dmBitsPerPel)
-                               {
-                               case 32:
-                               case 24:
-                                       resolutionDepths[res][1] = mode.dmBitsPerPel;
-                                       break;
-                               case 16:
-                                       resolutionDepths[res][0] = mode.dmBitsPerPel;
-                                       break;
-                               }
-                       }
-               }
-
-               /* if there is no Instance of our program in memory then register the window class */
-               if (hPrevInstance == NULL && !RegisterWindowClasses(hInstance))
-                       return FALSE;  /* registration failed! */
-
-               g_appInstance=hInstance;
-
-               main();
-
-               UnregisterClass( g_wndClassName, hInstance);
-
-               return TRUE;
-
-       }
-    #endif
-
        extern int channels[100];
-       extern FSOUND_SAMPLE * samp[100];
-       extern FSOUND_STREAM * strm[10];
+       extern OPENAL_SAMPLE * samp[100];
+       extern OPENAL_STREAM * strm[20];
 
-       extern "C" void PlaySoundEx(int chan, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused)
+       extern "C" void PlaySoundEx(int chan, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused)
        {
-               const FSOUND_SAMPLE * currSample = FSOUND_GetCurrentSample(channels[chan]);
+               const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]);
                if (currSample && currSample == samp[chan])
                {
-                       if (FSOUND_GetPaused(channels[chan]))
+                       if (OPENAL_GetPaused(channels[chan]))
                        {
-                               FSOUND_StopSound(channels[chan]);
-                               channels[chan] = FSOUND_FREE;
+                               OPENAL_StopSound(channels[chan]);
+                               channels[chan] = OPENAL_FREE;
                        }
-                       else if (FSOUND_IsPlaying(channels[chan]))
+                       else if (OPENAL_IsPlaying(channels[chan]))
                        {
-                               int loop_mode = FSOUND_GetLoopMode(channels[chan]);
-                               if (loop_mode & FSOUND_LOOP_OFF)
+                               int loop_mode = OPENAL_GetLoopMode(channels[chan]);
+                               if (loop_mode & OPENAL_LOOP_OFF)
                                {
-                                       channels[chan] = FSOUND_FREE;
+                                       channels[chan] = OPENAL_FREE;
                                }
                        }
                }
                else
                {
-                       channels[chan] = FSOUND_FREE;
+                       channels[chan] = OPENAL_FREE;
                }
 
-               channels[chan] = FSOUND_PlaySoundEx(channels[chan], sptr, dsp, startpaused);
+               channels[chan] = OPENAL_PlaySoundEx(channels[chan], sptr, dsp, startpaused);
                if (channels[chan] < 0)
                {
-                       channels[chan] = FSOUND_PlaySoundEx(FSOUND_FREE, sptr, dsp, startpaused);
+                       channels[chan] = OPENAL_PlaySoundEx(OPENAL_FREE, sptr, dsp, startpaused);
                }
        }
 
-       extern "C" void PlayStreamEx(int chan, FSOUND_STREAM *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused)
+       extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused)
        {
-               const FSOUND_SAMPLE * currSample = FSOUND_GetCurrentSample(channels[chan]);
-               if (currSample && currSample == FSOUND_Stream_GetSample(sptr))
+               const OPENAL_SAMPLE * currSample = OPENAL_GetCurrentSample(channels[chan]);
+               if (currSample && currSample == OPENAL_Stream_GetSample(sptr))
                {
-                               FSOUND_StopSound(channels[chan]);
-                               FSOUND_Stream_Stop(sptr);
+                               OPENAL_StopSound(channels[chan]);
+                               OPENAL_Stream_Stop(sptr);
                }
                else
                {
-                       FSOUND_Stream_Stop(sptr);
-                       channels[chan] = FSOUND_FREE;
+                       OPENAL_Stream_Stop(sptr);
+                       channels[chan] = OPENAL_FREE;
                }
 
-               channels[chan] = FSOUND_Stream_PlayEx(channels[chan], sptr, dsp, startpaused);
+               channels[chan] = OPENAL_Stream_PlayEx(channels[chan], sptr, dsp, startpaused);
                if (channels[chan] < 0)
                {
-                       channels[chan] = FSOUND_Stream_PlayEx(FSOUND_FREE, sptr, dsp, startpaused);
+                       channels[chan] = OPENAL_Stream_PlayEx(OPENAL_FREE, sptr, dsp, startpaused);
                }
        }
 
+
        bool LoadImage(const char * fname, TGAImageRec & tex)
        {
                bool res = true;
@@ -2116,105 +1571,30 @@ int main (void)
                        return false;
                }
 
-        #if USE_DEVIL
-               ILstring f = strdup(ConvertFileName(fname));
-               if (!f)
-               {
-                       return false;
-               }
-
-               ILuint iid=0;
-               ilGenImages(1, &iid);
-               ilBindImage(iid);
-               if (ilLoadImage(f))
-               {
-                       //iluFlipImage();
-                       tex.sizeX = ilGetInteger(IL_IMAGE_WIDTH);
-                       tex.sizeY = ilGetInteger(IL_IMAGE_HEIGHT);
-                       tex.bpp = ilGetInteger(IL_IMAGE_BITS_PER_PIXEL);
-                       ILuint Bpp = ilGetInteger(IL_IMAGE_BYTES_PER_PIXEL),
-                               imageSize = tex.sizeX * tex.sizeY * Bpp;
-                       ILubyte *Data = ilGetData();
-                       memcpy(tex.data, Data, imageSize);
-
-                       // Truvision Targa files are stored as BGR colors
-                       // We want RGB so Blue and Red bytes are switched
-                       if (IL_TGA == ilGetInteger(IL_IMAGE_FORMAT))
-                       {
-                               // Loop Through The Image Data
-                               for (GLuint i = 0; i < int(imageSize); i += Bpp)
-                               {
-                                       // Swaps The 1st And 3rd Bytes ('R'ed and 'B'lue)
-                                       GLbyte temp;                                            // Temporary Variable
-                                       temp = tex.data[i];                                     // Temporarily Store The Value At Image Data 'i'
-                                       tex.data[i] = tex.data[i + 2];          // Set The 1st Byte To The Value Of The 3rd Byte
-                                       tex.data[i + 2] = temp;                         // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
-                               }
-                       }
-               }
-               else
-               {
-                       res = false;
-               }
-               ilDeleteImages(1, &iid);
-/*
-               if (tid)
-               {
-                       GLuint texid = ilutGLLoadImage(f);
-                       *tid = texid;
-               }
-               else if (mip)
-               {
-                       ilutGLBuildMipmaps()
-               }
-               else
-               {
-                       ilutGLTexImage(0);
-               }
-*/
-               free(f);
-        #else
+       
         res = load_image(fname, tex);
-        if (!res) STUBBED("load_image() failed!");
-        #endif
+    
 
                return res;
        }
 
        void ScreenShot(const char * fname)
        {
-        #if USE_DEVIL
-               ILstring f = strdup(fname);
-               if (!f)
-               {
-                       return;
-               }
-
-               ILuint iid;
-               ilGenImages(1, &iid);
-               ilBindImage(iid);
-               if (ilutGLScreen())
-               {
-                       ilSaveImage(f);
-               }
-               ilDeleteImages(1, &iid);
-
-               free(f);
-        #else
-        STUBBED("Non-DevIL screenshot");
-        #endif
+  
+        save_image(fname);
+  
        }
 
 
-#if !USE_DEVIL
+
 static bool load_image(const char *file_name, TGAImageRec &tex)
 {
-    char *ptr = strrchr(file_name, '.');
+    const char *ptr = strrchr((char *)file_name, '.');
     if (ptr)
     {
-        if (stricmp(ptr+1, "png") == 0)
+        if (strcasecmp(ptr+1, "png") == 0)
             return load_png(file_name, tex);
-        else if (stricmp(ptr+1, "jpg") == 0)
+        else if (strcasecmp(ptr+1, "jpg") == 0)
             return load_jpg(file_name, tex);
     }
 
@@ -2222,13 +1602,68 @@ static bool load_image(const char *file_name, TGAImageRec &tex)
     return false;
 }
 
+
+struct my_error_mgr {
+  struct jpeg_error_mgr pub;   /* "public" fields */
+  jmp_buf setjmp_buffer;       /* for return to caller */
+};
+typedef struct my_error_mgr * my_error_ptr;
+
+
+static void my_error_exit(j_common_ptr cinfo)
+{
+       struct my_error_mgr *err = (struct my_error_mgr *)cinfo->err;
+       longjmp(err->setjmp_buffer, 1);
+}
+
+/* stolen from public domain example.c code in libjpg distribution. */
 static bool load_jpg(const char *file_name, TGAImageRec &tex)
 {
-    // !!! FIXME: write this.
-    STUBBED("load_jpg");
-    return false;
+    struct jpeg_decompress_struct cinfo;
+    struct my_error_mgr jerr;
+    JSAMPROW buffer[1];                /* Output row buffer */
+    int row_stride;            /* physical row width in output buffer */
+    FILE *infile = fopen(file_name, "rb");
+
+    if (infile == NULL)
+        return false;
+
+    cinfo.err = jpeg_std_error(&jerr.pub);
+    jerr.pub.error_exit = my_error_exit;
+    if (setjmp(jerr.setjmp_buffer)) {
+        jpeg_destroy_decompress(&cinfo);
+        fclose(infile);
+        return false;
+    }
+
+    jpeg_create_decompress(&cinfo);
+    jpeg_stdio_src(&cinfo, infile);
+    (void) jpeg_read_header(&cinfo, TRUE);
+
+    cinfo.out_color_space = JCS_RGB;
+    cinfo.quantize_colors = 0;
+    (void) jpeg_calc_output_dimensions(&cinfo);
+    (void) jpeg_start_decompress(&cinfo);
+
+    row_stride = cinfo.output_width * cinfo.output_components;
+    tex.sizeX = cinfo.output_width;
+    tex.sizeY = cinfo.output_height;
+    tex.bpp = 24;
+
+    while (cinfo.output_scanline < cinfo.output_height) {
+        buffer[0] = (JSAMPROW)(char *)tex.data +
+                        ((cinfo.output_height-1) - cinfo.output_scanline) * row_stride;
+        (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+    }
+
+    (void) jpeg_finish_decompress(&cinfo);
+    jpeg_destroy_decompress(&cinfo);
+    fclose(infile);
+
+    return true;
 }
 
+
 /* stolen from public domain example.c code in libpng distribution. */
 static bool load_png(const char *file_name, TGAImageRec &tex)
 {
@@ -2259,7 +1694,7 @@ static bool load_png(const char *file_name, TGAImageRec &tex)
     png_init_io(png_ptr, fp);
     png_read_png(png_ptr, info_ptr,
                  PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING,
-                 png_voidp_NULL);
+                 NULL);
     png_get_IHDR(png_ptr, info_ptr, &width, &height,
                  &bit_depth, &color_type, &interlace_type, NULL, NULL);
 
@@ -2277,10 +1712,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;
@@ -2313,9 +1744,95 @@ static bool load_png(const char *file_name, TGAImageRec &tex)
     retval = true;
 
 png_done:
-   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-   fclose(fp);
-   return (retval);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+    if (fp)
+        fclose(fp);
+    return (retval);
 }
-#endif
+
+
+static bool save_image(const char *file_name)
+{
+    const char *ptr = strrchr((char *)file_name, '.');
+    if (ptr)
+    {
+        if (strcasecmp(ptr+1, "png") == 0)
+            return save_png(file_name);
+    }
+
+    STUBBED("Unsupported image type");
+    return false;
+}
+
+
+static bool save_png(const char *file_name)
+{
+    FILE *fp = NULL;
+    png_structp png_ptr = NULL;
+    png_infop info_ptr = NULL;
+    bool retval = false;
+
+    fp = fopen(file_name, "wb");
+    if (fp == NULL)
+        return false;
+
+    png_bytep *row_pointers = new png_bytep[kContextHeight];
+    png_bytep screenshot = new png_byte[kContextWidth * kContextHeight * 3];
+    if ((!screenshot) || (!row_pointers))
+        goto save_png_done;
+
+    glGetError();
+    glReadPixels(0, 0, kContextWidth, kContextHeight,
+                 GL_RGB, GL_UNSIGNED_BYTE, screenshot);
+    if (glGetError() != GL_NO_ERROR)
+        goto save_png_done;
+
+    for (int i = 0; i < kContextHeight; i++)
+        row_pointers[i] = screenshot + ((kContextWidth * ((kContextHeight-1) - i)) * 3);
+
+    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+    if (png_ptr == NULL)
+        goto save_png_done;
+
+    info_ptr = png_create_info_struct(png_ptr);
+    if (info_ptr == NULL)
+        goto save_png_done;
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+        goto save_png_done;
+
+    png_init_io(png_ptr, fp);
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+        goto save_png_done;
+
+    png_set_IHDR(png_ptr, info_ptr, kContextWidth, kContextHeight,
+                 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+                 PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+    png_write_info(png_ptr, info_ptr);
+
+    if (setjmp(png_jmpbuf(png_ptr)))
+        goto save_png_done;
+
+       png_write_image(png_ptr, row_pointers);
+
+       if (setjmp(png_jmpbuf(png_ptr)))
+        goto save_png_done;
+
+    png_write_end(png_ptr, NULL);
+    retval = true;
+
+save_png_done:
+    png_destroy_write_struct(&png_ptr, &info_ptr);
+    delete[] screenshot;
+    delete[] row_pointers;
+    if (fp)
+        fclose(fp);
+    if (!retval)
+        unlink(ConvertFileName(file_name));
+    return retval;
+}
+
+