Author: baby-guest
Date: 2007-09-08 19:41:17 +0000 (Sat, 08 Sep 2007)
New Revision: 4133
Modified:
packages/trunk/tumiki-fighters/debian/patches/directories.patch
packages/trunk/tumiki-fighters/debian/patches/fixes.patch
Log:
Fixed patches properly
Modified: packages/trunk/tumiki-fighters/debian/patches/directories.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/directories.patch
2007-09-08 18:28:15 UTC (rev 4132)
+++ packages/trunk/tumiki-fighters/debian/patches/directories.patch
2007-09-08 19:41:17 UTC (rev 4133)
@@ -3,8 +3,8 @@
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/barragemanager.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/barragemanager.d
2004-05-14 23:35:38.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/barragemanager.d 2007-09-08
17:35:30.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/barragemanager.d
2007-09-08 19:38:19.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/barragemanager.d 2007-09-08
19:39:10.000000000 +0000
@@ -18,7 +18,7 @@
public class BarrageManager {
private:
@@ -16,8 +16,8 @@
char[][] dirs = listdir(BARRAGE_DIR_NAME);
Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/sound.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/sound.d
2004-05-14 23:35:40.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/sound.d 2007-09-08
17:35:30.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/sound.d
2007-09-08 19:38:19.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/sound.d 2007-09-08
19:39:10.000000000 +0000
@@ -62,7 +62,7 @@
public class Music: Sound {
public:
@@ -38,8 +38,8 @@
int chunkChannel;
Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/texture.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/texture.d
2004-05-14 23:35:40.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/texture.d 2007-09-08
17:35:30.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/sdl/texture.d
2007-09-08 19:38:19.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/sdl/texture.d 2007-09-08
19:39:10.000000000 +0000
@@ -15,7 +15,7 @@
*/
public class Texture {
@@ -51,8 +51,8 @@
GLuint num;
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2007-09-08
17:35:04.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-09-08
17:35:30.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2007-09-08
19:38:28.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-09-08
19:39:10.000000000 +0000
@@ -22,7 +22,7 @@
float sizeXm, sizeXp, sizeYm, sizeYp;
private:
@@ -64,8 +64,8 @@
// Tumiki file name(main),
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/field.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/field.d 2004-05-14
23:35:38.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/field.d 2007-09-08
17:35:30.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/field.d 2007-09-08
19:38:19.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/field.d 2007-09-08
19:39:10.000000000 +0000
@@ -249,7 +249,7 @@
float mtr, mtg, mtb;
float mrr, mrg, mrb;
@@ -77,8 +77,8 @@
// randSeed, scrollSpeed,
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/stagemanager.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/stagemanager.d
2004-05-14 23:35:38.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/stagemanager.d 2007-09-08
17:35:30.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/stagemanager.d
2007-09-08 19:38:19.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/stagemanager.d 2007-09-08
19:39:10.000000000 +0000
@@ -171,7 +171,7 @@
long randSeed;
int warningCnt;
@@ -90,81 +90,14 @@
public static this() {
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2007-09-08
17:35:04.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-09-08
17:36:05.000000000 +0000
-@@ -32,16 +32,16 @@
- static const char[] TUMIKI_DIR_NAME = "tumiki";
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2007-09-08
19:39:18.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-09-08
19:39:24.000000000 +0000
+@@ -29,7 +29,7 @@
+ float sizeXm, sizeXp, sizeYm, sizeYp, size;
+ private:
+ static TumikiSet[char[]] instances;
+- static const char[] TUMIKI_DIR_NAME = "tumiki";
++ static const char[] TUMIKI_DIR_NAME =
"/usr/share/games/tumiki-fighters/tumiki";
static const float BULLET_SPEED_RATIO = 1.2;
static int[char[]] shapeStr;
-- static char[][] SHAPE_STR =
-+ static char[][] SHAPE_STR =
- ["s", "ul", "ur", "dr", "dl", "u", "r", "d", "l", "pu", "pdr", "pr",
"pur", "pd", "pf"];
- static int[char[]] colorStr;
-- static char[][] COLOR_STR =
-+ static char[][] COLOR_STR =
- ["r", "g", "b", "y", "p", "a", "w", "gr"];
- static int[char[]] bulletShapeStr;
-- static char[][] BULLET_SHAPE_STR =
-+ static char[][] BULLET_SHAPE_STR =
- ["b", "a", "r"];
- static int[char[]] bulletColorStr;
-- static char[][] BULLET_COLOR_STR =
-+ static char[][] BULLET_COLOR_STR =
- ["r", "a", "p"];
-
- public static void randInit() {
-@@ -76,6 +76,7 @@
- // (end when BulletML == e, shape == e)(set a empty barrage when shape ==
s),
- // ],
- public this(char[][] data) {
-+ randInit();
- sizeXm = sizeYm = float.max;
- sizeXp = sizeYp = float.min;
- StringIterator si = new StringIterator(data);
-@@ -87,11 +88,11 @@
- if (!si.hasNext)
- break;
- char[] v = si.next;
-- int shape;
-- if(shapeStr.length !is 0) shape = shapeStr[v];
-+ int shape;
-+ try { if ((v in shapeStr) != null) shape = shapeStr[v]; } catch
(Exception e) {}
- v = si.next;
-- int color;
-- if(colorStr.length !is 0) color = colorStr[v];
-+ int color;
-+ try { if ((v in colorStr) != null) color = colorStr[v]; } catch
(Exception e) {}
- float x = atof(si.next);
- float y = atof(si.next);
- float sizex = atof(si.next);
-@@ -113,17 +114,17 @@
- ti.addBarrage(new Barrage);
- continue;
- }
-- int shape2;
-- if(bulletShapeStr.length !is 0) shape2 = bulletShapeStr[v];
-+ int shape;
-+ try { if ((v in bulletShapeStr) != null) shape = bulletShapeStr[v]; }
catch (Exception e) {}
- v = si.next;
-- int color2;
-- if(bulletColorStr.length !is 0) color2 = bulletColorStr[v];
-+ int color;
-+ try { if ((v in bulletColorStr) != null) color = bulletColorStr[v]; }
catch (Exception e) {}
- float size = atof(si.next);
- float yReverse = atof(si.next);
- int prevWait = atoi(si.next);
- int postWait = atoi(si.next);
- Barrage br = new Barrage
-- (shape2, color2, size, yReverse, prevWait, postWait);
-+ (shape, color, size, yReverse, prevWait, postWait);
- for (;;) {
- char[] bml = si.next;
- if (bml == "e")
-@@ -141,6 +142,7 @@
-
- // Initialize TumikiSet from the file.
- public this(char[] fileName) {
-+ randInit();
- Logger.info("Load tumiki set: " ~ fileName);
- char[][] data = CSVTokenizer.readFile(TUMIKI_DIR_NAME ~ "/" ~ fileName);
- this(data);
+ static char[][] SHAPE_STR =
Modified: packages/trunk/tumiki-fighters/debian/patches/fixes.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/fixes.patch 2007-09-08
18:28:15 UTC (rev 4132)
+++ packages/trunk/tumiki-fighters/debian/patches/fixes.patch 2007-09-08
19:41:17 UTC (rev 4133)
@@ -3,8 +3,8 @@
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/boot.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/boot.d 2007-09-08
17:37:05.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/boot.d 2007-09-08
17:37:10.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/boot.d 2007-09-08
19:38:21.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/boot.d 2007-09-08
19:38:28.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.tf.boot;
@@ -16,8 +16,8 @@
private import abagames.util.sdl.mainloop;
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemy.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemy.d 2007-09-08
17:37:05.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemy.d 2007-09-08
17:37:10.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemy.d 2007-09-08
19:38:21.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemy.d 2007-09-08
19:38:28.000000000 +0000
@@ -142,13 +142,14 @@
float speed;
Vector[] pt;
@@ -58,8 +58,8 @@
if (ep.firstShield <= 1)
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2007-09-08
17:37:05.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-09-08
17:37:10.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/enemyspec.d 2007-09-08
19:38:21.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/enemyspec.d 2007-09-08
19:38:28.000000000 +0000
@@ -89,11 +89,10 @@
}
@@ -77,8 +77,8 @@
}
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/letterrender.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/letterrender.d
2007-09-08 17:37:05.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/letterrender.d 2007-09-08
17:37:10.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/letterrender.d
2007-09-08 19:38:21.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/letterrender.d 2007-09-08
19:38:28.000000000 +0000
@@ -32,7 +32,7 @@
return s * LETTER_HEIGHT;
}
@@ -90,8 +90,8 @@
glScalef(s, s, s);
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/ship.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/ship.d 2007-09-08
17:37:05.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/ship.d 2007-09-08
17:37:10.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/ship.d 2007-09-08
19:38:21.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/ship.d 2007-09-08
19:38:28.000000000 +0000
@@ -70,7 +70,7 @@
bool btnPrsd;
bool pullIn;
@@ -103,30 +103,10 @@
Index: tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2007-09-08
17:37:05.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-09-08
17:40:13.000000000 +0000
-@@ -29,22 +29,22 @@
- float sizeXm, sizeXp, sizeYm, sizeYp, size;
- private:
- static TumikiSet[char[]] instances;
-- static const char[] TUMIKI_DIR_NAME = "tumiki";
-+ static const char[] TUMIKI_DIR_NAME =
"/usr/share/games/tumiki-fighters/tumiki";
- static const float BULLET_SPEED_RATIO = 1.2;
- static int[char[]] shapeStr;
-- static char[][] SHAPE_STR =
-+ static char[][] SHAPE_STR =
- ["s", "ul", "ur", "dr", "dl", "u", "r", "d", "l", "pu", "pdr", "pr",
"pur", "pd", "pf"];
- static int[char[]] colorStr;
-- static char[][] COLOR_STR =
-+ static char[][] COLOR_STR =
- ["r", "g", "b", "y", "p", "a", "w", "gr"];
- static int[char[]] bulletShapeStr;
-- static char[][] BULLET_SHAPE_STR =
-+ static char[][] BULLET_SHAPE_STR =
- ["b", "a", "r"];
- static int[char[]] bulletColorStr;
-- static char[][] BULLET_COLOR_STR =
-+ static char[][] BULLET_COLOR_STR =
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/tf/tumikiset.d 2007-09-08
19:38:21.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/tf/tumikiset.d 2007-09-08
19:39:00.000000000 +0000
+@@ -44,7 +44,7 @@
+ static char[][] BULLET_COLOR_STR =
["r", "a", "p"];
- public static this() {
@@ -134,56 +114,51 @@
int i = 0;
foreach (char[] s; SHAPE_STR) {
shapeStr[s] = i;
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,8 @@
// [BulletML, rank, speed]],
// (end when BulletML == e, shape == e)(set a empty barrage when shape ==
s),
// ],
- private this(char[][] data) {
+ public this(char[][] data) {
++ randInit();
sizeXm = sizeYm = float.max;
sizeXp = sizeYp = float.min;
StringIterator si = new StringIterator(data);
-@@ -87,9 +87,11 @@
+@@ -87,9 +88,11 @@
if (!si.hasNext)
break;
char[] v = si.next;
- int shape = shapeStr[v];
-+ int shape;
-+ if(shapeStr.length !is 0) shape = shapeStr[v];
++ int shape;
++ try { if ((v in shapeStr) != null) shape = shapeStr[v]; } catch
(Exception e) {}
v = si.next;
- int color = colorStr[v];
-+ int color;
-+ if(colorStr.length !is 0) color = colorStr[v];
++ int color;
++ try { if ((v in colorStr) != null) color = colorStr[v]; } catch
(Exception e) {}
float x = atof(si.next);
float y = atof(si.next);
float sizex = atof(si.next);
-@@ -111,15 +113,17 @@
+@@ -111,9 +114,11 @@
ti.addBarrage(new Barrage);
continue;
}
- int shape = bulletShapeStr[v];
-+ int shape2;
-+ if(bulletShapeStr.length !is 0) shape2 = bulletShapeStr[v];
++ int shape;
++ try { if ((v in bulletShapeStr) != null) shape = bulletShapeStr[v]; }
catch (Exception e) {}
v = si.next;
- int color = bulletColorStr[v];
-+ int color2;
-+ if(bulletColorStr.length !is 0) color2 = bulletColorStr[v];
++ int color;
++ try { if ((v in bulletColorStr) != null) color = bulletColorStr[v]; }
catch (Exception e) {}
float size = atof(si.next);
float yReverse = atof(si.next);
int prevWait = atoi(si.next);
- int postWait = atoi(si.next);
- Barrage br = new Barrage
-- (shape, color, size, yReverse, prevWait, postWait);
-+ (shape2, color2, size, yReverse, prevWait, postWait);
- for (;;) {
- char[] bml = si.next;
- if (bml == "e")
-@@ -136,14 +140,14 @@
+@@ -136,14 +141,15 @@
}
// Initialize TumikiSet from the file.
- private this(char[] fileName) {
+ public this(char[] fileName) {
++ randInit();
Logger.info("Load tumiki set: " ~ fileName);
char[][] data = CSVTokenizer.readFile(TUMIKI_DIR_NAME ~ "/" ~ fileName);
this(data);
@@ -197,8 +172,8 @@
instances[fileName] = inst;
Index: tumiki-fighters-0.2.dfsg1/src/abagames/util/logger.d
===================================================================
---- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/logger.d 2007-09-08
17:37:05.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/abagames/util/logger.d 2007-09-08
17:37:10.000000000 +0000
+--- tumiki-fighters-0.2.dfsg1.orig/src/abagames/util/logger.d 2007-09-08
19:38:21.000000000 +0000
++++ tumiki-fighters-0.2.dfsg1/src/abagames/util/logger.d 2007-09-08
19:38:28.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.util.logger;
@@ -245,7 +220,7 @@
Index: tumiki-fighters-0.2.dfsg1/src/dirent.d
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ tumiki-fighters-0.2.dfsg1/src/dirent.d 2007-09-08 17:37:10.000000000
+0000
++++ tumiki-fighters-0.2.dfsg1/src/dirent.d 2007-09-08 19:38:28.000000000
+0000
@@ -0,0 +1,10 @@
+import std.string;
+
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
