r4269 - packages/trunk/starfighter/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-09-23 10:56:19 +0000 (Sun, 23 Sep 2007)
New Revision: 4269

Modified:
   packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
Log:
fix the patch for real :)


Modified: packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
===================================================================
--- packages/trunk/starfighter/debian/patches/10_nobusyloop.diff	2007-09-23 10:49:05 UTC (rev 4268)
+++ packages/trunk/starfighter/debian/patches/10_nobusyloop.diff	2007-09-23 10:56:19 UTC (rev 4269)
@@ -32,7 +32,7 @@
 -			// Do nothing. If we were to insert an SDL_Delay(1) in here
 -			// then we would actually lose around 10 frames per second!!
 -		}
-+		SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - min(max(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  
@@ -45,7 +45,7 @@
  
  		// Limit us to 60 frame a second
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - min(max(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  
@@ -78,7 +78,7 @@
  			graphics.blit(graphics.messageBox, (800 - graphics.messageBox->w) / 2, 500);
  
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - min(max(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  		
  		if (engine.keyState[SDLK_ESCAPE])
@@ -91,7 +91,7 @@
  		}
  
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - min(max(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  }
@@ -100,7 +100,7 @@
  
  		// Limit us to 60 frame a second
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - min(max(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  
@@ -109,7 +109,7 @@
  		SDL_FillRect(graphics.screen, &r2, graphics.black);
  
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - min(max(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}