r4110 - packages/trunk/val-and-rick/debian/patches
Peter De Wachter
pdewacht-guest at alioth.debian.org
Thu Sep 6 22:32:41 UTC 2007
Author: pdewacht-guest
Date: 2007-09-06 22:32:41 +0000 (Thu, 06 Sep 2007)
New Revision: 4110
Modified:
packages/trunk/val-and-rick/debian/patches/directories.patch
packages/trunk/val-and-rick/debian/patches/fixes.patch
Log:
simplified fixes.patch, refreshed directories.patch
Modified: packages/trunk/val-and-rick/debian/patches/directories.patch
===================================================================
--- packages/trunk/val-and-rick/debian/patches/directories.patch 2007-09-06 22:13:26 UTC (rev 4109)
+++ packages/trunk/val-and-rick/debian/patches/directories.patch 2007-09-06 22:32:41 UTC (rev 4110)
@@ -3,12 +3,12 @@
Index: val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d
===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/vr/barrage.d 2007-09-05 07:48:37.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d 2007-09-05 07:48:38.000000000 +0000
-@@ -25,7 +25,7 @@
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/vr/barrage.d 2007-09-07 00:24:50.000000000 +0200
++++ val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d 2007-09-07 00:26:48.000000000 +0200
+@@ -24,7 +24,7 @@
+ public class BarrageManager {
private:
static BulletMLParserTinyXML *parser[char[]][char[]];
- static BulletMLParserTinyXML *parser2[char[]];
- static const char[] BARRAGE_DIR_NAME = "barrage";
+ static const char[] BARRAGE_DIR_NAME = "/usr/share/games/val-and-rick/barrage";
@@ -16,8 +16,8 @@
char[][] dirs = listdir(BARRAGE_DIR_NAME);
Index: val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d
===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/texture.d 2007-09-05 07:48:37.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d 2007-09-05 07:48:38.000000000 +0000
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/texture.d 2007-09-07 00:26:42.000000000 +0200
++++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d 2007-09-07 00:29:38.000000000 +0200
@@ -16,7 +16,7 @@
*/
public class Texture {
@@ -29,8 +29,8 @@
GLuint num, maskNum;
Index: val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/sound.d
===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/sound.d 2005-03-14 01:15:04.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/sound.d 2007-09-05 07:48:38.000000000 +0000
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/sound.d 2007-09-07 00:24:50.000000000 +0200
++++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/sound.d 2007-09-07 00:26:48.000000000 +0200
@@ -67,7 +67,7 @@
public class Music: Sound {
public:
Modified: packages/trunk/val-and-rick/debian/patches/fixes.patch
===================================================================
--- packages/trunk/val-and-rick/debian/patches/fixes.patch 2007-09-06 22:13:26 UTC (rev 4109)
+++ packages/trunk/val-and-rick/debian/patches/fixes.patch 2007-09-06 22:32:41 UTC (rev 4110)
@@ -3,8 +3,8 @@
Index: val-and-rick-0.1a.dfsg1/src/abagames/util/logger.d
===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/logger.d 2005-03-14 01:15:04.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/util/logger.d 2007-09-05 07:48:37.000000000 +0000
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/logger.d 2007-09-07 00:17:49.000000000 +0200
++++ val-and-rick-0.1a.dfsg1/src/abagames/util/logger.d 2007-09-07 00:17:54.000000000 +0200
@@ -5,7 +5,7 @@
*/
module abagames.util.logger;
@@ -52,8 +52,8 @@
}
Index: val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/luminous.d
===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/luminous.d 2005-03-14 01:15:04.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/luminous.d 2007-09-05 07:48:37.000000000 +0000
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/luminous.d 2007-09-07 00:17:49.000000000 +0200
++++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/luminous.d 2007-09-07 00:17:54.000000000 +0200
@@ -7,6 +7,7 @@
private import std.math;
@@ -62,97 +62,28 @@
private import opengl;
private import abagames.util.actor;
+Index: val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d
+===================================================================
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/vr/barrage.d 2007-09-07 00:22:29.000000000 +0200
++++ val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d 2007-09-07 00:24:50.000000000 +0200
+@@ -30,6 +30,7 @@
+ char[][] dirs = listdir(BARRAGE_DIR_NAME);
+ foreach (char[] dirName; dirs) {
+ char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
++ parser[dirName] = null;
+ foreach (char[] fileName; files) {
+ if (getExt(fileName) != "xml")
+ continue;
Index: val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d
===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/texture.d 2005-03-14 01:15:04.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d 2007-09-05 07:48:48.000000000 +0000
-@@ -25,9 +25,7 @@
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/util/sdl/texture.d 2007-09-07 00:25:03.000000000 +0200
++++ val-and-rick-0.1a.dfsg1/src/abagames/util/sdl/texture.d 2007-09-07 00:26:42.000000000 +0200
+@@ -25,7 +25,7 @@
Uint32[128 * 128] maskPixels;
public static SDL_Surface* loadBmp(char[] name) {
- if (surface[name]) {
-- return surface[name];
-- } else {
-+{
++ if ((name in surface) != null) {
+ return surface[name];
+ } else {
char[] fileName = imagesDir ~ name;
- SDL_Surface *s = SDL_LoadBMP(std.string.toStringz(fileName));
- if (!s)
-Index: val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d
-===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/vr/barrage.d 2005-03-14 01:15:04.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/vr/barrage.d 2007-09-05 07:48:48.000000000 +0000
-@@ -24,6 +24,7 @@
- public class BarrageManager {
- private:
- static BulletMLParserTinyXML *parser[char[]][char[]];
-+ static BulletMLParserTinyXML *parser2[char[]];
- static const char[] BARRAGE_DIR_NAME = "barrage";
-
- public static void load() {
-@@ -33,20 +34,21 @@
- foreach (char[] fileName; files) {
- if (getExt(fileName) != "xml")
- continue;
-- parser[dirName][fileName] = getInstance(dirName, fileName);
-+ char[] barrageName = dirName ~ "/" ~ fileName;
-+ parser2[barrageName] = getInstance(dirName, fileName);
- }
- }
- }
-
- public static BulletMLParserTinyXML* getInstance(char[] dirName, char[] fileName) {
-- if (!parser[dirName][fileName]) {
- char[] barrageName = dirName ~ "/" ~ fileName;
-+ if (!parser2[barrageName]) {
- Logger.info("Loading BulletML: " ~ barrageName);
-- parser[dirName][fileName] =
-+ parser2[barrageName] =
- BulletMLParserTinyXML_new(std.string.toStringz(BARRAGE_DIR_NAME ~ "/" ~ barrageName));
-- BulletMLParserTinyXML_parse(parser[dirName][fileName]);
-+ BulletMLParserTinyXML_parse(parser2[barrageName]);
- }
-- return parser[dirName][fileName];
-+ return parser2[barrageName];
- }
-
- public static BulletMLParserTinyXML*[] getInstanceList(char[] dirName) {
-Index: val-and-rick-0.1a.dfsg1/src/abagames/vr/stagemanager.d
-===================================================================
---- val-and-rick-0.1a.dfsg1.orig/src/abagames/vr/stagemanager.d 2005-03-14 01:15:04.000000000 +0000
-+++ val-and-rick-0.1a.dfsg1/src/abagames/vr/stagemanager.d 2007-09-05 07:48:37.000000000 +0000
-@@ -264,14 +264,14 @@
- ebs.barrage = null;
- BulletMLParserTinyXML* bp = BarrageManager.getInstance("basic", "straight.xml");
- ebs.barrage ~= new ParserParam(bp, 1, false, 1);
-- BulletMLParserTinyXML*[] ps = BarrageManager.getInstanceList("morph");
-+// BulletMLParserTinyXML*[] ps = BarrageManager.getInstanceList("morph");
- while (morphRank > 1) {
- morphRank /= 3;
-- int pi = rand.nextInt(ps.length);
-+ int pi = rand.nextInt(11);
- float mr = morphRank;
- if (mr > 0.75f)
- mr = 0.75f + rand.nextFloat(0.25f);
-- ebs.barrage ~= new ParserParam(ps[pi], mr, false, 1);
-+ // ebs.barrage ~= 11, mr, false, 1);
- }
- rad += radInc;
- ad *= 1 + rand.nextSignedFloat(0.2f);
-@@ -310,14 +310,14 @@
- bulletMinSpeed = 0.5f / (sr + 1);
- if (ship.airMode) {
- float morphRank = rank * 0.25f;
-- BulletMLParserTinyXML*[] ps = BarrageManager.getInstanceList("morph");
-+ // BulletMLParserTinyXML*[] ps = BarrageManager.getInstanceList("morph");
- while (morphRank > 1) {
- morphRank /= 3;
-- int pi = rand.nextInt(ps.length);
-+ int pi = rand.nextInt(11);
- float mr = morphRank;
- if (mr > 0.75f)
- mr = 0.75f + rand.nextFloat(0.25f);
-- spec.barrage ~= new ParserParam(ps[pi], mr, false, 1);
-+ // spec.barrage ~= new 11, mr, false, 1);
- }
- bulletMaxSpeed *= 3;
- bulletMinSpeed *= 1.75f;
More information about the Pkg-games-commits
mailing list