r5888 - in packages/trunk/a7xpg/debian: . patches
Peter De Wachter
pdewacht-guest at alioth.debian.org
Thu Feb 21 21:31:56 UTC 2008
Author: pdewacht-guest
Date: 2008-02-21 21:31:56 +0000 (Thu, 21 Feb 2008)
New Revision: 5888
Modified:
packages/trunk/a7xpg/debian/changelog
packages/trunk/a7xpg/debian/patches/06_d_language_changes.diff
Log:
Wait, the enemies are supposed to move?!?
Modified: packages/trunk/a7xpg/debian/changelog
===================================================================
--- packages/trunk/a7xpg/debian/changelog 2008-02-21 16:34:06 UTC (rev 5887)
+++ packages/trunk/a7xpg/debian/changelog 2008-02-21 21:31:56 UTC (rev 5888)
@@ -3,6 +3,9 @@
[ Miriam Ruiz ]
* Replaced XS-DM-Upload-Allowed by DM-Upload-Allowed in debian/control.
+ [ Peter De Wachter ]
+ * The enemies move now. (Closes: #466840)
+
-- Vincent Fourmond <fourmond at debian.org> Thu, 03 Jan 2008 14:22:54 +0100
a7xpg (0.11.dfsg1-3) unstable; urgency=low
Modified: packages/trunk/a7xpg/debian/patches/06_d_language_changes.diff
===================================================================
--- packages/trunk/a7xpg/debian/patches/06_d_language_changes.diff 2008-02-21 16:34:06 UTC (rev 5887)
+++ packages/trunk/a7xpg/debian/patches/06_d_language_changes.diff 2008-02-21 21:31:56 UTC (rev 5888)
@@ -3,9 +3,8 @@
Sat Aug 25 23:59:12 CEST 2007 pdewacht at gmail.com
* 06_d_language_changes
-diff -rN -u old-a7xpg/src/abagames/a7xpg/A7xBoot.d new-a7xpg/src/abagames/a7xpg/A7xBoot.d
---- old-a7xpg/src/abagames/a7xpg/A7xBoot.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/A7xBoot.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/A7xBoot.d
++++ b/src/abagames/a7xpg/A7xBoot.d
@@ -5,13 +5,15 @@
*/
module abagames.a7xpg.A7xBoot;
@@ -41,9 +40,8 @@
if (l < 0 || l > 1) {
usage();
exit(EXIT_FAILURE);
-diff -rN -u old-a7xpg/src/abagames/a7xpg/A7xGameManager.d new-a7xpg/src/abagames/a7xpg/A7xGameManager.d
---- old-a7xpg/src/abagames/a7xpg/A7xGameManager.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/A7xGameManager.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/A7xGameManager.d
++++ b/src/abagames/a7xpg/A7xGameManager.d
@@ -5,12 +5,13 @@
*/
module abagames.a7xpg.A7xGameManager;
@@ -113,7 +111,7 @@
assert(pt);
pt.set(pos, deg, ofs, speed, r, g, b);
}
-@@ -254,16 +255,16 @@
+@@ -254,14 +255,14 @@
field.size.y = stgData[st][1];
field.eyeZ = 300;
field.alpha = 1;
@@ -129,15 +127,11 @@
for (int i = 6; i < stgData[st].length;) {
- int n = stgData[st][i]; i++;
- int tp = stgData[st][i]; i++;
-- float sz = stgData[st][i]; i++;
-- float sp = stgData[st][i]; i++;
+ int n = cast(int)stgData[st][i]; i++;
+ int tp = cast(int)stgData[st][i]; i++;
-+ float sz = cast(int)stgData[st][i]; i++;
-+ float sp = cast(int)stgData[st][i]; i++;
+ float sz = stgData[st][i]; i++;
+ float sp = stgData[st][i]; i++;
for (int j = 0; j < n; j++) {
- enemyTable[ei][0] = tp;
- enemyTable[ei][1] = sz;
@@ -374,7 +375,7 @@
if (enemyTableIdx == 0 && lap >= 1) {
int ei = enemyNum - 1;
@@ -156,9 +150,8 @@
enemyTable[enemyTableIdx][1],
enemyTable[enemyTableIdx][2]);
enemyTableIdx++;
-diff -rN -u old-a7xpg/src/abagames/a7xpg/A7xPrefManager.d new-a7xpg/src/abagames/a7xpg/A7xPrefManager.d
---- old-a7xpg/src/abagames/a7xpg/A7xPrefManager.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/A7xPrefManager.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/A7xPrefManager.d
++++ b/src/abagames/a7xpg/A7xPrefManager.d
@@ -30,7 +30,7 @@
if (ver != VERSION_NUM)
throw new Error("Wrong version num");
@@ -168,9 +161,8 @@
init();
} finally {
fd.close();
-diff -rN -u old-a7xpg/src/abagames/a7xpg/A7xScreen.d new-a7xpg/src/abagames/a7xpg/A7xScreen.d
---- old-a7xpg/src/abagames/a7xpg/A7xScreen.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/A7xScreen.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/A7xScreen.d
++++ b/src/abagames/a7xpg/A7xScreen.d
@@ -6,6 +6,7 @@
module abagames.a7xpg.A7xScreen;
@@ -196,9 +188,8 @@
glGenTextures(1, &luminousTexture);
glBindTexture(GL_TEXTURE_2D, luminousTexture);
glTexImage2D(GL_TEXTURE_2D, 0, 4, luminousTextureWidth, luminousTextureHeight, 0,
-diff -rN -u old-a7xpg/src/abagames/a7xpg/Bonus.d new-a7xpg/src/abagames/a7xpg/Bonus.d
---- old-a7xpg/src/abagames/a7xpg/Bonus.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/Bonus.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/Bonus.d
++++ b/src/abagames/a7xpg/Bonus.d
@@ -36,7 +36,7 @@
tn /= 10;
pos.x = p.x - s / 2 * tn; pos.y = p.y;
@@ -208,9 +199,8 @@
my = 0.03 + s * 0.2;
isExist = true;
}
-diff -rN -u old-a7xpg/src/abagames/a7xpg/Enemy.d new-a7xpg/src/abagames/a7xpg/Enemy.d
---- old-a7xpg/src/abagames/a7xpg/Enemy.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/Enemy.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/Enemy.d
++++ b/src/abagames/a7xpg/Enemy.d
@@ -5,13 +5,15 @@
*/
module abagames.a7xpg.Enemy;
@@ -237,9 +227,8 @@
ship = ei.ship;
field = ei.field;
rand = ei.rand;
-diff -rN -u old-a7xpg/src/abagames/a7xpg/Gold.d new-a7xpg/src/abagames/a7xpg/Gold.d
---- old-a7xpg/src/abagames/a7xpg/Gold.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/Gold.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/Gold.d
++++ b/src/abagames/a7xpg/Gold.d
@@ -5,7 +5,8 @@
*/
module abagames.a7xpg.Gold;
@@ -259,9 +248,8 @@
ship = gi.ship;
field = gi.field;
rand = gi.rand;
-diff -rN -u old-a7xpg/src/abagames/a7xpg/LetterRender.d new-a7xpg/src/abagames/a7xpg/LetterRender.d
---- old-a7xpg/src/abagames/a7xpg/LetterRender.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/LetterRender.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/LetterRender.d
++++ b/src/abagames/a7xpg/LetterRender.d
@@ -123,7 +123,7 @@
float x, y, length, size, t;
int deg;
@@ -271,9 +259,8 @@
if (deg > 99990) break;
x = -spData[idx][i][0];
y = -spData[idx][i][1];
-diff -rN -u old-a7xpg/src/abagames/a7xpg/LuminousActor.d new-a7xpg/src/abagames/a7xpg/LuminousActor.d
---- old-a7xpg/src/abagames/a7xpg/LuminousActor.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/LuminousActor.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/LuminousActor.d
++++ b/src/abagames/a7xpg/LuminousActor.d
@@ -5,7 +5,7 @@
*/
module abagames.a7xpg.LuminousActor;
@@ -283,9 +270,8 @@
/**
* Actor with the luminous effect.
-diff -rN -u old-a7xpg/src/abagames/a7xpg/LuminousActorPool.d new-a7xpg/src/abagames/a7xpg/LuminousActorPool.d
---- old-a7xpg/src/abagames/a7xpg/LuminousActorPool.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/LuminousActorPool.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/LuminousActorPool.d
++++ b/src/abagames/a7xpg/LuminousActorPool.d
@@ -21,7 +21,7 @@
public void drawLuminous() {
for (int i = 0; i < actor.length; i++) {
@@ -295,9 +281,8 @@
}
}
}
-diff -rN -u old-a7xpg/src/abagames/a7xpg/Particle.d new-a7xpg/src/abagames/a7xpg/Particle.d
---- old-a7xpg/src/abagames/a7xpg/Particle.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/Particle.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/Particle.d
++++ b/src/abagames/a7xpg/Particle.d
@@ -5,7 +5,7 @@
*/
module abagames.a7xpg.Particle;
@@ -316,9 +301,8 @@
field = pi.field;
rand = pi.rand;
pos = new Vector;
-diff -rN -u old-a7xpg/src/abagames/a7xpg/Ship.d new-a7xpg/src/abagames/a7xpg/Ship.d
---- old-a7xpg/src/abagames/a7xpg/Ship.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/a7xpg/Ship.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/a7xpg/Ship.d
++++ b/src/abagames/a7xpg/Ship.d
@@ -5,7 +5,8 @@
*/
module abagames.a7xpg.Ship;
@@ -338,9 +322,8 @@
for (int i = 0; i < pn; i++) {
manager.addParticle(pos, deg + rand.nextFloat(1.2) - 0.6, SIZE, pSpeed * 3,
0.8, 0.6, 0.1);
-diff -rN -u old-a7xpg/src/abagames/util/Actor.d new-a7xpg/src/abagames/util/Actor.d
---- old-a7xpg/src/abagames/util/Actor.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/Actor.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/Actor.d
++++ b/src/abagames/util/Actor.d
@@ -5,7 +5,7 @@
*/
module abagames.util.Actor;
@@ -350,9 +333,8 @@
/**
* Actor in the game that has the interface to move and draw.
-diff -rN -u old-a7xpg/src/abagames/util/Logger.d new-a7xpg/src/abagames/util/Logger.d
---- old-a7xpg/src/abagames/util/Logger.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/Logger.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/Logger.d
++++ b/src/abagames/util/Logger.d
@@ -5,28 +5,28 @@
*/
module abagames.util.Logger;
@@ -387,9 +369,8 @@
//if (e.next)
// error(e.next);
throw new Exception("Error: " ~ e.toString() ~ "\0");
-diff -rN -u old-a7xpg/src/abagames/util/Rand.d new-a7xpg/src/abagames/util/Rand.d
---- old-a7xpg/src/abagames/util/Rand.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/Rand.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/Rand.d
++++ b/src/abagames/util/Rand.d
@@ -5,8 +5,8 @@
*/
module abagames.util.Rand;
@@ -419,9 +400,8 @@
+ return (cast(float)(rand() % (n * 10000))) / 10000;
}
}
-diff -rN -u old-a7xpg/src/abagames/util/sdl/Input.d new-a7xpg/src/abagames/util/sdl/Input.d
---- old-a7xpg/src/abagames/util/sdl/Input.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/sdl/Input.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/sdl/Input.d
++++ b/src/abagames/util/sdl/Input.d
@@ -5,7 +5,7 @@
*/
module abagames.util.sdl.Input;
@@ -431,9 +411,8 @@
import SDL;
import abagames.util.sdl.SDLInitFailedException;
-diff -rN -u old-a7xpg/src/abagames/util/sdl/MainLoop.d new-a7xpg/src/abagames/util/sdl/MainLoop.d
---- old-a7xpg/src/abagames/util/sdl/MainLoop.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/sdl/MainLoop.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/sdl/MainLoop.d
++++ b/src/abagames/util/sdl/MainLoop.d
@@ -5,8 +5,7 @@
*/
module abagames.util.sdl.MainLoop;
@@ -453,9 +432,8 @@
if (frame <= 0) {
frame = 1;
SDL_Delay(prvTickCount+interval-nowTick);
-diff -rN -u old-a7xpg/src/abagames/util/sdl/Screen3D.d new-a7xpg/src/abagames/util/sdl/Screen3D.d
---- old-a7xpg/src/abagames/util/sdl/Screen3D.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/sdl/Screen3D.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/sdl/Screen3D.d
++++ b/src/abagames/util/sdl/Screen3D.d
@@ -5,8 +5,8 @@
*/
module abagames.util.sdl.Screen3D;
@@ -482,9 +460,8 @@
0.1f, farPlane);
glMatrixMode(GL_MODELVIEW);
}
-diff -rN -u old-a7xpg/src/abagames/util/sdl/Sound.d new-a7xpg/src/abagames/util/sdl/Sound.d
---- old-a7xpg/src/abagames/util/sdl/Sound.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/sdl/Sound.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/sdl/Sound.d
++++ b/src/abagames/util/sdl/Sound.d
@@ -5,7 +5,7 @@
*/
module abagames.util.sdl.Sound;
@@ -494,9 +471,8 @@
import SDL;
import SDL_mixer;
import abagames.util.sdl.SDLInitFailedException;
-diff -rN -u old-a7xpg/src/abagames/util/sdl/Texture.d new-a7xpg/src/abagames/util/sdl/Texture.d
---- old-a7xpg/src/abagames/util/sdl/Texture.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/sdl/Texture.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/sdl/Texture.d
++++ b/src/abagames/util/sdl/Texture.d
@@ -5,7 +5,7 @@
*/
module abagames.util.sdl.Texture;
@@ -506,9 +482,8 @@
import opengl;
import SDL;
import abagames.util.sdl.SDLInitFailedException;
-diff -rN -u old-a7xpg/src/abagames/util/Vector.d new-a7xpg/src/abagames/util/Vector.d
---- old-a7xpg/src/abagames/util/Vector.d 2007-08-26 00:03:16.000000000 +0200
-+++ new-a7xpg/src/abagames/util/Vector.d 2007-08-26 00:03:16.000000000 +0200
+--- a/src/abagames/util/Vector.d
++++ b/src/abagames/util/Vector.d
@@ -5,7 +5,7 @@
*/
module abagames.util.Vector;
@@ -544,4 +519,3 @@
}
}
}
-
More information about the Pkg-games-commits
mailing list