src/video/sdl_v.cpp
branchgamebalance
changeset 9895 7bd07f43b0e3
parent 6314 f738bcf05ad6
child 9911 0b8b245a2391
--- a/src/video/sdl_v.cpp	Mon Mar 19 09:33:17 2007 +0000
+++ b/src/video/sdl_v.cpp	Mon Mar 19 12:38:16 2007 +0000
@@ -49,12 +49,12 @@
 	SDL_CALL SDL_SetColors(_sdl_screen, pal, start, count);
 }
 
-static void InitPalette(void)
+static void InitPalette()
 {
 	UpdatePalette(0, 256);
 }
 
-static void CheckPaletteAnim(void)
+static void CheckPaletteAnim()
 {
 	if (_pal_last_dirty != -1) {
 		UpdatePalette(_pal_first_dirty, _pal_last_dirty - _pal_first_dirty + 1);
@@ -62,7 +62,7 @@
 	}
 }
 
-static void DrawSurfaceToScreen(void)
+static void DrawSurfaceToScreen()
 {
 	int n = _num_dirty_rects;
 	if (n != 0) {
@@ -88,7 +88,7 @@
 	{1920, 1200}
 };
 
-static void GetVideoModes(void)
+static void GetVideoModes()
 {
 	int i;
 	SDL_Rect **modes;
@@ -209,11 +209,11 @@
 	return true;
 }
 
-typedef struct VkMapping {
+struct VkMapping {
 	uint16 vk_from;
 	byte vk_count;
 	byte map_to;
-} VkMapping;
+};
 
 #define AS(x, z) {x, 0, z}
 #define AM(x, y, z, w) {x, y - x, z}
@@ -301,7 +301,7 @@
 	return (key << 16) + sym->unicode;
 }
 
-static int PollEvent(void)
+static int PollEvent()
 {
 	SDL_Event ev;
 
@@ -415,12 +415,12 @@
 	return NULL;
 }
 
-static void SdlVideoStop(void)
+static void SdlVideoStop()
 {
 	SdlClose(SDL_INIT_VIDEO);
 }
 
-static void SdlVideoMainLoop(void)
+static void SdlVideoMainLoop()
 {
 	uint32 cur_ticks = SDL_CALL SDL_GetTicks();
 	uint32 next_tick = cur_ticks + 30;
@@ -452,7 +452,7 @@
 		}
 
 		cur_ticks = SDL_CALL SDL_GetTicks();
-		if (cur_ticks >= next_tick || (_fast_forward && !_pause) || cur_ticks < prev_cur_ticks) {
+		if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) {
 			next_tick = cur_ticks + 30;
 
 			_ctrl_pressed  = !!(mod & KMOD_CTRL);