r3827 - packages/trunk/a7xpg/debian/patches
Miriam Ruiz
baby-guest at alioth.debian.org
Sat Aug 25 21:18:36 UTC 2007
Author: baby-guest
Date: 2007-08-25 21:18:36 +0000 (Sat, 25 Aug 2007)
New Revision: 3827
Modified:
packages/trunk/a7xpg/debian/patches/fixes.patch
Log:
Added absolute directories to data files in the patch
Modified: packages/trunk/a7xpg/debian/patches/fixes.patch
===================================================================
--- packages/trunk/a7xpg/debian/patches/fixes.patch 2007-08-25 21:13:50 UTC (rev 3826)
+++ packages/trunk/a7xpg/debian/patches/fixes.patch 2007-08-25 21:18:36 UTC (rev 3827)
@@ -1,7 +1,7 @@
-diff --git a/build.xml b/build.xml
-index 98ab319..f906d95 100644
---- a/build.xml
-+++ b/build.xml
+Index: a7xpg-0.11.dfsg1/build.xml
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/build.xml 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/build.xml 2007-08-25 21:15:55.000000000 +0000
@@ -2,11 +2,8 @@
<project name="d_build" default="all" basedir=".">
<!-- Build target program name -->
@@ -79,10 +79,10 @@
<srcfile/>
</apply>
</target>
-diff --git a/import/SDL.d b/import/SDL.d
-index b328452..7d36715 100644
---- a/import/SDL.d
-+++ b/import/SDL.d
+Index: a7xpg-0.11.dfsg1/import/SDL.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL.d 2007-08-25 21:15:55.000000000 +0000
@@ -20,18 +20,18 @@
slouken at devolution.com
*/
@@ -114,7 +114,7 @@
extern(C):
-@@ -73,18 +73,18 @@ Uint32 SDL_WasInit(Uint32 flags);
+@@ -73,18 +73,18 @@
*/
void SDL_Quit();
@@ -138,10 +138,10 @@
-}
\ No newline at end of file
+}
-diff --git a/import/SDL_active.d b/import/SDL_active.d
-index 4d35fd2..9e57d23 100644
---- a/import/SDL_active.d
-+++ b/import/SDL_active.d
+Index: a7xpg-0.11.dfsg1/import/SDL_active.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_active.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_active.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,7 +22,7 @@
/* Include file for SDL application focus event handling */
@@ -151,10 +151,10 @@
extern(C):
-diff --git a/import/SDL_audio.d b/import/SDL_audio.d
-index 65e7e6e..20e0b06 100644
---- a/import/SDL_audio.d
-+++ b/import/SDL_audio.d
+Index: a7xpg-0.11.dfsg1/import/SDL_audio.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_audio.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_audio.d 2007-08-25 21:15:55.000000000 +0000
@@ -20,10 +20,10 @@
slouken at devolution.com
*/
@@ -170,10 +170,10 @@
extern(C):
-diff --git a/import/SDL_cdrom.d b/import/SDL_cdrom.d
-index c5bb575..f5748ea 100644
---- a/import/SDL_cdrom.d
-+++ b/import/SDL_cdrom.d
+Index: a7xpg-0.11.dfsg1/import/SDL_cdrom.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_cdrom.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_cdrom.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,7 +22,7 @@
/* This is the CD-audio control API for Simple DirectMedia Layer */
@@ -183,10 +183,10 @@
extern(C):
-diff --git a/import/SDL_endian.d b/import/SDL_endian.d
-index 914e6ce..8f7ac23 100644
---- a/import/SDL_endian.d
-+++ b/import/SDL_endian.d
+Index: a7xpg-0.11.dfsg1/import/SDL_endian.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_endian.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_endian.d 2007-08-25 21:15:55.000000000 +0000
@@ -34,9 +34,9 @@
and other data sources.
*/
@@ -200,7 +200,7 @@
extern(C):
-@@ -57,9 +57,9 @@ Uint32 SDL_Swap32(Uint32 D) {
+@@ -57,9 +57,9 @@
Uint64 SDL_Swap64(Uint64 val) {
Uint32 hi, lo;
/* Separate into high and low 32-bit values and swap them */
@@ -212,10 +212,10 @@
val = SDL_Swap32(lo);
val <<= 32;
val |= SDL_Swap32(hi);
-diff --git a/import/SDL_events.d b/import/SDL_events.d
-index 3e8de00..3e3c370 100644
---- a/import/SDL_events.d
-+++ b/import/SDL_events.d
+Index: a7xpg-0.11.dfsg1/import/SDL_events.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_events.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_events.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,12 +22,12 @@
/* Include file for SDL event handling */
@@ -235,7 +235,7 @@
extern(C):
-@@ -105,7 +105,7 @@ struct SDL_KeyboardEvent {
+@@ -105,7 +105,7 @@
Uint8 type; /* SDL_KEYDOWN or SDL_KEYUP */
Uint8 which; /* The keyboard device index */
Uint8 state; /* SDL_PRESSED or SDL_RELEASED */
@@ -244,10 +244,10 @@
}
/* Mouse motion event structure */
-diff --git a/import/SDL_getenv.d b/import/SDL_getenv.d
-index cccd08e..dc30e25 100644
---- a/import/SDL_getenv.d
-+++ b/import/SDL_getenv.d
+Index: a7xpg-0.11.dfsg1/import/SDL_getenv.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_getenv.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_getenv.d 2007-08-25 21:15:55.000000000 +0000
@@ -1,11 +1,2 @@
/* Not all environments have a working getenv()/putenv() */
-
@@ -261,10 +261,10 @@
-char *SDL_getenv(char *name);
-char *getenv(char* X) { return SDL_getenv(X); }
+/* But Linux has */
-diff --git a/import/SDL_joystick.d b/import/SDL_joystick.d
-index 70cf291..a40b153 100644
---- a/import/SDL_joystick.d
-+++ b/import/SDL_joystick.d
+Index: a7xpg-0.11.dfsg1/import/SDL_joystick.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_joystick.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_joystick.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,7 +22,7 @@
/* Include file for SDL joystick event handling */
@@ -274,10 +274,10 @@
extern(C):
-diff --git a/import/SDL_keyboard.d b/import/SDL_keyboard.d
-index d07a30f..d3f44bf 100644
---- a/import/SDL_keyboard.d
-+++ b/import/SDL_keyboard.d
+Index: a7xpg-0.11.dfsg1/import/SDL_keyboard.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_keyboard.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_keyboard.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,11 +22,12 @@
/* Include file for SDL keyboard event handling */
@@ -293,7 +293,7 @@
extern(C):
-@@ -46,7 +47,7 @@ extern(C):
+@@ -46,7 +47,7 @@
An international character..
}
*/
@@ -302,10 +302,10 @@
Uint8 scancode; /* hardware specific scancode */
SDLKey sym; /* SDL virtual keysym */
SDLMod mod; /* current key modifiers */
-diff --git a/import/SDL_mixer.d b/import/SDL_mixer.d
-index 085e473..53dd95e 100644
---- a/import/SDL_mixer.d
-+++ b/import/SDL_mixer.d
+Index: a7xpg-0.11.dfsg1/import/SDL_mixer.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_mixer.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_mixer.d 2007-08-25 21:15:55.000000000 +0000
@@ -24,7 +24,7 @@
/* $Id: SDL_mixer.d,v 1.1.1.1 2003/09/19 14:55:49 kenta Exp $ */
@@ -315,10 +315,10 @@
extern (C) {
-diff --git a/import/SDL_mouse.d b/import/SDL_mouse.d
-index 6b48e14..7e65895 100644
---- a/import/SDL_mouse.d
-+++ b/import/SDL_mouse.d
+Index: a7xpg-0.11.dfsg1/import/SDL_mouse.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_mouse.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_mouse.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,8 +22,8 @@
/* Include file for SDL mouse event handling */
@@ -330,10 +330,10 @@
extern(C):
-diff --git a/import/SDL_mutex.d b/import/SDL_mutex.d
-index f0a8e5d..794050f 100644
---- a/import/SDL_mutex.d
-+++ b/import/SDL_mutex.d
+Index: a7xpg-0.11.dfsg1/import/SDL_mutex.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_mutex.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_mutex.d 2007-08-25 21:15:55.000000000 +0000
@@ -25,7 +25,7 @@
These are independent of the other SDL routines.
*/
@@ -343,10 +343,10 @@
extern(C):
-diff --git a/import/SDL_quit.d b/import/SDL_quit.d
-index 81116d6..877a25a 100644
---- a/import/SDL_quit.d
-+++ b/import/SDL_quit.d
+Index: a7xpg-0.11.dfsg1/import/SDL_quit.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_quit.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_quit.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,7 +22,7 @@
/* Include file for SDL quit event handling */
@@ -356,17 +356,17 @@
/*
An SDL_QUITEVENT is generated when the user tries to close the application
-@@ -43,5 +43,5 @@ import SDL_events;
+@@ -43,5 +43,5 @@
bit SDL_QuitRequested()
{
SDL_PumpEvents();
- return SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK);
+ return SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK) != 0;
}
-diff --git a/import/SDL_rwops.d b/import/SDL_rwops.d
-index dce292b..9ed36bf 100644
---- a/import/SDL_rwops.d
-+++ b/import/SDL_rwops.d
+Index: a7xpg-0.11.dfsg1/import/SDL_rwops.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_rwops.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_rwops.d 2007-08-25 21:15:55.000000000 +0000
@@ -24,7 +24,7 @@
data sources. It can easily be extended to files, memory, etc.
*/
@@ -376,7 +376,7 @@
extern(C):
-@@ -84,35 +84,25 @@ void SDL_FreeRW(SDL_RWops *area);
+@@ -84,35 +84,25 @@
/* Macros to easily read and write from an SDL_RWops structure */
int SDL_RWseek(SDL_RWops *ctx, int offset, int whence)
{
@@ -417,10 +417,10 @@
- return (*close)(ctx);
+ return ctx.close(ctx);
}
-diff --git a/import/SDL_syswm.d b/import/SDL_syswm.d
-index a282501..8870fb6 100644
---- a/import/SDL_syswm.d
-+++ b/import/SDL_syswm.d
+Index: a7xpg-0.11.dfsg1/import/SDL_syswm.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_syswm.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_syswm.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,7 +22,7 @@
/* Include file for SDL custom system window manager hooks */
@@ -430,10 +430,10 @@
extern(C):
-diff --git a/import/SDL_thread.d b/import/SDL_thread.d
-index 0b5b63c..2f363a4 100644
---- a/import/SDL_thread.d
-+++ b/import/SDL_thread.d
+Index: a7xpg-0.11.dfsg1/import/SDL_thread.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_thread.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_thread.d 2007-08-25 21:15:55.000000000 +0000
@@ -25,8 +25,8 @@
These are independent of the other SDL routines.
*/
@@ -445,10 +445,10 @@
extern(C):
-diff --git a/import/SDL_timer.d b/import/SDL_timer.d
-index 293b1d0..61bec25 100644
---- a/import/SDL_timer.d
-+++ b/import/SDL_timer.d
+Index: a7xpg-0.11.dfsg1/import/SDL_timer.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_timer.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_timer.d 2007-08-25 21:15:55.000000000 +0000
@@ -20,7 +20,7 @@
slouken at devolution.com
*/
@@ -458,10 +458,10 @@
extern(C):
-diff --git a/import/SDL_version.d b/import/SDL_version.d
-index 728e0d1..1b62006 100644
---- a/import/SDL_version.d
-+++ b/import/SDL_version.d
+Index: a7xpg-0.11.dfsg1/import/SDL_version.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_version.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_version.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,7 +22,7 @@
/* This header defines the current SDL version */
@@ -471,10 +471,10 @@
extern(C):
-diff --git a/import/SDL_video.d b/import/SDL_video.d
-index ce1bcb0..22ade80 100644
---- a/import/SDL_video.d
-+++ b/import/SDL_video.d
+Index: a7xpg-0.11.dfsg1/import/SDL_video.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/SDL_video.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/SDL_video.d 2007-08-25 21:15:55.000000000 +0000
@@ -22,9 +22,9 @@
/* Header file for access to the SDL raw framebuffer window */
@@ -488,10 +488,10 @@
extern(C):
-diff --git a/import/opengl.d b/import/opengl.d
-index 9149a98..3c8f06f 100644
---- a/import/opengl.d
-+++ b/import/opengl.d
+Index: a7xpg-0.11.dfsg1/import/opengl.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/import/opengl.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/import/opengl.d 2007-08-25 21:15:55.000000000 +0000
@@ -1,6 +1,8 @@
-import windows;
-
@@ -504,7 +504,7 @@
alias uint GLenum;
alias ubyte GLboolean;
-@@ -1111,345 +1113,343 @@ const uint GL_TEXTURE_COMPONENTS = GL_TEXTURE_INTERNAL_FORMAT;
+@@ -1111,345 +1113,343 @@
/*************************************************************/
@@ -845,8 +845,6 @@
-extern(Windows) void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
-extern(Windows) void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-
--
--extern(Windows):
+void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref);
+GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
@@ -1183,21 +1181,22 @@
+void /*APIENTRY*/glVertex4sv (GLshort *v);
+void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-+
+-extern(Windows):
+
/* EXT_vertex_array */
typedef void (* PFNGLARRAYELEMENTEXTPROC) (GLint i);
-@@ -1483,4 +1483,4 @@ typedef void (* PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)
+@@ -1483,4 +1483,4 @@
typedef void (* PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)
(GLenum target, GLenum pname, GLfloat *params);
-import openglu;
\ No newline at end of file
+import openglu;
-diff --git a/src/abagames/a7xpg/A7xBoot.d b/src/abagames/a7xpg/A7xBoot.d
-index 2164bfb..671ae4a 100644
---- a/src/abagames/a7xpg/A7xBoot.d
-+++ b/src/abagames/a7xpg/A7xBoot.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xBoot.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xBoot.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xBoot.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,13 +5,15 @@
*/
module abagames.a7xpg.A7xBoot;
@@ -1215,7 +1214,7 @@
/**
* Boot A7Xpg.
-@@ -29,8 +31,7 @@ private void usage() {
+@@ -29,8 +31,7 @@
}
private void parseArgs(char[][] args) {
@@ -1225,7 +1224,7 @@
switch (args[i]) {
case "-brightness":
if (i >= args.length - 1) {
-@@ -38,7 +39,7 @@ private void parseArgs(char[][] args) {
+@@ -38,7 +39,7 @@
exit(EXIT_FAILURE);
}
i++;
@@ -1234,7 +1233,7 @@
if (b < 0 || b > 1) {
usage();
exit(EXIT_FAILURE);
-@@ -51,7 +52,7 @@ private void parseArgs(char[][] args) {
+@@ -51,7 +52,7 @@
exit(EXIT_FAILURE);
}
i++;
@@ -1243,7 +1242,7 @@
if (l < 0 || l > 1) {
usage();
exit(EXIT_FAILURE);
-@@ -77,9 +78,7 @@ private void parseArgs(char[][] args) {
+@@ -77,9 +78,7 @@
}
}
@@ -1254,7 +1253,7 @@
screen = new A7xScreen;
input = new Input;
try {
-@@ -92,32 +91,3 @@ private int boot(char[] argl) {
+@@ -92,32 +91,3 @@
mainLoop.loop();
return EXIT_SUCCESS;
}
@@ -1287,10 +1286,10 @@
- gc_term();
- return result;
-}
-diff --git a/src/abagames/a7xpg/A7xGameManager.d b/src/abagames/a7xpg/A7xGameManager.d
-index 24ee5f3..34849ef 100644
---- a/src/abagames/a7xpg/A7xGameManager.d
-+++ b/src/abagames/a7xpg/A7xGameManager.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xGameManager.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,12 +5,13 @@
*/
module abagames.a7xpg.A7xGameManager;
@@ -1306,7 +1305,7 @@
import abagames.util.sdl.Screen3D;
import abagames.util.sdl.Texture;
import abagames.util.sdl.Input;
-@@ -115,8 +116,8 @@ public class A7xGameManager: GameManager {
+@@ -115,8 +116,8 @@
int enemyTableIdx, enemyNum;
public override void init() {
@@ -1317,7 +1316,7 @@
screen.makeLuminousTexture();
rand = new Rand;
field = new Field;
-@@ -189,7 +190,7 @@ public class A7xGameManager: GameManager {
+@@ -189,7 +190,7 @@
}
public void addGold() {
@@ -1326,7 +1325,7 @@
assert(gold);
gold.set();
}
-@@ -210,14 +211,14 @@ public class A7xGameManager: GameManager {
+@@ -210,14 +211,14 @@
public void addBonus(int sc, Vector pos, float size) {
addScore(sc);
@@ -1343,7 +1342,7 @@
leftGold--;
if (leftGold - appGold >= 0)
addGold();
-@@ -235,14 +236,14 @@ public class A7xGameManager: GameManager {
+@@ -235,14 +236,14 @@
public void addEnemy(int type, float size, float speed) {
playSe(5);
@@ -1360,7 +1359,7 @@
assert(pt);
pt.set(pos, deg, ofs, speed, r, g, b);
}
-@@ -254,16 +255,16 @@ public class A7xGameManager: GameManager {
+@@ -254,16 +255,16 @@
field.size.y = stgData[st][1];
field.eyeZ = 300;
field.alpha = 1;
@@ -1385,7 +1384,7 @@
for (int j = 0; j < n; j++) {
enemyTable[ei][0] = tp;
enemyTable[ei][1] = sz;
-@@ -374,7 +375,7 @@ public class A7xGameManager: GameManager {
+@@ -374,7 +375,7 @@
if (enemyTableIdx == 0 && lap >= 1) {
int ei = enemyNum - 1;
for (int i = 0; i < lap * 2; i++) {
@@ -1394,7 +1393,7 @@
enemyTable[ei][1] * (1 + lap * 0.1),
enemyTable[ei][2] * (1 + lap * 0.1));
ei--;
-@@ -383,7 +384,7 @@ public class A7xGameManager: GameManager {
+@@ -383,7 +384,7 @@
}
}
enemyTimer = enemyAppInterval;
@@ -1403,10 +1402,10 @@
enemyTable[enemyTableIdx][1],
enemyTable[enemyTableIdx][2]);
enemyTableIdx++;
-diff --git a/src/abagames/a7xpg/A7xPrefManager.d b/src/abagames/a7xpg/A7xPrefManager.d
-index 66ee416..c199967 100644
---- a/src/abagames/a7xpg/A7xPrefManager.d
-+++ b/src/abagames/a7xpg/A7xPrefManager.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xPrefManager.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,9 @@
*/
module abagames.a7xpg.A7xPrefManager;
@@ -1418,7 +1417,7 @@
import abagames.util.PrefManager;
/**
-@@ -14,23 +16,27 @@ import abagames.util.PrefManager;
+@@ -14,23 +16,27 @@
public class A7xPrefManager: PrefManager {
public:
static const int VERSION_NUM = 10;
@@ -1449,7 +1448,7 @@
init();
} finally {
fd.close();
-@@ -39,7 +45,7 @@ public class A7xPrefManager: PrefManager {
+@@ -39,7 +45,7 @@
public void save() {
auto File fd = new File;
@@ -1458,10 +1457,10 @@
fd.write(VERSION_NUM);
fd.write(hiScore);
fd.close();
-diff --git a/src/abagames/a7xpg/A7xScreen.d b/src/abagames/a7xpg/A7xScreen.d
-index 5fc2b57..213b125 100644
---- a/src/abagames/a7xpg/A7xScreen.d
-+++ b/src/abagames/a7xpg/A7xScreen.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xScreen.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xScreen.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xScreen.d 2007-08-25 21:15:55.000000000 +0000
@@ -6,6 +6,7 @@
module abagames.a7xpg.A7xScreen;
@@ -1470,7 +1469,7 @@
import abagames.util.sdl.Screen3D;
/**
-@@ -40,13 +41,13 @@ public class A7xScreen: Screen3D {
+@@ -40,13 +41,13 @@
GLuint luminousTexture;
const int LUMINOUS_TEXTURE_WIDTH_MAX = 128;
const int LUMINOUS_TEXTURE_HEIGHT_MAX = 128;
@@ -1487,11 +1486,11 @@
glGenTextures(1, &luminousTexture);
glBindTexture(GL_TEXTURE_2D, luminousTexture);
glTexImage2D(GL_TEXTURE_2D, 0, 4, luminousTextureWidth, luminousTextureHeight, 0,
-diff --git a/src/abagames/a7xpg/Bonus.d b/src/abagames/a7xpg/Bonus.d
-index 3edbb5c..6cdb368 100644
---- a/src/abagames/a7xpg/Bonus.d
-+++ b/src/abagames/a7xpg/Bonus.d
-@@ -36,7 +36,7 @@ public class Bonus: Actor {
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Bonus.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Bonus.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Bonus.d 2007-08-25 21:15:55.000000000 +0000
+@@ -36,7 +36,7 @@
tn /= 10;
pos.x = p.x - s / 2 * tn; pos.y = p.y;
size = s;
@@ -1500,10 +1499,10 @@
my = 0.03 + s * 0.2;
isExist = true;
}
-diff --git a/src/abagames/a7xpg/Enemy.d b/src/abagames/a7xpg/Enemy.d
-index c841922..7adf088 100644
---- a/src/abagames/a7xpg/Enemy.d
-+++ b/src/abagames/a7xpg/Enemy.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Enemy.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Enemy.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Enemy.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,13 +5,15 @@
*/
module abagames.a7xpg.Enemy;
@@ -1521,7 +1520,7 @@
import abagames.a7xpg.A7xGameManager;
import abagames.a7xpg.A7xScreen;
-@@ -48,7 +50,7 @@ public class Enemy: LuminousActor {
+@@ -48,7 +50,7 @@
}
public override void init(ActorInitializer ini) {
@@ -1530,10 +1529,10 @@
ship = ei.ship;
field = ei.field;
rand = ei.rand;
-diff --git a/src/abagames/a7xpg/Gold.d b/src/abagames/a7xpg/Gold.d
-index 7ea7f8d..e55a600 100644
---- a/src/abagames/a7xpg/Gold.d
-+++ b/src/abagames/a7xpg/Gold.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Gold.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Gold.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Gold.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,8 @@
*/
module abagames.a7xpg.Gold;
@@ -1544,7 +1543,7 @@
import opengl;
import abagames.util.Vector;
import abagames.util.Rand;
-@@ -37,7 +38,7 @@ public class Gold: LuminousActor {
+@@ -37,7 +38,7 @@
}
public override void init(ActorInitializer ini) {
@@ -1553,11 +1552,11 @@
ship = gi.ship;
field = gi.field;
rand = gi.rand;
-diff --git a/src/abagames/a7xpg/LetterRender.d b/src/abagames/a7xpg/LetterRender.d
-index 2eb753b..0e5a3b6 100644
---- a/src/abagames/a7xpg/LetterRender.d
-+++ b/src/abagames/a7xpg/LetterRender.d
-@@ -123,7 +123,7 @@ public class LetterRender {
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/LetterRender.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LetterRender.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LetterRender.d 2007-08-25 21:15:55.000000000 +0000
+@@ -123,7 +123,7 @@
float x, y, length, size, t;
int deg;
for ( i=0 ; ; i++ ) {
@@ -1566,10 +1565,10 @@
if (deg > 99990) break;
x = -spData[idx][i][0];
y = -spData[idx][i][1];
-diff --git a/src/abagames/a7xpg/LuminousActor.d b/src/abagames/a7xpg/LuminousActor.d
-index 5667deb..7ae7e5a 100644
---- a/src/abagames/a7xpg/LuminousActor.d
-+++ b/src/abagames/a7xpg/LuminousActor.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActor.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LuminousActor.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActor.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.a7xpg.LuminousActor;
@@ -1579,11 +1578,11 @@
/**
* Actor with the luminous effect.
-diff --git a/src/abagames/a7xpg/LuminousActorPool.d b/src/abagames/a7xpg/LuminousActorPool.d
-index 12507ba..c300f59 100644
---- a/src/abagames/a7xpg/LuminousActorPool.d
-+++ b/src/abagames/a7xpg/LuminousActorPool.d
-@@ -21,7 +21,7 @@ public class LuminousActorPool: ActorPool {
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActorPool.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LuminousActorPool.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActorPool.d 2007-08-25 21:15:55.000000000 +0000
+@@ -21,7 +21,7 @@
public void drawLuminous() {
for (int i = 0; i < actor.length; i++) {
if (actor[i].isExist)
@@ -1592,10 +1591,10 @@
}
}
}
-diff --git a/src/abagames/a7xpg/Particle.d b/src/abagames/a7xpg/Particle.d
-index a3a9181..8cf6259 100644
---- a/src/abagames/a7xpg/Particle.d
-+++ b/src/abagames/a7xpg/Particle.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Particle.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Particle.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Particle.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.a7xpg.Particle;
@@ -1605,7 +1604,7 @@
import opengl;
import abagames.util.Vector;
import abagames.util.Rand;
-@@ -34,7 +34,7 @@ public class Particle: LuminousActor {
+@@ -34,7 +34,7 @@
}
public override void init(ActorInitializer ini) {
@@ -1614,10 +1613,10 @@
field = pi.field;
rand = pi.rand;
pos = new Vector;
-diff --git a/src/abagames/a7xpg/Ship.d b/src/abagames/a7xpg/Ship.d
-index b9958b2..af909df 100644
---- a/src/abagames/a7xpg/Ship.d
-+++ b/src/abagames/a7xpg/Ship.d
+Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Ship.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Ship.d 2007-08-25 21:14:07.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Ship.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,8 @@
*/
module abagames.a7xpg.Ship;
@@ -1628,7 +1627,7 @@
import opengl;
import abagames.util.Vector;
import abagames.util.Rand;
-@@ -237,7 +238,7 @@ public class Ship {
+@@ -237,7 +238,7 @@
manager.addParticle(pos, deg + math.PI + rand.nextFloat(0.5) - 0.25, SIZE, ps, pr, pg, pb);
}
if (hitWall && pSpeed > DEFAULT_SPEED * 1.1) {
@@ -1637,10 +1636,10 @@
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 --git a/src/abagames/util/Actor.d b/src/abagames/util/Actor.d
-index 63ad5ec..6326682 100644
---- a/src/abagames/util/Actor.d
-+++ b/src/abagames/util/Actor.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/Actor.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/Actor.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/Actor.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.util.Actor;
@@ -1650,10 +1649,10 @@
/**
* Actor in the game that has the interface to move and draw.
-diff --git a/src/abagames/util/Logger.d b/src/abagames/util/Logger.d
-index c158f2e..3cc2aaa 100644
---- a/src/abagames/util/Logger.d
-+++ b/src/abagames/util/Logger.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/Logger.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/Logger.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/Logger.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,28 +5,28 @@
*/
module abagames.util.Logger;
@@ -1688,10 +1687,10 @@
//if (e.next)
// error(e.next);
throw new Exception("Error: " ~ e.toString() ~ "\0");
-diff --git a/src/abagames/util/Rand.d b/src/abagames/util/Rand.d
-index cf615e6..ba5ed50 100644
---- a/src/abagames/util/Rand.d
-+++ b/src/abagames/util/Rand.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/Rand.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/Rand.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/Rand.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,8 +5,8 @@
*/
module abagames.util.Rand;
@@ -1703,7 +1702,7 @@
/**
* Random number generator.
-@@ -19,14 +19,14 @@ public class Rand {
+@@ -19,14 +19,14 @@
}
public int nextInt(int n) {
@@ -1721,10 +1720,10 @@
+ return (cast(float)(rand() % (n * 10000))) / 10000;
}
}
-diff --git a/src/abagames/util/Vector.d b/src/abagames/util/Vector.d
-index 882193c..bf3aca6 100644
---- a/src/abagames/util/Vector.d
-+++ b/src/abagames/util/Vector.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/Vector.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/Vector.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/Vector.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.util.Vector;
@@ -1734,7 +1733,7 @@
/**
* Vector.
-@@ -60,19 +60,19 @@ public class Vector {
+@@ -60,19 +60,19 @@
}
public int checkSide(Vector pos1, Vector pos2) {
@@ -1760,10 +1759,10 @@
}
}
}
-diff --git a/src/abagames/util/sdl/Input.d b/src/abagames/util/sdl/Input.d
-index 45f28b0..691911e 100644
---- a/src/abagames/util/sdl/Input.d
-+++ b/src/abagames/util/sdl/Input.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Input.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Input.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Input.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.util.sdl.Input;
@@ -1773,10 +1772,10 @@
import SDL;
import abagames.util.sdl.SDLInitFailedException;
-diff --git a/src/abagames/util/sdl/MainLoop.d b/src/abagames/util/sdl/MainLoop.d
-index 6133441..a559bd9 100644
---- a/src/abagames/util/sdl/MainLoop.d
-+++ b/src/abagames/util/sdl/MainLoop.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/MainLoop.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/MainLoop.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/MainLoop.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,8 +5,7 @@
*/
module abagames.util.sdl.MainLoop;
@@ -1787,7 +1786,7 @@
import SDL;
import abagames.util.Logger;
import abagames.util.Rand;
-@@ -88,7 +87,7 @@ public class MainLoop {
+@@ -88,7 +87,7 @@
done = 1;
nowTick = SDL_GetTicks();
@@ -1796,10 +1795,10 @@
if (frame <= 0) {
frame = 1;
SDL_Delay(prvTickCount+interval-nowTick);
-diff --git a/src/abagames/util/sdl/Screen3D.d b/src/abagames/util/sdl/Screen3D.d
-index b91b1df..198ce4c 100644
---- a/src/abagames/util/sdl/Screen3D.d
-+++ b/src/abagames/util/sdl/Screen3D.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Screen3D.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Screen3D.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Screen3D.d 2007-08-25 21:15:55.000000000 +0000
@@ -5,8 +5,8 @@
*/
module abagames.util.sdl.Screen3D;
@@ -1811,7 +1810,7 @@
import SDL;
import opengl;
import abagames.util.Logger;
-@@ -64,11 +64,11 @@ public class Screen3D: Screen {
+@@ -64,11 +64,11 @@
glViewport(0, 0, width, height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@@ -1826,10 +1825,10 @@
0.1f, farPlane);
glMatrixMode(GL_MODELVIEW);
}
-diff --git a/src/abagames/util/sdl/Sound.d b/src/abagames/util/sdl/Sound.d
-index 068b0b1..649d1e3 100644
---- a/src/abagames/util/sdl/Sound.d
-+++ b/src/abagames/util/sdl/Sound.d
+Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Sound.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d 2007-08-25 21:17:28.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.util.sdl.Sound;
@@ -1839,10 +1838,21 @@
import SDL;
import SDL_mixer;
import abagames.util.sdl.SDLInitFailedException;
-diff --git a/src/abagames/util/sdl/Texture.d b/src/abagames/util/sdl/Texture.d
-index cdf0474..a0b1707 100644
---- a/src/abagames/util/sdl/Texture.d
-+++ b/src/abagames/util/sdl/Texture.d
+@@ -17,8 +17,8 @@
+ public:
+ static bool noSound = false;
+ static int fadeOutSpeed = 1280;
+- static char[] soundsDir = "sounds/";
+- static char[] chunksDir = "sounds/";
++ static char[] soundsDir = "/usr/share/games/a7xpg/sounds/";
++ static char[] chunksDir = "/usr/share/games/a7xpg/sounds/";
+
+ public static void init() {
+ if (noSound) return;
+Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Texture.d
+===================================================================
+--- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Texture.d 2007-08-25 21:14:06.000000000 +0000
++++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Texture.d 2007-08-25 21:17:07.000000000 +0000
@@ -5,7 +5,7 @@
*/
module abagames.util.sdl.Texture;
@@ -1852,3 +1862,12 @@
import opengl;
import SDL;
import abagames.util.sdl.SDLInitFailedException;
+@@ -15,7 +15,7 @@
+ */
+ public class Texture {
+ public:
+- static char[] imagesDir = "images/";
++ static char[] imagesDir = "/usr/share/games/a7xpg/images/";
+
+ private:
+ GLuint num;
More information about the Pkg-games-commits
mailing list