Changeset 134 for abuseTweet

Timestamp:

Apr 10, 2008, 11:08:14 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Removed 4300 lines of unused code.

Location:

abuse/trunk/src

Files:

• control.cpp (modified) (1 diff)
• game.cpp (modified) (2 diffs)
• game.hpp (modified) (1 diff)
• imlib/Makefile.am (modified) (2 diffs)
• imlib/decoder.cpp (deleted)
• imlib/dir.h (deleted)
• imlib/dos.h (deleted)
• imlib/emm.hpp (deleted)
• imlib/errs.h (deleted)
• imlib/gifdecod.hpp (deleted)
• imlib/gifread.cpp (deleted)
• imlib/gifread.hpp (deleted)
• imlib/glread.cpp (deleted)
• imlib/glread.hpp (deleted)
• imlib/image-24.cpp (deleted)
• imlib/image24.cpp (deleted)
• imlib/image24.hpp (deleted)
• imlib/jdir.hpp (modified) (1 diff)
• imlib/lbmread.cpp (deleted)
• imlib/lbmread.hpp (deleted)
• imlib/loader.cpp (deleted)
• imlib/loader.hpp (deleted)
• imlib/mdlread.cpp (deleted)
• imlib/mdlread.hpp (deleted)
• imlib/packet.cpp (deleted)
• imlib/packet.hpp (deleted)
• imlib/palette.cpp (modified) (1 diff)
• imlib/pcxread.cpp (modified) (5 diffs)
• imlib/pcxread.hpp (modified) (1 diff)
• imlib/ppmread.cpp (deleted)
• imlib/ppmread.hpp (deleted)
• imlib/readxwd.cpp (deleted)
• imlib/sprite.cpp (modified) (1 diff)
• imlib/std.h (deleted)
• imlib/targa.cpp (deleted)
• imlib/targa.hpp (deleted)
• imlib/texture.cpp (deleted)
• imlib/texture.hpp (deleted)
• imlib/tree.cpp (deleted)
• imlib/unpackgl.cpp (deleted)
• imlib/wildargv.cpp (deleted)
• imlib/xinclude.h (deleted)
• imlib/xwdread.cpp (deleted)
• imlib/xwdread.hpp (deleted)
• sdlport/mouse.cpp (modified) (1 diff)
• sdlport/video.cpp (modified) (28 diffs)

abuse/trunk/src/control.cpp

@@ -13 +13 @@
 #include "control.hpp"
 #include "specs.hpp"
-#include "loader.hpp"
 #include "hpoint.hpp"
 #include "ability.hpp"

abuse/trunk/src/game.cpp

@@ -29 +29 @@
 #include "ability.hpp"
 #include "cache.hpp"
-#include "loader.hpp"
 #include "lisp.hpp"
 #include "jrand.hpp"
@@ -1219 +1218 @@
 void do_title()
 {
-    if(cdc_logo != -1)
-    {
-        if(sound_avail & MUSIC_INITIALIZED)
-        {
-            if(current_song)
+    if(cdc_logo == -1)
+        return;
+
+    if(sound_avail & MUSIC_INITIALIZED)
+    {
+        if(current_song)
+        {
+            current_song->stop();
+            delete current_song;
+        }
+        current_song = new song("music/intro.hmi");
+        current_song->play(music_volume);
+    }
+
+    void *logo_snd = symbol_value(make_find_symbol("LOGO_SND"));
+
+    if(DEFINEDP(logo_snd) && (sound_avail & SFX_INITIALIZED))
+        cache.sfx(lnumber_value(logo_snd))->play(sfx_volume);
+
+    // This must be a dynamic allocated image because if it
+    // is not and the window gets closed during do_title, then
+    // exit() will try to delete (through the desctructor of
+    // image_list in image.cpp) the image on the stack -> boom.
+    image *blank = new image(2, 2);
+    blank->clear();
+    wm->set_mouse_shape(blank->copy(), 0, 0); // hide mouse
+    delete blank;
+    fade_in(cache.img(cdc_logo), 32);
+
+    milli_wait(400);
+
+    void *space_snd = symbol_value(make_find_symbol("SPACE_SND"));
+
+    fade_out(32);
+    milli_wait(100);
+
+    int i;
+    char *str = lstring_value(eval(make_find_symbol("plot_start")));
+
+    bFILE *fp = open_file("art/smoke.spe", "rb");
+    if(!fp->open_failure())
+    {
+        spec_directory sd(fp);
+        palette *old_pal = pal;
+        pal = new palette(sd.find(SPEC_PALETTE), fp);
+        pal->shift(1);
+
+        image *gray = new image(sd.find("gray_pict"), fp);
+        image *smoke[5];
+
+        char nm[20];
+        for(i = 0; i < 5; i++)
+        {
+            sprintf(nm, "smoke%04d.pcx", i + 1);
+            smoke[i] = new image(sd.find(nm), fp);
+        }
+
+        screen->clear();
+        pal->load();
+
+        int dx = (xres + 1) / 2 - gray->width() / 2, dy = (yres + 1) / 2 - gray->height() / 2;
+        gray->put_image(screen, dx, dy);
+        smoke[0]->put_image(screen, dx + 24, dy + 5);
+
+        fade_in(NULL, 16);
+        uint8_t cmap[32];
+        for(i = 0; i < 32; i++)
+        cmap[i] = pal->find_closest(i * 256 / 32, i * 256 / 32, i * 256 / 32);
+
+        event ev;
+        ev.type = EV_SPURIOUS;
+        time_marker start;
+
+        for(i = 0; i < 320 && (ev.type != EV_KEY && ev.type != EV_MOUSE_BUTTON); i++)
+        {
+            gray->put_image(screen, dx, dy);
+            smoke[i % 5]->put_image(screen, dx + 24, dy + 5);
+            text_draw(205 - i, dx + 15, dy, dx + 320 - 15, dy + 199, str, wm->font(), cmap, wm->bright_color());
+            wm->flush_screen();
+            time_marker now;
+
+            while(now.diff_time(&start) < 0.18)
             {
-                current_song->stop();
-                delete current_song;
+                milli_wait(20); // ECS - Added the wait, so CPU utilization stays low during the story
+                now.get_time();
             }
-            current_song = new song("music/intro.hmi");
-            current_song->play(music_volume);
-        }
-
-        void *logo_snd = symbol_value(make_find_symbol("LOGO_SND"));
-
-        if(DEFINEDP(logo_snd) && (sound_avail & SFX_INITIALIZED))
-            cache.sfx(lnumber_value(logo_snd))->play(sfx_volume);
-
-        // This must be a dynamic allocated image because if it
-        // is not and the window gets closed during do_title, then
-        // exit() will try to delete (through the desctructor of
-        // image_list in image.cpp) the image on the stack -> boom.
-        image *blank = new image(2, 2);
-        blank->clear();
-        wm->set_mouse_shape(blank->copy(), 0, 0); // hide mouse
-        delete blank;
-        fade_in(cache.img(cdc_logo), 32);
-
-        milli_wait(400);
-
-        void *space_snd = symbol_value(make_find_symbol("SPACE_SND"));
-
-        fade_out(32);
-        milli_wait(100);
-
-        int i;
-        char *str = lstring_value(eval(make_find_symbol("plot_start")));
-
-        bFILE *fp = open_file("art/smoke.spe", "rb");
-        if(!fp->open_failure())
-        {
-            spec_directory sd(fp);
-            palette *old_pal = pal;
-            pal = new palette(sd.find(SPEC_PALETTE), fp);
-            pal->shift(1);
-
-            image *gray = new image(sd.find("gray_pict"), fp);
-            image *smoke[5];
-
-            char nm[20];
-            for(i = 0; i < 5; i++)
+
+            start.get_time();
+
+            while(wm->event_waiting() && ev.type != EV_KEY)
             {
-                sprintf(nm, "smoke%04d.pcx", i + 1);
-                smoke[i] = new image(sd.find(nm), fp);
+                wm->get_event(ev);
             }
-
-            screen->clear();
-            pal->load();
-
-            int dx = (xres + 1) / 2 - gray->width() / 2, dy = (yres + 1) / 2 - gray->height() / 2;
-            gray->put_image(screen, dx, dy);
-            smoke[0]->put_image(screen, dx + 24, dy + 5);
-
-            fade_in(NULL, 16);
-            uint8_t cmap[32];
-            for(i = 0; i < 32; i++)
-            cmap[i] = pal->find_closest(i * 256 / 32, i * 256 / 32, i * 256 / 32);
-
-            event ev;
-            ev.type = EV_SPURIOUS;
-            time_marker start;
-
-            for(i = 0; i < 320 && (ev.type != EV_KEY && ev.type != EV_MOUSE_BUTTON); i++)
+            if((i % 5) == 0 && DEFINEDP(space_snd) && (sound_avail & SFX_INITIALIZED))
             {
-                gray->put_image(screen, dx, dy);
-                smoke[i % 5]->put_image(screen, dx + 24, dy + 5);
-                text_draw(205 - i, dx + 15, dy, dx + 320 - 15, dy + 199, str, wm->font(), cmap, wm->bright_color());
-                wm->flush_screen();
-                time_marker now;
-
-                while(now.diff_time(&start) < 0.18)
-                {
-                    milli_wait(20); // ECS - Added the wait, so CPU utilization stays low during the story
-                    now.get_time();
-                }
-
-                start.get_time();
-
-                while(wm->event_waiting() && ev.type != EV_KEY)
-                {
-                    wm->get_event(ev);
-                }
-                if((i % 5) == 0 && DEFINEDP(space_snd) && (sound_avail & SFX_INITIALIZED))
-                {
-                    cache.sfx(lnumber_value(space_snd))->play(sfx_volume * 90 / 127);
-                }
+                cache.sfx(lnumber_value(space_snd))->play(sfx_volume * 90 / 127);
             }
-
-            the_game->reset_keymap();
-
-            fade_out(16);
-
-            for(i = 0; i < 5; i++)
-                delete smoke[i];
-            delete gray;
-            delete pal;
-            pal = old_pal;
-        }
-        delete fp;
-
-        if(title_screen >= 0)
-            fade_in(cache.img(title_screen), 32);
-    }
+        }
+
+        the_game->reset_keymap();
+
+        fade_out(16);
+
+        for(i = 0; i < 5; i++)
+            delete smoke[i];
+        delete gray;
+        delete pal;
+        pal = old_pal;
+    }
+    delete fp;
+
+    if(title_screen >= 0)
+        fade_in(cache.img(title_screen), 32);
 }
 

abuse/trunk/src/game.hpp

@@ -16 +16 @@
 #include "image.hpp"
 #include "video.hpp"
-#include "mdlread.hpp"
 #include "event.hpp"
 #include "fonts.hpp"
-#include "loader.hpp"
 #include "items.hpp"
 #include "jwindow.hpp"

abuse/trunk/src/imlib/Makefile.am

@@ -4 +4 @@
 libimlib_a_SOURCES = \
     filter.cpp filter.hpp \
-    gifread.cpp gifread.hpp \
     globals.cpp \
     image.cpp image.hpp \
     linked.cpp linked.hpp \
     input.cpp input.hpp \
-    mdlread.cpp mdlread.hpp \
     palette.cpp palette.hpp \
-    ppmread.cpp ppmread.hpp \
     include.cpp include.hpp \
-    xwdread.cpp xwdread.hpp \
     fonts.cpp fonts.hpp \
-    decoder.cpp \
-    loader.cpp loader.hpp \
-    glread.cpp glread.hpp \
-    texture.cpp texture.hpp \
     specs.cpp specs.hpp \
     supmorph.cpp supmorph.hpp \
-    image24.cpp image24.hpp \
     pcxread.cpp pcxread.hpp \
     timage.cpp timage.hpp \
     jrand.cpp jrand.hpp \
-    lbmread.cpp lbmread.hpp \
-    targa.cpp targa.hpp \
     keys.cpp keys.hpp \
     dprint.cpp dprint.hpp \
     status.cpp status.hpp \
-    visobj.cpp visobj.hpp \
-    packet.cpp packet.hpp \
     readwav.cpp readwav.hpp \
     pmenu.cpp pmenu.hpp \
@@ -40 +27 @@
     sprite.cpp sprite.hpp \
     jwindow.cpp jwindow.hpp \
-    main.hpp macs.hpp video.hpp gifdecod.hpp event.hpp mouse.hpp timing.hpp \
-    jdir.hpp emm.hpp system.h std.h dos.h dir.h errs.h \
+    main.hpp macs.hpp video.hpp event.hpp mouse.hpp timing.hpp jdir.hpp \
+    system.h \
     $(NULL)
 

abuse/trunk/src/imlib/jdir.hpp

@@ -13 +13 @@
 void get_directory(char *path, char **&files, int &tfiles, char **&dirs, int &tdirs);
 
-
 #endif

abuse/trunk/src/imlib/palette.cpp

@@ -15 +15 @@
 #include "image.hpp"
 #include "macs.hpp"
-#include "dos.h"
 #include "video.hpp"
 #include "filter.hpp"

abuse/trunk/src/imlib/pcxread.cpp

@@ -23 +23 @@
 } PCX_header;
 
-int read_PCX_header(FILE *fp)
-{
-  if (!fread(&PCX_header.manufactururer,1,1,fp)) return 0;
-  if (!fread(&PCX_header.version,1,1,fp)) return 0;
-  if (!fread(&PCX_header.encoding,1,1,fp)) return 0;
-  if (!fread(&PCX_header.bits_per_pixel,1,1,fp)) return 0;
-  PCX_header.xmin=read_uint16(fp);
-  PCX_header.ymin=read_uint16(fp);
-  PCX_header.xmax=read_uint16(fp);
-  PCX_header.ymax=read_uint16(fp);
-  PCX_header.hres=read_uint16(fp);
-  PCX_header.vres=read_uint16(fp);
-  if (!fread(PCX_header.palette,1,48,fp)) return 0;
-  if (!fread(&PCX_header.reserved,1,1,fp)) return 0;
-  if (!fread(&PCX_header.color_planes,1,1,fp)) return 0;
-  PCX_header.bytes_per_line=read_uint16(fp);
-  PCX_header.palette_type=read_uint16(fp);
-  if (!fread(PCX_header.filter,1,58,fp)) return 0;
-  return 1;
-}
-
 int write_PCX_header(FILE *fp)
 {
@@ -65 +44 @@
 }
 
-
-
-PCX_type PCX_file_type(char const *filename)
-{
-  FILE *fp=fopen(filename,"rb");
-  if (!fp)
-  { set_error(imREAD_ERROR);
-    return not_PCX;
-  }
-
-  if (!read_PCX_header(fp))
-  {
-    fclose(fp);
-    set_error(imREAD_ERROR);
-    return not_PCX;
-  }
-  fclose(fp);
-  if (PCX_header.manufactururer!=10)
-    return not_PCX;
-  if (PCX_header.color_planes==3 && PCX_header.bits_per_pixel==8)
-    return PCX_24;
-  else if (PCX_header.color_planes==1 && PCX_header.bits_per_pixel==8)
-    return PCX_8;
-  else return not_PCX;
-}
-
-void read_PCX_line(FILE *fp, unsigned char *start, short skip, int width)
-{
-  int c,n=0,i;
-
-  do
-  {
-    c=fgetc(fp)&0xff;
-    if ((c&0xc0)==0xc0)
-    {
-      i=c&0x3f;
-      c=fgetc(fp);
-      while (i--)
-      {
-    *start=c;
-    start+=skip;
-        n++;    
-      }
-    }
-    else
-    {
-      *start=c;
-      start+=skip;
-      n++;
-    }
-  } while (n<width);
-}
-
-
-image24 *read_PCX24(char const *filename)
-{
-  if (PCX_file_type(filename)!=PCX_24) return NULL;
-  FILE *fp=fopen(filename,"rb");
-  read_PCX_header(fp);
-  image24 *im=new image24(PCX_header.xmax-PCX_header.xmin+1,
-              PCX_header.ymax-PCX_header.ymin+1);
-  int y;
-  for (y=0;y<im->height();y++)
-  {
-    read_PCX_line(fp,im->scan_line(y),3,PCX_header.bytes_per_line);
-    read_PCX_line(fp,im->scan_line(y)+1,3,PCX_header.bytes_per_line);
-    read_PCX_line(fp,im->scan_line(y)+2,3,PCX_header.bytes_per_line);
-  }
-  fclose(fp);
-  return im;
-}
-
-image *read_PCX(char const *filename, palette *&pal)
-{
-  if (PCX_file_type(filename)!=PCX_8) return NULL;
-  FILE *fp=fopen(filename,"rb");
-  read_PCX_header(fp);
-
-  image *im=new image(PCX_header.xmax-PCX_header.xmin+1,
-              PCX_header.ymax-PCX_header.ymin+1);
-  int y;
-  for (y=0;y<im->height();y++)
-    read_PCX_line(fp,im->scan_line(y),1,PCX_header.bytes_per_line);
-  unsigned char palette_confirm;
-  if (!fread(&palette_confirm,1,1,fp) || palette_confirm!=12)
-  {
-    pal=new palette;
-    pal->defaults();
-  }
-  else
-  {
-    pal=new palette;
-    fread(pal->addr(),1,256*3,fp);
-  }
-  fclose(fp);
-  return im;
-}
-
 void write_PCX(image *im, palette *pal, char const *filename)
 {
@@ -171 +52 @@
     return ;
   }
-
 
   PCX_header.manufactururer=10;
@@ -188 +68 @@
   PCX_header.palette_type=0;
   memset(PCX_header.filter,0,58);
-
 
   if (!write_PCX_header(fp))
@@ -226 +105 @@
 }
 
-
-

abuse/trunk/src/imlib/pcxread.hpp

@@ -12 +12 @@
 
 #include "image.hpp"
-#include "image24.hpp"
 #include "palette.hpp"
 
-enum PCX_type { not_PCX, PCX_8, PCX_24 };
-
-PCX_type PCX_file_type(char const *filename);
-image24 *read_PCX24(char const *filename);
-image *read_PCX(char const *filename, palette *&pal);
 void write_PCX(image *im, palette *pal, char const *filename);
 

abuse/trunk/src/imlib/sprite.cpp

@@ -13 +13 @@
 
 #include "macs.hpp"
-#include "mdlread.hpp"
 #include "video.hpp"
 #include "image.hpp"
 #include "palette.hpp"
 #include "linked.hpp"
-#include "glread.hpp"
-#include "gifread.hpp"
-#include "ppmread.hpp"
-#include "emm.hpp"
 #include "sprite.hpp"
 

abuse/trunk/src/sdlport/mouse.cpp

@@ -26 +26 @@
 #include "image.hpp"
 #include "filter.hpp"
-#include "mdlread.hpp"
 #include "mouse.hpp"
 

abuse/trunk/src/sdlport/video.cpp

@@ -21 +21 @@
 
 #include <SDL.h>
-#ifdef HAVE_OPENGL
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif    /* __APPLE__ */
+
+#ifdef HAVE_OPENGL
+#   ifdef __APPLE__
+#       include <OpenGL/gl.h>
+#       include <OpenGL/glu.h>
+#   else
+#       include <GL/gl.h>
+#       include <GL/glu.h>
+#   endif    /* __APPLE__ */
 #endif    /* HAVE_OPENGL */
+
 #include "filter.hpp"
 #include "system.h"
@@ -61 +63 @@
 {
     int value;
-    for( value = 1 ; value < input ; value <<= 1);
+    for(value = 1 ; value < input ; value <<= 1);
     return value;
 }
@@ -69 +71 @@
 // Set the video mode
 //
-void set_mode( int mode, int argc, char **argv )
+void set_mode(int mode, int argc, char **argv)
 {
     const SDL_VideoInfo *vidInfo;
@@ -76 +78 @@
     // Check for video capabilities
     vidInfo = SDL_GetVideoInfo();
-    if( vidInfo->hw_available )
-    {
+    if(vidInfo->hw_available)
         vidFlags |= SDL_HWSURFACE;
-    }
-    else
-    {
+    else
         vidFlags |= SDL_SWSURFACE;
-    }
-    if( flags.fullscreen )
-    {
+
+    if(flags.fullscreen)
         vidFlags |= SDL_FULLSCREEN;
-    }
-    if( flags.doublebuf )
-    {
+
+    if(flags.doublebuf)
         vidFlags |= SDL_DOUBLEBUF;
-    }
 
     // Calculate the window scale
@@ -98 +94 @@
 
     // Try using opengl hw accell
-    if( flags.gl ) {
-#ifdef HAVE_OPENGL
-        printf( "Video : OpenGL enabled\n" );
+    if(flags.gl) {
+#ifdef HAVE_OPENGL
+        printf("Video : OpenGL enabled\n");
         // allow doublebuffering in with gl too
-        SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, flags.doublebuf );
+        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, flags.doublebuf);
         // set video gl capability
         vidFlags |= SDL_OPENGL;
@@ -109 +105 @@
 #else
         // ignore the option if not available
-        printf( "Video : OpenGL disabled (Support missing in executable)\n");
+        printf("Video : OpenGL disabled (Support missing in executable)\n");
         flags.gl = 0;
 #endif
@@ -115 +111 @@
 
     // Set the icon for this window.  Looks nice on taskbars etc.
-    SDL_WM_SetIcon( SDL_LoadBMP("abuse.bmp"), NULL );
+    SDL_WM_SetIcon(SDL_LoadBMP("abuse.bmp"), NULL);
 
     // Create the window with a preference for 8-bit (palette animations!), but accept any depth */
-    window = SDL_SetVideoMode(flags.xres, flags.yres, 8, vidFlags | SDL_ANYFORMAT );
-    if( window == NULL )
-    {
-        printf( "Video : Unable to set video mode : %s\n", SDL_GetError() );
-        exit( 1 );
+    window = SDL_SetVideoMode(flags.xres, flags.yres, 8, vidFlags | SDL_ANYFORMAT);
+    if(window == NULL)
+    {
+        printf("Video : Unable to set video mode : %s\n", SDL_GetError());
+        exit(1);
     }
 
     // Create the screen image
-    screen = new image( xres, yres, NULL, 2 );
-    if( screen == NULL )
+    screen = new image(xres, yres, NULL, 2);
+    if(screen == NULL)
     {
         // Our screen image is no good, we have to bail.
-        printf( "Video : Unable to create screen image.\n" );
-        exit( 1 );
+        printf("Video : Unable to create screen image.\n");
+        exit(1);
     }
     screen->clear();
@@ -138 +134 @@
     {
 #ifdef HAVE_OPENGL
-        int w,h;
+        int w, h;
 
         // texture width/height should be power of 2
+        // FIXME: we can use GL_ARB_texture_non_power_of_two or
+        // GL_ARB_texture_rectangle to avoid the extra memory allocation
         w = power_of_two(xres);
         h = power_of_two(yres);
 
         // create texture surface
-        texture = SDL_CreateRGBSurface( SDL_SWSURFACE, w ,h ,32,
+        texture = SDL_CreateRGBSurface(SDL_SWSURFACE, w , h , 32,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
-                0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 );
+                0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
 #else
-                0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF );
+                0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
 #endif
 
@@ -164 +162 @@
         glLoadIdentity();
 
-        glOrtho(0.0, (GLdouble)window->w, (GLdouble)window->h, 0.0, 0.0,1.0);
+        glOrtho(0.0, (GLdouble)window->w, (GLdouble)window->h, 0.0, 0.0, 1.0);
 
         glMatrixMode(GL_MODELVIEW);
@@ -181 +179 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, flags.antialias);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, flags.antialias);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels );
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels);
 #endif
     }
 
     // Create our 8-bit surface
-    surface = SDL_CreateRGBSurface( SDL_SWSURFACE, window->w, window->h, 8, 0xff, 0xff, 0xff, 0xff );
-    if( surface == NULL )
+    surface = SDL_CreateRGBSurface(SDL_SWSURFACE, window->w, window->h, 8, 0xff, 0xff, 0xff, 0xff);
+    if(surface == NULL)
     {
         // Our surface is no good, we have to bail.
-        printf( "Video : Unable to create 8-bit surface.\n" );
-        exit( 1 );
-    }
-
-    printf( "Video : %dx%d %dbpp\n", window->w, window->h, window->format->BitsPerPixel );
+        printf("Video : Unable to create 8-bit surface.\n");
+        exit(1);
+    }
+
+    printf("Video : %dx%d %dbpp\n", window->w, window->h, window->format->BitsPerPixel);
 
     // Set the window caption
-    SDL_WM_SetCaption( "Abuse-SDL", "Abuse-SDL" );
+    SDL_WM_SetCaption("Abuse", "Abuse");
 
     // Grab and hide the mouse cursor
-    SDL_ShowCursor( 0 );
-    if( flags.grabmouse )
-    {
-        SDL_WM_GrabInput( SDL_GRAB_ON );
-    }
-
-    update_dirty( screen );
+    SDL_ShowCursor(0);
+    if(flags.grabmouse)
+        SDL_WM_GrabInput(SDL_GRAB_ON);
+
+    update_dirty(screen);
 }
 
@@ -215 +211 @@
 void close_graphics()
 {
-    if( lastl )
-    {
+    if(lastl)
         delete lastl;
-    }
     lastl = NULL;
     // Free our 8-bit surface
-    if( surface )
-    {
-        SDL_FreeSurface( surface );
-    }
-#ifdef HAVE_OPENGL
-    if ( texture )
-    {
-        SDL_FreeSurface( texture );
-    }
+    if(surface)
+        SDL_FreeSurface(surface);
+
+#ifdef HAVE_OPENGL
+    if (texture)
+        SDL_FreeSurface(texture);
 #endif
     delete screen;
@@ -237 +228 @@
 // Draw only dirty parts of the image
 //
-void put_part_image( image *im, int x, int y, int x1, int y1, int x2, int y2 )
+void put_part_image(image *im, int x, int y, int x1, int y1, int x2, int y2)
 {
     int xe, ye;
@@ -246 +237 @@
     Uint16 dinset;
 
-    if( (unsigned)y > yres || (unsigned)x > xres )
-    {
+    if((unsigned)y > yres || (unsigned)x > xres)
         return;
-    }
-    CHECK( x1 >= 0 && x2 >= x1 && y1 >= 0 && y2 >= y1 );
+
+    CHECK(x1 >= 0 && x2 >= x1 && y1 >= 0 && y2 >= y1);
 
     // Adjust if we are trying to draw off the screen
-    if( x < 0 )
+    if(x < 0)
     {
         x1 += -x;
@@ -259 +249 @@
     }
     srcrect.x = x1;
-    if( (unsigned)(x + ( x2 - x1 )) >= xres )
-    {
+    if((unsigned)(x + (x2 - x1)) >= xres)
         xe = xres - x + x1 - 1;
-    }
-    else
-    {
+    else
         xe = x2;
-    }
-    if( y < 0 )
+
+    if(y < 0)
     {
         y1 += -y;
@@ -273 +260 @@
     }
     srcrect.y = y1;
-    if( (unsigned)(y + ( y2 - y1 )) >= yres )
-    {
+    if((unsigned)(y + (y2 - y1)) >= yres)
         ye = yres - y + y1 - 1;
-    }
-    else
-    {
+    else
         ye = y2;
-    }
-    if( srcrect.x >= xe || srcrect.y >= ye )
+
+    if(srcrect.x >= xe || srcrect.y >= ye)
         return;
 
@@ -299 +283 @@
 
     // Lock the surface if necessary
-    if( SDL_MUSTLOCK( surface ) )
-    {
-        SDL_LockSurface( surface );
-    }
+    if(SDL_MUSTLOCK(surface))
+        SDL_LockSurface(surface);
+
     dpixel = (Uint8 *)surface->pixels;
     dpixel += (dstrect.x + ((dstrect.y) * surface->w)) * surface->format->BytesPerPixel;
@@ -311 +294 @@
         srcy = srcrect.y;
         dpixel = ((Uint8 *)surface->pixels) + y * surface->w + x ;
-        for( ii=0 ; ii < srcrect.h; ii++ )
+        for(ii=0 ; ii < srcrect.h; ii++)
         {
-            memcpy( dpixel, im->scan_line( srcy ) + srcrect.x , srcrect.w );
+            memcpy(dpixel, im->scan_line(srcy) + srcrect.x , srcrect.w);
             dpixel += surface->w;
             srcy ++;
@@ -328 +311 @@
         dpixel = (Uint8 *)surface->pixels + (dstrect.x + ((dstrect.y) * surface->w)) * surface->format->BytesPerPixel;
 
-        for( ii = 0; ii < dstrect.h; ii++ )
+        for(ii = 0; ii < dstrect.h; ii++)
         {
             srcx = (srcrect.x << 16);
-            for( jj = 0; jj < dstrect.w; jj++ )
+            for(jj = 0; jj < dstrect.w; jj++)
             {
-                memcpy( dpixel, im->scan_line( (srcy >> 16) ) + ((srcx >> 16) * surface->format->BytesPerPixel), surface->format->BytesPerPixel );
+                memcpy(dpixel, im->scan_line((srcy >> 16)) + ((srcx >> 16) * surface->format->BytesPerPixel), surface->format->BytesPerPixel);
                 dpixel += surface->format->BytesPerPixel;
                 srcx += xstep;
@@ -345 +328 @@
 
     // Unlock the surface if we locked it.
-    if( SDL_MUSTLOCK( surface ) )
-    {
-        SDL_UnlockSurface( surface );
-    }
+    if(SDL_MUSTLOCK(surface))
+        SDL_UnlockSurface(surface);
 
     // Now blit the surface
-    update_window_part( &dstrect);
+    update_window_part(&dstrect);
 }
 
@@ -358 +339 @@
 // Draw the entire image
 //
-void put_image( image * im, int x, int y )
-{
-    put_part_image( im, x, y, 0, 0, im->width() - 1, im->height() - 1 );
+void put_image(image * im, int x, int y)
+{
+    put_part_image(im, x, y, 0, 0, im->width() - 1, im->height() - 1);
 }
 
@@ -367 +348 @@
 // Update the dirty parts of the window
 //
-void update_dirty_window( image *im, int xoff, int yoff )
+void update_dirty_window(image *im, int xoff, int yoff)
 {
     int count;
     dirty_rect *dr, *q;
-    CHECK( im->special ); // make sure the image has the ability to contain dirty areas
-    if( im->special->keep_dirt == 0 )
-    {
-        put_image( im, xoff, yoff );
+    CHECK(im->special); // make sure the image has the ability to contain dirty areas
+    if(im->special->keep_dirt == 0)
+    {
+        put_image(im, xoff, yoff);
     }
     else
     {
         count = im->special->dirties.number_nodes();
-        if( !count )
+        if(!count)
             return;  // if nothing to update, return
-        dr = (dirty_rect *)( im->special->dirties.first() );
-        while( count > 0 )
+        dr = (dirty_rect *)(im->special->dirties.first());
+        while(count > 0)
         {
-            put_part_image( im, xoff + dr->dx1, yoff + dr->dy1, dr->dx1, dr->dy1, dr->dx2 + 1, dr->dy2 + 1 );
+            put_part_image(im, xoff + dr->dx1, yoff + dr->dy1, dr->dx1, dr->dy1, dr->dx2 + 1, dr->dy2 + 1);
             q = dr;
-            dr = (dirty_rect *)( dr->next() );
-            im->special->dirties.unlink( ( linked_node *)q );
+            dr = (dirty_rect *)(dr->next());
+            im->special->dirties.unlink((linked_node *)q);
             delete q;
             count--;
@@ -398 +379 @@
 // Update the dirty parts of the image
 //
-void update_dirty( image *im, int xoff, int yoff )
-{
-    update_dirty_window( im, xoff, yoff );
+void update_dirty(image *im, int xoff, int yoff)
+{
+    update_dirty_window(im, xoff, yoff);
     update_window_done();
 }
@@ -407 +388 @@
 // make_page()
 //
-void image::make_page( short width, short height, unsigned char *page_buffer )
-{
-    if( page_buffer )
+void image::make_page(short width, short height, unsigned char *page_buffer)
+{
+    if(page_buffer)
         data = page_buffer;
     else
-        data = (unsigned char *)malloc( width * height );
+        data = (unsigned char *)malloc(width * height);
 }
 
@@ -420 +401 @@
 void image::delete_page()
 {
-    if( !special || !special->static_mem )
-        free( data );
+    if(!special || !special->static_mem)
+        free(data);
 }
 
@@ -430 +411 @@
 void palette::load()
 {
-    if( lastl )
-    {
+    if(lastl)
         delete lastl;
-    }
     lastl = copy();
 
     // Force to only 256 colours.
     // Shouldn't be needed, but best to be safe.
-    if( ncolors > 256 )
-    {
+    if(ncolors > 256)
         ncolors = 256;
-    }
 
     SDL_Color colors[ncolors];
-    for( int ii = 0; ii < ncolors; ii++ )
+    for(int ii = 0; ii < ncolors; ii++)
     {
         colors[ii].r = red(ii);
@@ -450 +427 @@
         colors[ii].b = blue(ii);
     }
-    SDL_SetColors( surface, colors, 0, ncolors );
-    if( window->format->BitsPerPixel == 8 )
-    {
-        SDL_SetColors( window, colors, 0, ncolors );
-    }
+    SDL_SetColors(surface, colors, 0, ncolors);
+    if(window->format->BitsPerPixel == 8)
+        SDL_SetColors(window, colors, 0, ncolors);
 
     // Now redraw the surface
-    update_window_part( NULL );
+    update_window_part(NULL);
     update_window_done();
 }
@@ -473 +448 @@
 void update_window_done()
 {
+#ifdef HAVE_OPENGL
     // opengl blit complete surface to window
-    if (flags.gl)
-    {
-#ifdef HAVE_OPENGL
+    if(flags.gl)
+    {
         // convert color-indexed surface to RGB texture
-        SDL_BlitSurface( surface, NULL, texture, NULL );
+        SDL_BlitSurface(surface, NULL, texture, NULL);
 
         // Texturemap complete texture to surface so we have free scaling
         // and antialiasing
-        glTexSubImage2D( GL_TEXTURE_2D,0,
-             0,0,texture->w,texture->h,
-             GL_RGBA,GL_UNSIGNED_BYTE,texture->pixels);
+        glTexSubImage2D(GL_TEXTURE_2D, 0,
+                        0, 0, texture->w, texture->h,
+                        GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels);
         glBegin(GL_TRIANGLE_STRIP);
         glTexCoord2f(texcoord[0], texcoord[1]); glVertex3i(0, 0, 0);
@@ -491 +466 @@
         glTexCoord2f(texcoord[2], texcoord[3]); glVertex3i(window->w, window->h, 0);
         glEnd();
-#endif
-    }
-
+
+        if(flags.doublebuf)
+            SDL_GL_SwapBuffers();
+    }
+#else
     // swap buffers in case of double buffering
-    if (flags.doublebuf)
-    {
-        if (flags.gl)
-        {
-#ifdef HAVE_OPENGL
-            SDL_GL_SwapBuffers();
-#endif
-        }
-        else
-        {
-            SDL_Flip(window);
-        }
-    }
-
     // do nothing in case of single buffering
-}
-
-void update_window_part( SDL_Rect *rect)
+    if(flags.doublebuf)
+        SDL_Flip(window);
+#endif
+}
+
+void update_window_part(SDL_Rect *rect)
 {
     // no partial blit's in case of opengl
     // complete blit + scaling just before flip
     if (flags.gl)
-    {
         return;
-    }
-
-    SDL_BlitSurface( surface, rect, window, rect );
+
+    SDL_BlitSurface(surface, rect, window, rect);
 
     // no window update needed until end of run
-    if( flags.doublebuf)
-    {
+    if(flags.doublebuf)
         return;
-    }
 
     // update window part for single buffer
-    if( rect == NULL )
-    {
-        SDL_UpdateRect( window, 0, 0, 0, 0 );
-    }
-    else
-    {
-        SDL_UpdateRect( window, rect->x, rect->y, rect->w, rect->h );
-    }
-}
+    if(rect == NULL)
+        SDL_UpdateRect(window, 0, 0, 0, 0);
+    else
+        SDL_UpdateRect(window, rect->x, rect->y, rect->w, rect->h);
+}