r4295 - in packages/trunk/starfighter/debian: . patches
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Sat Sep 29 22:13:14 UTC 2007
Author: goneri-guest
Date: 2007-09-29 22:13:14 +0000 (Sat, 29 Sep 2007)
New Revision: 4295
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-29 21:24:49 UTC (rev 4294)
+++ packages/trunk/starfighter/debian/changelog 2007-09-29 22:13:14 UTC (rev 4295)
@@ -6,11 +6,9 @@
[ Gonéri Le Bouder ]
* update 10_nobusyloop.diff to fix the build with gcc 4.2
thanks Brian m. Carlson and Jens Seidel(Closes: #385714)
-TODO this patch is broken
* make the package binNMU by replace starfighter-data (= ${Source-Version})
by starfighter-data (= ${source:Version}), thanks Lior Kaplan
(Closes: #435958)
-TODO seems to be broken too...
* clean the starfighter binary (Closes: #424236)
* do not ignore make clean return anymore
* add myself in Uploaders:
Modified: packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
===================================================================
--- packages/trunk/starfighter/debian/patches/10_nobusyloop.diff 2007-09-29 21:24:49 UTC (rev 4294)
+++ packages/trunk/starfighter/debian/patches/10_nobusyloop.diff 2007-09-29 22:13:14 UTC (rev 4295)
@@ -1,20 +1,16 @@
-Index: starfighter-1.1/code/classes.h
-===================================================================
---- starfighter-1.1.orig/code/classes.h 2007-09-22 09:51:31.000000000 +0000
-+++ starfighter-1.1/code/classes.h 2007-09-22 09:51:44.000000000 +0000
-@@ -447,7 +447,7 @@
+--- 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);
++ // SDL_Delay(1);
}
/*
-Index: starfighter-1.1/code/game.cpp
-===================================================================
---- starfighter-1.1.orig/code/game.cpp 2007-09-22 09:51:54.000000000 +0000
-+++ starfighter-1.1/code/game.cpp 2007-09-22 09:53:16.000000000 +0000
+--- starfighter-1.1.orig/code/game.cpp
++++ starfighter-1.1/code/game.cpp
@@ -240,6 +240,7 @@
then = SDL_GetTicks();
frames = 0;
@@ -32,27 +28,23 @@
- // 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(max(frameLimit + 16 - SDL_GetTicks(), 0));
++ if (frameLimit + 16 - SDL_GetTicks()) { SDL_Delay(16); }
frameLimit = SDL_GetTicks();
}
-Index: starfighter-1.1/code/intermission.cpp
-===================================================================
---- starfighter-1.1.orig/code/intermission.cpp 2007-09-22 09:53:32.000000000 +0000
-+++ starfighter-1.1/code/intermission.cpp 2007-09-22 09:53:54.000000000 +0000
+--- 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(max(frameLimit + 16 - SDL_GetTicks(), 0));
++ if (frameLimit + 16 - SDL_GetTicks()) { SDL_Delay(16); }
frameLimit = SDL_GetTicks();
}
-Index: starfighter-1.1/code/missions.cpp
-===================================================================
---- starfighter-1.1.orig/code/missions.cpp 2007-09-22 09:54:05.000000000 +0000
-+++ starfighter-1.1/code/missions.cpp 2007-09-22 09:54:43.000000000 +0000
+--- 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]))
@@ -69,47 +61,53 @@
}
}
-Index: starfighter-1.1/code/script.cpp
-===================================================================
---- starfighter-1.1.orig/code/script.cpp 2007-09-22 09:54:57.000000000 +0000
-+++ starfighter-1.1/code/script.cpp 2007-09-22 09:55:20.000000000 +0000
+--- 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(max(frameLimit + 16 - SDL_GetTicks(), 0));
++ if (frameLimit + 16 - SDL_GetTicks()) { SDL_Delay(16); }
frameLimit = SDL_GetTicks();
if (engine.keyState[SDLK_ESCAPE])
-Index: starfighter-1.1/code/title.cpp
-===================================================================
---- starfighter-1.1.orig/code/title.cpp 2007-09-22 09:55:26.000000000 +0000
-+++ starfighter-1.1/code/title.cpp 2007-09-22 09:56:44.000000000 +0000
-@@ -558,7 +558,7 @@
+--- 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
++ if (frameLimit + 16 - SDL_GetTicks()) { SDL_Delay(16); }
+ frameLimit = SDL_GetTicks();
+ }
+
+@@ -558,7 +559,7 @@
break;
}
- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(max(frameLimit + 16 - SDL_GetTicks(), 0));
++ if (frameLimit + 16 - SDL_GetTicks()) { SDL_Delay(16); }
frameLimit = SDL_GetTicks();
}
}
-@@ -614,7 +614,7 @@
+@@ -614,7 +615,7 @@
graphics.blit(gameover, x, y);
// Limit us to 60 frame a second
- while (SDL_GetTicks() < (frameLimit + 16)){}
-+ SDL_Delay(max(frameLimit + 16 - SDL_GetTicks(), 0));
++ if (frameLimit + 16 - SDL_GetTicks()) { SDL_Delay(16); }
frameLimit = SDL_GetTicks();
}
-@@ -724,7 +724,7 @@
+@@ -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(max(frameLimit + 16 - SDL_GetTicks(), 0));
++ if (frameLimit + 16 - SDL_GetTicks()) { SDL_Delay(16); }
frameLimit = SDL_GetTicks();
}
More information about the Pkg-games-commits
mailing list