--- a/src/gfx.cpp	Mon Mar 19 09:33:17 2007 +0000
+++ b/src/gfx.cpp	Mon Mar 19 12:38:16 2007 +0000
@@ -37,18 +37,18 @@
 bool _exit_game;
 bool _networking;         ///< are we in networking mode?
 byte _game_mode;
-byte _pause;
+byte _pause_game;
 int _pal_first_dirty;
 int _pal_last_dirty;
 
 Colour _cur_palette[256];
 byte _stringwidth_table[FS_END][224];
 
-typedef enum BlitterModes {
+enum BlitterMode {
 	BM_NORMAL,
 	BM_COLOUR_REMAP,
 	BM_TRANSPARENT,
-} BlitterMode;
+};
 
 static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode);
 
@@ -718,7 +718,7 @@
 	}
 }
 
-typedef struct BlitterParams {
+struct BlitterParams {
 	int start_x, start_y;
 	const byte *sprite;
 	Pixel *dst;
@@ -726,7 +726,7 @@
 	int width, height;
 	int width_org;
 	int pitch;
-} BlitterParams;
+};
 
 static void GfxBlitTileZoomIn(BlitterParams *bp)
 {
@@ -1524,9 +1524,9 @@
 	}
 }
 
-void DoPaletteAnimations(void);
+void DoPaletteAnimations();
 
-void GfxInitPalettes(void)
+void GfxInitPalettes()
 {
 	memcpy(_cur_palette, _palettes[_use_dos_palette ? 1 : 0], sizeof(_cur_palette));
 
@@ -1538,7 +1538,7 @@
 #define EXTR(p, q) (((uint16)(_timer_counter * (p)) * (q)) >> 16)
 #define EXTR2(p, q) (((uint16)(~_timer_counter * (p)) * (q)) >> 16)
 
-void DoPaletteAnimations(void)
+void DoPaletteAnimations()
 {
 	const Colour *s;
 	Colour *d;
@@ -1649,7 +1649,7 @@
 }
 
 
-void LoadStringWidthTable(void)
+void LoadStringWidthTable()
 {
 	uint i;
 
@@ -1678,7 +1678,7 @@
 }
 
 
-void ScreenSizeChanged(void)
+void ScreenSizeChanged()
 {
 	/* check the dirty rect */
 	if (_invalid_rect.right >= _screen.width) _invalid_rect.right = _screen.width;
@@ -1688,7 +1688,7 @@
 	_cursor.visible = false;
 }
 
-void UndrawMouseCursor(void)
+void UndrawMouseCursor()
 {
 	if (_cursor.visible) {
 		_cursor.visible = false;
@@ -1701,7 +1701,7 @@
 	}
 }
 
-void DrawMouseCursor(void)
+void DrawMouseCursor()
 {
 	int x;
 	int y;
@@ -1794,7 +1794,7 @@
 	_video_driver->make_dirty(left, top, right - left, bottom - top);
 }
 
-void DrawDirtyBlocks(void)
+void DrawDirtyBlocks()
 {
 	byte *b = _dirty_blocks;
 	const int w = ALIGN(_screen.width, 64);
@@ -1916,7 +1916,7 @@
 	} while (--height != 0);
 }
 
-void MarkWholeScreenDirty(void)
+void MarkWholeScreenDirty()
 {
 	SetDirtyBlocks(0, 0, _screen.width, _screen.height);
 }
@@ -1995,7 +1995,7 @@
 	cv->dirty = true;
 }
 
-static void SwitchAnimatedCursor(void)
+static void SwitchAnimatedCursor()
 {
 	const AnimCursor *cur = _cursor.animate_cur;
 
@@ -2007,7 +2007,7 @@
 	_cursor.animate_cur     = cur + 1;
 }
 
-void CursorTick(void)
+void CursorTick()
 {
 	if (_cursor.animate_timeout != 0 && --_cursor.animate_timeout == 0)
 		SwitchAnimatedCursor();