r14255 - in packages/trunk: ! dirs' list truncated !
Peter De Wachter
pdewacht-guest at alioth.debian.org
Thu Jun 13 06:20:58 UTC 2013
Author: pdewacht-guest
Date: 2013-06-13 06:20:58 +0000 (Thu, 13 Jun 2013)
New Revision: 14255
Modified:
packages/trunk/mu-cade/debian/patches/dlang_v2.patch
packages/trunk/torus-trooper/debian/patches/dlang_v2.patch
Log:
D-based games: further changes for D 2.063
Modified: packages/trunk/mu-cade/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/mu-cade/debian/patches/dlang_v2.patch 2013-06-12 17:14:58 UTC (rev 14254)
+++ packages/trunk/mu-cade/debian/patches/dlang_v2.patch 2013-06-13 06:20:58 UTC (rev 14255)
@@ -1035,6 +1035,24 @@
"baraccel.xml", "whip.xml", "slidebar.xml", "slidebaraccel.xml", "slidewhip.xml"];
public this(Field field, Ship ship, BulletPool bullets, World world, float rank, int size) {
+@@ -388,7 +388,7 @@
+ float br = rk * (0.1f * size + rand.nextFloat(0.1f));
+ float brv = calcBarrageRank(br);
+ if (brv >= 0.1f) {
+- bodyBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(BAR_MORPH_BML.length)];
++ bodyBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(cast(int)BAR_MORPH_BML.length)];
+ bodyBarrage.barMorphRank = brv;
+ rk -= br * 2;
+ } else {
+@@ -406,7 +406,7 @@
+ float br = rk * (0.1f * size + rand.nextFloat(0.3f));
+ float brv = calcBarrageRank(br);
+ if (brv >= 0.1f) {
+- headBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(BAR_MORPH_BML.length)];
++ headBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(cast(int)BAR_MORPH_BML.length)];
+ headBarrage.barMorphRank = brv;
+ rk -= br * 2;
+ } else {
@@ -418,7 +418,7 @@
slowVelocityRatio = svr;
float sp;
@@ -1056,6 +1074,15 @@
"bar.xml", "baraccel.xml", "whip.xml"];
public this(Field field, Ship ship, BulletPool bullets, World world, float rank, int size) {
+@@ -470,7 +470,7 @@
+ float br = rk * (0.1f + rand.nextFloat(0.1f));
+ float brv = calcBarrageRank(br);
+ if (brv >= 0.1f) {
+- bodyBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(BAR_MORPH_BML.length)];
++ bodyBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(cast(int)BAR_MORPH_BML.length)];
+ bodyBarrage.barMorphRank = brv;
+ rk -= br * 2;
+ } else {
@@ -485,7 +485,7 @@
headBarrage = new CentBarrage;
headBarrage.type = CentBarrage.BasicBarrageType.FRONT;
@@ -1065,6 +1092,23 @@
case 0:
wr = 0;
break;
+@@ -500,14 +500,14 @@
+ float wrv = calcBarrageRank(wr);
+ float brv = calcBarrageRank(br);
+ if (wrv >= 0.2f) {
+- headBarrage.wayMorphBml = WAY_MORPH_BML[rand.nextInt(WAY_MORPH_BML.length)];
++ headBarrage.wayMorphBml = WAY_MORPH_BML[rand.nextInt(cast(int)WAY_MORPH_BML.length)];
+ headBarrage.wayMorphRank = wrv;
+ rk -= wr * 2;
+ } else {
+ headBarrage.wayMorphBml = null;
+ }
+ if (brv >= 0.1f) {
+- headBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(BAR_MORPH_BML.length)];
++ headBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(cast(int)BAR_MORPH_BML.length)];
+ headBarrage.barMorphRank = brv;
+ rk -= br * 2;
+ } else {
@@ -544,9 +544,9 @@
static const float COLOR_G = 0.75f;
static const float COLOR_B = 0.75f;
@@ -1077,6 +1121,15 @@
"bar.xml", "baraccel.xml", "whip.xml",
"slidebar.xml", "slidebaraccel.xml", "slidewhip.xml"];
+@@ -563,7 +563,7 @@
+ float br = rk * (0.1f * size + rand.nextFloat(0.1f));
+ float brv = calcBarrageRank(br);
+ if (brv >= 0.1f) {
+- bodyBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(BAR_MORPH_BML.length)];
++ bodyBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(cast(int)BAR_MORPH_BML.length)];
+ bodyBarrage.barMorphRank = brv;
+ rk -= br * 2;
+ } else {
@@ -571,7 +571,7 @@
}
float sp;
@@ -1086,7 +1139,7 @@
case 0:
calcBarrageSpeedAndInterval(rk, rk * 0.5f, sp, iv, 10, 60);
break;
-@@ -594,9 +594,9 @@
+@@ -594,20 +594,20 @@
headBarrage = new CentBarrage;
headBarrage.type = CentBarrage.BasicBarrageType.FRONT;
float wr = rk * (size * 0.2f + rand.nextFloat(0.2f));
@@ -1096,17 +1149,19 @@
- float brv = calcBarrageRank(br);
+ float brv_ = calcBarrageRank(br_);
if (wrv >= 0.2f) {
- headBarrage.wayMorphBml = WAY_MORPH_BML[rand.nextInt(WAY_MORPH_BML.length)];
+- headBarrage.wayMorphBml = WAY_MORPH_BML[rand.nextInt(WAY_MORPH_BML.length)];
++ headBarrage.wayMorphBml = WAY_MORPH_BML[rand.nextInt(cast(int)WAY_MORPH_BML.length)];
headBarrage.wayMorphRank = wrv;
-@@ -604,10 +604,10 @@
+ rk -= wr * 2;
} else {
headBarrage.wayMorphBml = null;
}
- if (brv >= 0.1f) {
-+ if (brv_ >= 0.1f) {
- headBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(BAR_MORPH_BML.length)];
+- headBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(BAR_MORPH_BML.length)];
- headBarrage.barMorphRank = brv;
- rk -= br * 2;
++ if (brv_ >= 0.1f) {
++ headBarrage.barMorphBml = BAR_MORPH_BML[rand.nextInt(cast(int)BAR_MORPH_BML.length)];
+ headBarrage.barMorphRank = brv_;
+ rk -= br_ * 2;
} else {
Modified: packages/trunk/torus-trooper/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/dlang_v2.patch 2013-06-12 17:14:58 UTC (rev 14254)
+++ packages/trunk/torus-trooper/debian/patches/dlang_v2.patch 2013-06-13 06:20:58 UTC (rev 14255)
@@ -547,8 +547,12 @@
case Type.SMALL:
createSmallType(damaged);
break;
-@@ -124,7 +124,7 @@
- int cl = rand.nextInt(Structure.COLOR_RGB.length - 2) + 2;
+@@ -121,10 +121,10 @@
+ sw *= 1.5f;
+ float sd1 = rand.nextFloat(1) * PI / 3 + PI / 4;
+ float sd2 = rand.nextFloat(1) * PI / 10;
+- int cl = rand.nextInt(Structure.COLOR_RGB.length - 2) + 2;
++ int cl = rand.nextInt(cast(int)(Structure.COLOR_RGB.length - 2)) + 2;
color = cl;
int shp = rand.nextInt(Structure.Shape.ROCKET);
- switch (shaftNum) {
@@ -556,8 +560,12 @@
case 1:
structure ~= createShaft(0, 0, so, sd1, sl, 2, sw, sd1 / 2, sd2, cl, shp, 5, 1, damaged);
_collision.x = so / 2 + sw;
-@@ -160,7 +160,7 @@
- int cl = rand.nextInt(Structure.COLOR_RGB.length - 2) + 2;
+@@ -157,10 +157,10 @@
+ sw *= 1.6f;
+ float sd1 = rand.nextFloat(1) * PI / 3 + PI / 4;
+ float sd2 = rand.nextFloat(1) * PI / 10;
+- int cl = rand.nextInt(Structure.COLOR_RGB.length - 2) + 2;
++ int cl = rand.nextInt(cast(int)(Structure.COLOR_RGB.length - 2)) + 2;
color = cl;
int shp = rand.nextInt(Structure.Shape.ROCKET);
- switch (shaftNum) {
@@ -565,8 +573,12 @@
case 3:
int cshp = rand.nextInt(Structure.Shape.ROCKET);
structure ~= createShaft(0, 0, so * 0.5, sd1, sl, 2, sw, sd1, sd2, cl, cshp, 8, 1, damaged);
-@@ -205,7 +205,7 @@
- int cl = rand.nextInt(Structure.COLOR_RGB.length - 2) + 2;
+@@ -202,10 +202,10 @@
+ sw *= 1.6f;
+ float sd1 = rand.nextFloat(1) * PI / 3 + PI / 4;
+ float sd2 = rand.nextFloat(1) * PI / 10;
+- int cl = rand.nextInt(Structure.COLOR_RGB.length - 2) + 2;
++ int cl = rand.nextInt(cast(int)(Structure.COLOR_RGB.length - 2)) + 2;
color = cl;
int shp = rand.nextInt(Structure.Shape.ROCKET);
- switch (shaftNum) {
@@ -810,6 +822,27 @@
Ship.IN_SIGHT_DEPTH_DEFAULT * (4 + rand.nextFloat(0.5)), rand);
setNextMiddleAppDist();
}
+@@ -176,16 +176,16 @@
+ } else {
+ Slice.darkLineRatio -= 1.0f / TUNNEL_COLOR_CHANGE_INTERVAL;
+ float cRatio = cast(float) tunnelColorChangeCnt / TUNNEL_COLOR_CHANGE_INTERVAL;
+- int cpIdxPrev = (tunnelColorPolyIdx - 1) % TUNNEL_COLOR_PATTERN_POLY.length;
+- int cpIdxNow = tunnelColorPolyIdx % TUNNEL_COLOR_PATTERN_POLY.length;
++ ptrdiff_t cpIdxPrev = (tunnelColorPolyIdx - 1) % TUNNEL_COLOR_PATTERN_POLY.length;
++ ptrdiff_t cpIdxNow = tunnelColorPolyIdx % TUNNEL_COLOR_PATTERN_POLY.length;
+ Slice.polyR = TUNNEL_COLOR_PATTERN_POLY[cpIdxPrev][0] * cRatio +
+ TUNNEL_COLOR_PATTERN_POLY[cpIdxNow][0] * (1 - cRatio);
+ Slice.polyG = TUNNEL_COLOR_PATTERN_POLY[cpIdxPrev][1] * cRatio +
+ TUNNEL_COLOR_PATTERN_POLY[cpIdxNow][1] * (1 - cRatio);
+ Slice.polyB = TUNNEL_COLOR_PATTERN_POLY[cpIdxPrev][2] * cRatio +
+ TUNNEL_COLOR_PATTERN_POLY[cpIdxNow][2] * (1 - cRatio);
+- int clIdxPrev = (tunnelColorLineIdx - 1) % TUNNEL_COLOR_PATTERN_LINE.length;
+- int clIdxNow = tunnelColorLineIdx % TUNNEL_COLOR_PATTERN_LINE.length;
++ ptrdiff_t clIdxPrev = (tunnelColorLineIdx - 1) % TUNNEL_COLOR_PATTERN_LINE.length;
++ ptrdiff_t clIdxNow = tunnelColorLineIdx % TUNNEL_COLOR_PATTERN_LINE.length;
+ Slice.lineR = TUNNEL_COLOR_PATTERN_LINE[clIdxPrev][0] * cRatio +
+ TUNNEL_COLOR_PATTERN_LINE[clIdxNow][0] * (1 - cRatio);
+ Slice.lineG = TUNNEL_COLOR_PATTERN_LINE[clIdxPrev][1] * cRatio +
@@ -403,7 +403,7 @@
private Barrage createBarrage(Rand rand,
float level,
More information about the Pkg-games-commits
mailing list