r14164 - in packages/trunk: ! dirs' list truncated !
Peter De Wachter
pdewacht-guest at alioth.debian.org
Mon May 27 06:38:50 UTC 2013
Author: pdewacht-guest
Date: 2013-05-27 06:38:49 +0000 (Mon, 27 May 2013)
New Revision: 14164
Modified:
packages/trunk/gunroar/debian/patches/dlang_v2.patch
packages/trunk/ii-esu/debian/patches/dlang_v2.patch
packages/trunk/ii-esu/debian/patches/fixes.patch
packages/trunk/mu-cade/debian/patches/dlang_v2.patch
packages/trunk/parsec47/debian/patches/dlang_v2.patch
packages/trunk/projectl/debian/patches/dlang_v2.patch
packages/trunk/tatan/debian/patches/dlang_v2.patch
packages/trunk/tatan/debian/patches/fixes.patch
packages/trunk/titanion/debian/patches/dlang_v2.patch
packages/trunk/torus-trooper/debian/patches/dlang_v2.patch
packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch
packages/trunk/val-and-rick/debian/patches/dlang_v2.patch
Log:
D-language games: fixes for 32bit x86
Modified: packages/trunk/gunroar/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/gunroar/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/gunroar/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -1510,7 +1510,7 @@
T[] actor;
protected:
- int actorIdx = 0;
-+ long actorIdx = 0;
++ size_t actorIdx = 0;
private:
public this() {}
Modified: packages/trunk/ii-esu/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/ii-esu/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/ii-esu/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -384,7 +384,7 @@
Enemy lock = null;
- for(int i = ep.enemy.length - 1;0 <= i;i --){
-+ for(long i = ep.enemy.length - 1;0 <= i;i --){
++ for(size_t i = ep.enemy.length - 1;0 <= i;i --){
Enemy e = cast(Enemy)ep.enemy[i];
if(e !is null){
if(dist(e.x ,e.y ,e.z ,x ,y ,z) < (SHOT_SIZE + e.largeness)){
@@ -402,7 +402,7 @@
public void release(){
- int i = shots.length - 1;
-+ long i = shots.length - 1;
++ size_t i = shots.length - 1;
while(0 <=i){
Shot s = shots[i];
if(s !is null){
@@ -420,7 +420,7 @@
real[] b;
b.length = a.length;
- for(int i = a.length - 1;0 <= i;i --){
-+ for(long i = a.length - 1;0 <= i;i --){
++ for(size_t i = a.length - 1;0 <= i;i --){
b[i] = a[i] * mul;
}
return b;
@@ -429,10 +429,10 @@
real[][] b;
b.length = a.length;
- for(int i = a.length - 1;0 <= i;i --){
-+ for(long i = a.length - 1;0 <= i;i --){
++ for(size_t i = a.length - 1;0 <= i;i --){
b[i].length = a[i].length;
- for(int j = a[i].length - 1;0 <= j;j --){
-+ for(long j = a[i].length - 1;0 <= j;j --){
++ for(size_t j = a[i].length - 1;0 <= j;j --){
b[i][j] = a[i][j] * mul;
}
}
@@ -442,15 +442,15 @@
}
- int maxNum = 0;
- for(int i = a.length -1;0 <= i;i --){
-+ long maxNum = 0;
-+ for(long i = a.length -1;0 <= i;i --){
++ size_t maxNum = 0;
++ for(size_t i = a.length -1;0 <= i;i --){
if(a[i].length != b[i].length || a[i].length < 1){
assert(1);
}
if(maxNum < a[i].length)maxNum = a[i].length;
}
- int k,l;
-+ long k,l;
++ size_t k,l;
k = 0;
real[][] x0;
@@ -459,7 +459,7 @@
if(a.length <= k)k = 0;
}
- int number = (2 * segment + 1) * maxNum;
-+ long number = (2 * segment + 1) * maxNum;
++ size_t number = (2 * segment + 1) * maxNum;
x = new real[number];
y = new real[number];
z = new real[number];
@@ -468,7 +468,7 @@
seg ++;
if(segment <= seg)break;
- for(int j = maxNum - 1;0 <= j ;j --){
-+ for(long j = maxNum - 1;0 <= j ;j --){
++ for(size_t j = maxNum - 1;0 <= j ;j --){
x[num] = x0[seg][j];
y[num] = y0[seg][j];
z[num] = z0[seg][j];
@@ -477,7 +477,7 @@
}
}
- int number = (2 * segment + 1) * a.length;
-+ long number = (2 * segment + 1) * a.length;
++ size_t number = (2 * segment + 1) * a.length;
x.length = number;
y.length = number;
z.length = number;
@@ -486,7 +486,7 @@
seg ++;
if(segment <= seg)break;
- for(int j = a.length - 1;0 <= j ;j --){
-+ for(long j = a.length - 1;0 <= j ;j --){
++ for(size_t j = a.length - 1;0 <= j ;j --){
x[num] = x0[seg][j];
y[num] = y0[seg][j];
z[num] = z0[seg][j];
@@ -495,7 +495,7 @@
}
}
- int number = segment * a.length;
-+ long number = segment * a.length;
++ size_t number = segment * a.length;
x = new real[number];
y = new real[number];
z = new real[number];
@@ -504,7 +504,7 @@
if(segment <= seg)break;
- for(int j = a.length - 1;0 <= j ;j --){
-+ for(long j = a.length - 1;0 <= j ;j --){
++ for(size_t j = a.length - 1;0 <= j ;j --){
x[num] = x0[seg][j];
y[num] = y0[seg][j];
z[num] = z0[seg][j];
@@ -563,3 +563,22 @@
if(attacking ==false){
e.fx += e.vx;
e.fy += e.vy;
+--- a/src/es/boot.d
++++ b/src/es/boot.d
+@@ -51,14 +51,14 @@
+ }
+
+ int user_start(){
+- double d;
+-
++/*
+ version (X86) {
+ short cw;
+ asm { fnstcw cw; }
+ cw &= ~1;
+ asm { fldcw cw; }
+ }
++*/
+ mouse = new Mouse();
+ mainloop = new Mainloop(mouse);
+ mainloop.loop();
Modified: packages/trunk/ii-esu/debian/patches/fixes.patch
===================================================================
--- packages/trunk/ii-esu/debian/patches/fixes.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/ii-esu/debian/patches/fixes.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -1,48 +1,34 @@
# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
# Distributed under the same license as the game. See debian/copyright.
-Index: es-shooter-1.0a.dfsg1/src/es/boot.d
-===================================================================
---- es-shooter-1.0a.dfsg1.orig/src/es/boot.d 2007-07-01 10:21:20.000000000 +0000
-+++ es-shooter-1.0a.dfsg1/src/es/boot.d 2007-09-05 13:44:20.000000000 +0000
-@@ -4,7 +4,11 @@
-
+--- a/src/es/boot.d
++++ b/src/es/boot.d
+@@ -5,6 +5,10 @@
private import es.mouse;
--private Mainloop mainloop;
-+private Mainloop mainloop;
-+private Mouse mouse;
-+
-+version (Win32_release) {
+ private Mainloop mainloop;
++private Mouse mouse;
+
++version (Win32_release) {
++
private:
import std.c.windows.windows;
-@@ -39,6 +43,20 @@
+@@ -39,6 +43,12 @@
gc_term();
return result;
}
+} else {
+ // Boot as the general executable.
+ public int main(char[][] args) {
-+ return boot(args);
++ return user_start();
+ }
-+}
-+
-+public int boot(char[][] args) {
-+ double d;
-+ mouse = new Mouse();
-+ mainloop = new Mainloop(mouse);
-+ mainloop.loop();
-+ return 0;
-+}
++}
int user_start(){
double d;
-Index: es-shooter-1.0a.dfsg1/src/es/sound.d
-===================================================================
---- es-shooter-1.0a.dfsg1.orig/src/es/sound.d 2007-07-14 23:56:04.000000000 +0000
-+++ es-shooter-1.0a.dfsg1/src/es/sound.d 2007-09-05 13:44:20.000000000 +0000
+--- a/src/es/sound.d
++++ b/src/es/sound.d
@@ -73,4 +73,4 @@
public int Sound_PlayingMusic(){
if(Mix_PlayingMusic() == 0)_Sound_PlayingMusic = -1;
Modified: packages/trunk/mu-cade/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/mu-cade/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/mu-cade/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -1229,7 +1229,7 @@
T[] actor;
protected:
- int actorIdx = 0;
-+ long actorIdx = 0;
++ size_t actorIdx = 0;
private:
public this() {}
Modified: packages/trunk/parsec47/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/parsec47/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/parsec47/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -684,7 +684,7 @@
Actor[] actor;
protected:
- int actorIdx;
-+ long actorIdx;
++ size_t actorIdx;
public this(int n, Actor act, ActorInitializer ini) {
actor = new Actor[n];
Modified: packages/trunk/projectl/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/projectl/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/projectl/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -18,7 +18,7 @@
extern (C) void gc_init();
extern (C) void gc_term();
-@@ -28,15 +30,29 @@
+@@ -28,26 +30,31 @@
_moduleCtor();
result = user_start();
SDL_Quit();
@@ -36,20 +36,25 @@
+} else {
+ // Boot as the general executable.
+ public int main(string[] args) {
-+ return boot(args);
++ return user_start();
+ }
+}
-+
-+public int boot(string[] args) {
-+ double d;
-+ key = new Key();
-+ mainloop = new Mainloop(key);
-+ mainloop.loop();
-+ return 0;
-+}
int user_start(){
- double d;
+- double d;
+-
++/*
+ version (X86) {
+ short cw;
+ asm { fnstcw cw; }
+ cw &= ~1;
+ asm { fldcw cw; }
+ }
+-
++*/
+ key = new Key();
+ mainloop = new Mainloop(key);
+ mainloop.loop();
--- a/src/br/enemy.d
+++ b/src/br/enemy.d
@@ -1,5 +1,5 @@
@@ -2175,22 +2180,15 @@
/**
* Random number generator.
-@@ -14,12 +14,12 @@
+@@ -14,7 +14,7 @@
public class Rand {
public this() {
- d_time timer = getUTCtime();
-- init_genrand(cast(uint)timer);
+ long timer = Clock.currStdTime();
-+ init_genrand(cast(uint)cast(uint)timer);
+ init_genrand(cast(uint)timer);
}
- public void setSeed(long n) {
-- init_genrand(cast(uint)n);
-+ init_genrand(cast(uint)cast(uint)n);
- }
-
- public uint nextInt32() {
@@ -55,7 +55,7 @@
Matthe Bellew, and Isaku Wada
Andrew C. Edwards v0.1 30 September 2003 edwardsac at ieee.org
@@ -2321,7 +2319,7 @@
if(lap < lapTime[stage][i]){
rank = i+1;
- for(int j=lapTime[stage].length-1;i<j;j--){
-+ for(long j=lapTime[stage].length-1;i<j;j--){
++ for(size_t j=lapTime[stage].length-1;i<j;j--){
lapTime[stage][j] = lapTime[stage][j-1];
}
lapTime[stage][i] = lap;
@@ -2330,7 +2328,7 @@
if(total < totalTime[stage][i]){
rank = i+1;
- for(int j=totalTime[stage].length-1;i<j;j--){
-+ for(long j=totalTime[stage].length-1;i<j;j--){
++ for(size_t j=totalTime[stage].length-1;i<j;j--){
totalTime[stage][j] = totalTime[stage][j-1];
}
totalTime[stage][i] = total;
@@ -2400,18 +2398,18 @@
this.fixedV.length = v.length;
this.v.length = fixedV.length;
- for(int i = fixedV.length - 1;0 <= i;i --){
-+ for(long i = fixedV.length - 1;0 <= i;i --){
++ for(size_t i = fixedV.length - 1;0 <= i;i --){
this.fixedV[i] = new Vector3(v[i]);
this.v[i] = new Vector3(fixedV[i]);
}
this.wires.length = wires.length;
- for(int i = wires.length - 1;0 <= i;i --){
-+ for(long i = wires.length - 1;0 <= i;i --){
++ for(size_t i = wires.length - 1;0 <= i;i --){
this.wires[i] = wires[i].dup;
}
this.rects.length = rects.length;
- for(int i = rects.length - 1;0 <= i;i --){
-+ for(long i = rects.length - 1;0 <= i;i --){
++ for(size_t i = rects.length - 1;0 <= i;i --){
for(int j = rects[i].v.length - 1;0 <= j;j --){
this.rects[i].v[j] = rects[i].v[j];
}
@@ -2420,7 +2418,7 @@
}
public void resetVertex(){
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
v[i] = new Vector3(fixedV[i]);
}
}
@@ -2449,7 +2447,7 @@
T[1][0] = (1 - cos) * UU[1][0] + u.z * sin; T[1][1] = cos + (1 - cos) * UU[1][1]; T[1][2] = (1 - cos) * UU[1][2] - u.x * sin;
T[2][0] = (1 - cos) * UU[2][0] - u.y * sin; T[2][1] = (1 - cos) * UU[2][1] + u.x * sin; T[2][2] = cos + (1 - cos) * UU[2][2];
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
v[i] = new Vector3(
T[0][0] * v[i].x + T[0][1] * v[i].y + T[0][2] * v[i].z ,
T[1][0] * v[i].x + T[1][1] * v[i].y + T[1][2] * v[i].z ,
@@ -2458,7 +2456,7 @@
public void transformMatrix(Matrix t){
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
v[i] = vec3translate(v[i] , t);
}
}
@@ -2467,7 +2465,7 @@
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
float ty = v[i].y * cos - v[i].z * sin;
v[i].z = v[i].y * sin + v[i].z * cos;
v[i].y = ty;
@@ -2476,7 +2474,7 @@
float cos = cos(d);
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
float tx = v[i].x * cos - v[i].z * sin;
v[i].z = v[i].x * sin + v[i].z * cos;
v[i].x = tx;
@@ -2485,7 +2483,7 @@
float cos = cos(d);
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
float tx = v[i].x * cos - v[i].y * sin;
v[i].y = v[i].x * sin + v[i].y * cos;
v[i].x = tx;
@@ -2495,8 +2493,8 @@
}
- int maxNum = 0;
- for(int i = a.length -1;0 <= i;i --){
-+ long maxNum = 0;
-+ for(long i = a.length -1;0 <= i;i --){
++ size_t maxNum = 0;
++ for(size_t i = a.length -1;0 <= i;i --){
if(a[i].length != b[i].length || a[i].length < 1){
Log_write("Pole arguments error" );
throw new Exception("Pole arguments error" );
@@ -2505,7 +2503,7 @@
vec[i].length = maxNum;
}
- int k,l;
-+ long k,l;
++ size_t k,l;
k = 0;
for(int i = 0;i < segment ;i ++){
for(int j = 0;j < maxNum ;j ++){
@@ -2515,8 +2513,8 @@
- int number = vec[0].length;
- for(int i = vec.length -1;0 <= i;i --){
-+ long number = vec[0].length;
-+ for(long i = vec.length -1;0 <= i;i --){
++ size_t number = vec[0].length;
++ for(size_t i = vec.length -1;0 <= i;i --){
if(vec[i].length != number || number < 1){
Log_write("Pole joint arguments error" );
throw new Exception("Pole joint arguments error" );
@@ -2535,7 +2533,7 @@
if(vec.length <= seg)break;
- for(int j = vec[0].length - 1;0 <= j ;j --){
- twires[num] = seg * vec[0].length + j;
-+ for(long j = vec[0].length - 1;0 <= j ;j --){
++ for(size_t j = vec[0].length - 1;0 <= j ;j --){
+ twires[num] = cast(int)(seg * vec[0].length + j);
num ++;
}
@@ -2579,8 +2577,8 @@
- int number = vec[0].length;
- for(int i = vec.length -1;0 <= i;i --){
-+ long number = vec[0].length;
-+ for(long i = vec.length -1;0 <= i;i --){
++ size_t number = vec[0].length;
++ for(size_t i = vec.length -1;0 <= i;i --){
if(vec[i].length != number || number < 1){
Log_write("Pot joint arguments error" );
throw new Exception("Pot joint arguments error" );
@@ -2589,7 +2587,7 @@
twires[i].length = vec[i].length + 1;
}
- for(int i = vec.length;i < twires.length;i ++){
-+ for(long i = vec.length;i < twires.length;i ++){
++ for(size_t i = vec.length;i < twires.length;i ++){
twires[i].length = vec.length;
}
for(int i = 0;i < vec.length;i ++){
Modified: packages/trunk/tatan/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/tatan/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/tatan/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -251,7 +251,7 @@
- int idx = find(decoder, c); // 文字のインデックスを取得
- if(c == ' ' | idx < 0)
+ if(!isASCII(c)) continue; // ascii文字じゃないです
-+ long idx = countUntil(decoder, c); // 文字のインデックスを取得
++ size_t idx = countUntil(decoder, c); // 文字のインデックスを取得
+ if((c == ' ') | (idx < 0))
{
x += cast(int)(WIDTH * zoom); // スペース
@@ -498,21 +498,31 @@
MB_OK | MB_ICONEXCLAMATION);
result = 0; // failed
}
-@@ -42,12 +42,12 @@
- }
+@@ -42,21 +42,20 @@
+ }
} else {
// Boot as the general executable.
- public int main(char[][] args) {
+ public int main(string[] args) {
- return boot(args);
+ return user_start();
}
}
-
--public int boot(char[][] args) {
-+public int boot(string[] args) {
- double d;
+
+ int user_start(){
+- double d;
+-
++/*
+ version (X86) {
+ short cw;
+ asm { fnstcw cw; }
+ cw &= ~1;
+ asm { fldcw cw; }
+ }
+-
++*/
key = new Key();
mouse = new Mouse();
+ mainloop = new Mainloop(key ,mouse);
--- a/src/br/boss.d
+++ b/src/br/boss.d
@@ -16,22 +16,22 @@
@@ -1643,7 +1653,7 @@
Actor[] actor;
protected:
- int actorIdx = 0;
-+ long actorIdx = 0;
++ size_t actorIdx = 0;
const int maxActor;
public this() {
maxActor = 16;
@@ -2137,22 +2147,15 @@
/**
* Random number generator.
-@@ -14,12 +14,12 @@
+@@ -14,7 +14,7 @@
public class Rand {
public this() {
- d_time timer = getUTCtime();
-- init_genrand(cast(uint)timer);
+ long timer = Clock.currStdTime();
-+ init_genrand(cast(uint)cast(uint)timer);
+ init_genrand(cast(uint)timer);
}
- public void setSeed(long n) {
-- init_genrand(cast(uint)n);
-+ init_genrand(cast(uint)cast(uint)n);
- }
-
- public uint nextInt32() {
@@ -55,7 +55,7 @@
Matthe Bellew, and Isaku Wada
Andrew C. Edwards v0.1 30 September 2003 edwardsac at ieee.org
@@ -2273,7 +2276,7 @@
if(lap < lapTime[stage][i]){
rank = i+1;
- for(int j=lapTime[stage].length-1;i<j;j--){
-+ for(long j=lapTime[stage].length-1;i<j;j--){
++ for(size_t j=lapTime[stage].length-1;i<j;j--){
lapTime[stage][j] = lapTime[stage][j-1];
}
lapTime[stage][i] = lap;
@@ -2282,7 +2285,7 @@
if(total < totalTime[stage][i]){
rank = i+1;
- for(int j=totalTime[stage].length-1;i<j;j--){
-+ for(long j=totalTime[stage].length-1;i<j;j--){
++ for(size_t j=totalTime[stage].length-1;i<j;j--){
totalTime[stage][j] = totalTime[stage][j-1];
}
totalTime[stage][i] = total;
@@ -2293,18 +2296,18 @@
this.fixedV.length = v.length;
this.v.length = fixedV.length;
- for(int i = fixedV.length - 1;0 <= i;i --){
-+ for(long i = fixedV.length - 1;0 <= i;i --){
++ for(size_t i = fixedV.length - 1;0 <= i;i --){
this.fixedV[i] = new Vector3(v[i]);
this.v[i] = new Vector3(fixedV[i]);
}
this.wires.length = wires.length;
- for(int i = wires.length - 1;0 <= i;i --){
-+ for(long i = wires.length - 1;0 <= i;i --){
++ for(size_t i = wires.length - 1;0 <= i;i --){
this.wires[i] = wires[i].dup;
}
this.polygons.length = polygons.length;
- for(int i = polygons.length - 1;0 <= i;i --){
-+ for(long i = polygons.length - 1;0 <= i;i --){
++ for(size_t i = polygons.length - 1;0 <= i;i --){
for(int j = polygons[i].v.length - 1;0 <= j;j --){
this.polygons[i].v[j] = polygons[i].v[j];
}
@@ -2335,7 +2338,7 @@
}
public void resetVertex(){
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
v[i] = new Vector3(fixedV[i]);
}
}
@@ -2364,7 +2367,7 @@
T[1][0] = (1 - cos) * UU[1][0] + u.z * sin; T[1][1] = cos + (1 - cos) * UU[1][1]; T[1][2] = (1 - cos) * UU[1][2] - u.x * sin;
T[2][0] = (1 - cos) * UU[2][0] - u.y * sin; T[2][1] = (1 - cos) * UU[2][1] + u.x * sin; T[2][2] = cos + (1 - cos) * UU[2][2];
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
v[i] = new Vector3(
T[0][0] * v[i].x + T[0][1] * v[i].y + T[0][2] * v[i].z ,
T[1][0] * v[i].x + T[1][1] * v[i].y + T[1][2] * v[i].z ,
@@ -2373,7 +2376,7 @@
public Shape translate(float x,float y,float z){
Vector3 dvec = new Vector3(x,y,z);
- for(int i = fixedV.length - 1;0 <= i;i --){
-+ for(long i = fixedV.length - 1;0 <= i;i --){
++ for(size_t i = fixedV.length - 1;0 <= i;i --){
fixedV[i] += dvec;
}
resetVertex();
@@ -2382,7 +2385,7 @@
public Shape transformMatrix(Matrix t){
- for(int i = v.length - 1;0 <= i;i --){
-+ for(long i = v.length - 1;0 <= i;i --){
++ for(size_t i = v.length - 1;0 <= i;i --){
v[i] = vec3translate(v[i] , t);
}
return this;
@@ -2421,8 +2424,8 @@
}
- int maxNum = 0;
- for(int i = a.length -1;0 <= i;i --){
-+ long maxNum = 0;
-+ for(long i = a.length -1;0 <= i;i --){
++ size_t maxNum = 0;
++ for(size_t i = a.length -1;0 <= i;i --){
if(a[i].length != b[i].length || a[i].length < 1){
Log_write("Pole arguments error" );
throw new Exception("Pole arguments error" );
@@ -2431,7 +2434,7 @@
vec[i].length = maxNum;
}
- int k,l;
-+ long k,l;
++ size_t k,l;
k = 0;
for(int i = 0;i < segment ;i ++){
for(int j = 0;j < maxNum ;j ++){
@@ -2441,8 +2444,8 @@
- int number = vec[0].length;
- for(int i = vec.length -1;0 <= i;i --){
-+ long number = vec[0].length;
-+ for(long i = vec.length -1;0 <= i;i --){
++ size_t number = vec[0].length;
++ for(size_t i = vec.length -1;0 <= i;i --){
if(vec[i].length != number || number < 1){
Log_write("Pole joint arguments error" );
throw new Exception("Pole joint arguments error" );
@@ -2461,7 +2464,7 @@
if(vec.length <= seg)break;
- for(int j = vec[0].length - 1;0 <= j ;j --){
- twires[num] = seg * vec[0].length + j;
-+ for(long j = vec[0].length - 1;0 <= j ;j --){
++ for(size_t j = vec[0].length - 1;0 <= j ;j --){
+ twires[num] = cast(int)(seg * vec[0].length + j);
num ++;
}
@@ -2522,8 +2525,8 @@
- int number = vec[0].length;
- for(int i = vec.length -1;0 <= i;i --){
-+ long number = vec[0].length;
-+ for(long i = vec.length -1;0 <= i;i --){
++ size_t number = vec[0].length;
++ for(size_t i = vec.length -1;0 <= i;i --){
if(vec[i].length != number || number < 1){
Log_write("Pot joint arguments error" );
throw new Exception("Pot joint arguments error" );
@@ -2532,7 +2535,7 @@
twires[i].length = vec[i].length + 1;
}
- for(int i = vec.length;i < twires.length;i ++){
-+ for(long i = vec.length;i < twires.length;i ++){
++ for(size_t i = vec.length;i < twires.length;i ++){
twires[i].length = vec.length;
}
for(int i = 0;i < vec.length;i ++){
@@ -2594,7 +2597,7 @@
num ++;
}
- int length = vec.length;
-+ long length = vec.length;
++ size_t length = vec.length;
if((1e-6) <= vec[0][0].size()){
polygon[] cover;
tv.length = tv.length + vec[0].length;
Modified: packages/trunk/tatan/debian/patches/fixes.patch
===================================================================
--- packages/trunk/tatan/debian/patches/fixes.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/tatan/debian/patches/fixes.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -1,39 +1,27 @@
# Copyright (C) 2007 Marcel Unbehaun <frostworks at gmx.de>
# Distributed under the same license as the game. See debian/copyright.
-Index: tatan-1.0/src/br/boot.d
-===================================================================
---- tatan-1.0.orig/src/br/boot.d 2007-07-28 16:09:10.000000000 +0000
-+++ tatan-1.0/src/br/boot.d 2007-09-05 09:26:05.000000000 +0000
-@@ -6,6 +6,8 @@
- private Mainloop mainloop;
+--- a/src/br/boot.d
++++ b/src/br/boot.d
+@@ -7,6 +7,8 @@
private Key key;
private Mouse mouse;
-+
-+version (Win32_release) {
++version (Win32_release) {
++
private:
import std.c.windows.windows;
-@@ -37,7 +39,22 @@
- }
+
+@@ -38,6 +40,12 @@
gc_term();
return result;
-+}
+ }
+} else {
+ // Boot as the general executable.
+ public int main(char[][] args) {
-+ return boot(args);
++ return user_start();
+ }
- }
-+
-+public int boot(char[][] args) {
-+ double d;
-+ key = new Key();
-+ mouse = new Mouse();
-+ mainloop = new Mainloop(key ,mouse);
-+ mainloop.loop();
-+ return 0;
-+}
++}
int user_start(){
double d;
Modified: packages/trunk/titanion/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/titanion/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/titanion/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -792,7 +792,7 @@
+ bool[string] seMark;
+ string[] bgmFileName;
+ string currentBgm;
-+ long prevBgmIdx;
++ size_t prevBgmIdx;
int nextIdxMv;
bool _bgmEnabled = true;
bool _seEnabled = true;
@@ -848,7 +848,7 @@
public static void nextBgm() {
- int bgmIdx = prevBgmIdx + nextIdxMv;
-+ long bgmIdx = prevBgmIdx + nextIdxMv;
++ size_t bgmIdx = prevBgmIdx + nextIdxMv;
if (bgmIdx < 0)
bgmIdx = bgm.length - 1;
else if (bgmIdx >= bgm.length)
@@ -1003,7 +1003,7 @@
T[] actors;
protected:
- int actorIdx = 0;
-+ long actorIdx = 0;
++ size_t actorIdx = 0;
private:
bool hasNoActor;
Modified: packages/trunk/torus-trooper/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/torus-trooper/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -713,7 +713,7 @@
- Chunk[char[]] se;
- int prevBgmIdx;
+ Chunk[string] se;
-+ long prevBgmIdx;
++ size_t prevBgmIdx;
int nextIdxMv;
bool seDisabled = false;
@@ -759,7 +759,7 @@
public static void playBgm() {
- int bgmIdx = rand.nextInt(bgm.length);
-+ long bgmIdx = cast(long) rand.nextInt(cast(int)bgm.length);
++ size_t bgmIdx = cast(size_t) rand.nextInt(cast(int)bgm.length);
nextIdxMv = rand.nextInt(2) * 2 - 1;
if (bgmIdx == prevBgmIdx) {
bgmIdx++;
@@ -768,7 +768,7 @@
public static void nextBgm() {
- int bgmIdx = prevBgmIdx + nextIdxMv;
-+ long bgmIdx = prevBgmIdx + nextIdxMv;
++ size_t bgmIdx = prevBgmIdx + nextIdxMv;
if (bgmIdx < 0)
bgmIdx = bgm.length - 1;
else if (bgmIdx >= bgm.length)
@@ -1089,7 +1089,7 @@
T[] actor;
protected:
- int actorIdx = 0;
-+ long actorIdx = 0;
++ size_t actorIdx = 0;
private:
public this() {}
Modified: packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/tumiki-fighters/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -1312,7 +1312,7 @@
Actor[] actor;
protected:
- int actorIdx;
-+ long actorIdx;
++ size_t actorIdx;
public this(int n, Actor act, ActorInitializer ini) {
actor = new Actor[n];
Modified: packages/trunk/val-and-rick/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/val-and-rick/debian/patches/dlang_v2.patch 2013-05-27 03:30:15 UTC (rev 14163)
+++ packages/trunk/val-and-rick/debian/patches/dlang_v2.patch 2013-05-27 06:38:49 UTC (rev 14164)
@@ -10,7 +10,7 @@
T[] actor;
protected:
- int actorIdx = 0;
-+ long actorIdx = 0;
++ size_t actorIdx = 0;
private:
public this() {}
More information about the Pkg-games-commits
mailing list