r4268 - in packages/trunk/starfighter/debian: . patches
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Sun Sep 23 10:49:05 UTC 2007
Author: goneri-guest
Date: 2007-09-23 10:49:05 +0000 (Sun, 23 Sep 2007)
New Revision: 4268
Removed:
packages/trunk/starfighter/debian/patches/gcc-4.2.diff
Modified:
packages/trunk/starfighter/debian/changelog
packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
Log:
fix 10_nobusyloop.diff
Modified: packages/trunk/starfighter/debian/changelog
===================================================================
--- packages/trunk/starfighter/debian/changelog 2007-09-23 09:40:43 UTC (rev 4267)
+++ packages/trunk/starfighter/debian/changelog 2007-09-23 10:49:05 UTC (rev 4268)
@@ -5,7 +5,7 @@
[ Gonéri Le Bouder ]
* update 10_nobusyloop.diff to fix the build with gcc 4.2
- thanks Brian m. Carlson for the patch (Closes: #385714)
+ thanks Brian m. Carlson and Jens Seidel(Closes: #385714)
* make the package binNMU by replace starfighter-data (= ${Source-Version})
by starfighter-data (= ${source:Version}), thanks Lior Kaplan
(Closes: #435958)
Modified: packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
===================================================================
--- packages/trunk/starfighter/debian/patches/10_nobusyloop.diff 2007-09-23 09:40:43 UTC (rev 4267)
+++ packages/trunk/starfighter/debian/patches/10_nobusyloop.diff 2007-09-23 10:49:05 UTC (rev 4268)
@@ -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(std::min(SDL_GetTicks(), 0), 16));
++ SDL_Delay(frameLimit + 16 - max(min(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(std::min(SDL_GetTicks(), 0), 16));
++ SDL_Delay(frameLimit + 16 - max(min(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(std::min(SDL_GetTicks(), 0), 16));
++ SDL_Delay(frameLimit + 16 - max(min(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(std::min(SDL_GetTicks(), 0), 16));
++ SDL_Delay(frameLimit + 16 - max(min(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(std::min(SDL_GetTicks(), 0), 16));
++ SDL_Delay(frameLimit + 16 - max(min(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(std::min(SDL_GetTicks(), 0), 16));
++ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
frameLimit = SDL_GetTicks();
}
Deleted: packages/trunk/starfighter/debian/patches/gcc-4.2.diff
===================================================================
--- packages/trunk/starfighter/debian/patches/gcc-4.2.diff 2007-09-23 09:40:43 UTC (rev 4267)
+++ packages/trunk/starfighter/debian/patches/gcc-4.2.diff 2007-09-23 10:49:05 UTC (rev 4268)
@@ -1,113 +0,0 @@
---- starfighter-1.1.orig/code/classes.h
-+++ starfighter-1.1/code/classes.h
-@@ -427,7 +427,7 @@
- {
- SDL_Flip(screen);
- // Give the audio (and possibly the X server) time to work...
-- SDL_Delay(1);
-+ // SDL_Delay(1);
- }
-
- /*
---- starfighter-1.1.orig/code/game.cpp
-+++ starfighter-1.1/code/game.cpp
-@@ -240,6 +240,7 @@
- then = SDL_GetTicks();
- frames = 0;
- graphics.updateScreen();
-+ SDL_Delay(16);
- }
-
- if ((currentGame.area == 24) && (engine.addAliens > -1))
-@@ -277,11 +278,7 @@
- }
-
- // (Attempt to) Limit us to 60 frame a second
-- while (SDL_GetTicks() < (frameLimit + 16))
-- {
-- // 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));
- frameLimit = SDL_GetTicks();
- }
-
---- starfighter-1.1.orig/code/intermission.cpp
-+++ starfighter-1.1/code/intermission.cpp
-@@ -848,7 +848,7 @@
- doCursor();
-
- // Limit us to 60 frame a second
-- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
- frameLimit = SDL_GetTicks();
- }
-
---- starfighter-1.1.orig/code/missions.cpp
-+++ starfighter-1.1/code/missions.cpp
-@@ -795,6 +795,7 @@
- getPlayerInput();
- if ((engine.keyState[SDLK_LCTRL]) || (engine.keyState[SDLK_RCTRL]))
- break;
-+ SDL_Delay(16);
- }
-
- graphics.clearScreen(graphics.black);
-@@ -913,6 +914,7 @@
- getPlayerInput();
- if ((engine.keyState[SDLK_LCTRL]) || (engine.keyState[SDLK_RCTRL]))
- break;
-+ SDL_Delay(16);
- }
- }
-
---- starfighter-1.1.orig/code/script.cpp
-+++ starfighter-1.1/code/script.cpp
-@@ -298,7 +298,7 @@
- if ((showMessage) && (graphics.messageBox != NULL))
- 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));
- frameLimit = SDL_GetTicks();
-
- if (engine.keyState[SDLK_ESCAPE])
---- starfighter-1.1.orig/code/title.cpp
-+++ starfighter-1.1/code/title.cpp
-@@ -453,7 +453,8 @@
- engine.keyState[SDLK_LCTRL] = engine.keyState[SDLK_RCTRL] = engine.keyState[SDLK_SPACE] = 0;
- }
-
-- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ // (Attempt to) Limit us to 60 frame a second
-+ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
- frameLimit = SDL_GetTicks();
- }
-
-@@ -558,7 +559,7 @@
- break;
- }
-
-- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
- frameLimit = SDL_GetTicks();
- }
- }
-@@ -614,7 +615,7 @@
- graphics.blit(gameover, x, y);
-
- // Limit us to 60 frame a second
-- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
- frameLimit = SDL_GetTicks();
- }
-
-@@ -724,7 +725,7 @@
- SDL_FillRect(graphics.screen, &r1, graphics.black);
- SDL_FillRect(graphics.screen, &r2, graphics.black);
-
-- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(frameLimit + 16 - max(min(SDL_GetTicks(), 0), 16));
- frameLimit = SDL_GetTicks();
- }
-
More information about the Pkg-games-commits
mailing list