# Copyright (C) 2007 Marcel Unbehaun <frostworks@gmx.de>
# Distributed under the same license as the game. See debian/copyright.
Index: torus-trooper-0.22.dfsg1/import/SDL.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/import/SDL.d 2004-11-10 23:45:22.000000000 +0100
+++ torus-trooper-0.22.dfsg1/import/SDL.d 2012-03-29 22:04:24.516751384 +0200
@@ -20,18 +20,28 @@
slouken@devolution.com
*/
-import SDL_types;
-import SDL_getenv;
-import SDL_error;
-import SDL_rwops;
-import SDL_timer;
-import SDL_audio;
-import SDL_cdrom;
-import SDL_joystick;
-import SDL_events;
-import SDL_video;
-import SDL_byteorder;
-import SDL_Version;
+public import SDL_Keysym;
+public import SDL_Version;
+public import SDL_active;
+public import SDL_audio;
+public import SDL_byteorder;
+public import SDL_cdrom;
+public import SDL_copying;
+public import SDL_endian;
+public import SDL_error;
+public import SDL_events;
+public import SDL_getenv;
+public import SDL_joystick;
+public import SDL_keyboard;
+public import SDL_mouse;
+public import SDL_mutex;
+public import SDL_quit;
+public import SDL_rwops;
+public import SDL_syswm;
+public import SDL_thread;
+public import SDL_timer;
+public import SDL_types;
+public import SDL_video;
extern(C):
@@ -73,20 +83,3 @@
*/
void SDL_Quit();
-/+
-void SDL_SetModuleHandle(void *hInst);
-extern(Windows) void* GetModuleHandle(char*);
-
-static this()
-{
- /* Load SDL dynamic link library */
- if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0)
- throw new Error("Error loading SDL");
- SDL_SetModuleHandle(GetModuleHandle(null));
-}
-
-static ~this()
-{
- SDL_Quit();
-}
-+/
Index: torus-trooper-0.22.dfsg1/import/SDL_events.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/import/SDL_events.d 2005-01-01 22:40:28.000000000 +0100
+++ torus-trooper-0.22.dfsg1/import/SDL_events.d 2012-03-29 22:04:24.516751384 +0200
@@ -304,8 +304,8 @@
If 'state' is set to SDL_QUERY, SDL_EventState() will return the
current processing state of the specified event.
*/
-const uint SDL_QUERY = cast(uint) -1;
-const uint SDL_IGNORE = 0;
-const uint SDL_DISABLE = 0;
-const uint SDL_ENABLE = 1;
+const int SDL_QUERY = -1;
+const int SDL_IGNORE = 0;
+const int SDL_DISABLE = 0;
+const int SDL_ENABLE = 1;
Uint8 SDL_EventState(Uint8 type, int state);
Index: torus-trooper-0.22.dfsg1/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ torus-trooper-0.22.dfsg1/Makefile 2012-03-29 22:04:24.516751384 +0200
@@ -0,0 +1,31 @@
+SOURCES=src/abagames/tt/camera.d src/abagames/tt/boot.d\
+ src/abagames/tt/barrage.d src/abagames/tt/bullettarget.d\
+ src/abagames/tt/replay.d src/abagames/tt/shape.d \
+ src/abagames/tt/ship.d src/abagames/tt/particle.d\
+ src/abagames/tt/tunnel.d src/abagames/tt/enemy.d src/abagames/tt/bulletactor.d\
+ src/abagames/tt/gamemanager.d src/abagames/tt/screen.d src/abagames/tt/title.d\
+ src/abagames/tt/stagemanager.d src/abagames/tt/bulletactorpool.d\
+ src/abagames/tt/shot.d src/abagames/tt/prefmanager.d\
+ src/abagames/tt/bulletimpl.d src/abagames/tt/letter.d\
+ src/abagames/tt/soundmanager.d src/abagames/tt/floatletter.d\
+ src/abagames/util/actor.d src/abagames/util/rand.d\
+ src/abagames/util/sdl/input.d src/abagames/util/sdl/sound.d\
+ src/abagames/util/sdl/pad.d src/abagames/util/sdl/screen3d.d\
+ src/abagames/util/sdl/mainloop.d src/abagames/util/sdl/gamemanager.d\
+ src/abagames/util/sdl/screen.d src/abagames/util/sdl/recordablepad.d\
+ src/abagames/util/sdl/luminous.d src/abagames/util/sdl/sdlexception.d\
+ src/abagames/util/sdl/displaylist.d src/abagames/util/sdl/texture.d\
+ src/abagames/util/iterator.d src/abagames/util/bulletml/bullet.d\
+ src/abagames/util/bulletml/bulletsmanager.d src/abagames/util/tokenizer.d\
+ src/abagames/util/prefmanager.d src/abagames/util/vector.d\
+ src/abagames/util/logger.d import/SDL_video.d import/SDL_mixer.d
+OBJS=$(SOURCES:.d=.o)
+EXE=torus-trooper
+
+all: $(EXE)
+
+$(EXE): $(OBJS)
+ gdc-v1 -o $@ $(OBJS) -lbulletml -lSDL -lGL -lGLU -lSDL_mixer
+
+$(OBJS): %.o: %.d
+ gdc-v1 -c -o $@ -Iimport -Isrc $(DFLAGS) $<
Index: torus-trooper-0.22.dfsg1/src/abagames/util/logger.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/logger.d 2004-11-10 23:45:22.000000000 +0100
+++ torus-trooper-0.22.dfsg1/src/abagames/util/logger.d 2012-03-29 22:04:24.516751384 +0200
@@ -5,7 +5,7 @@
*/
module abagames.util.logger;
-private import std.stream;
+private import std.cstream;
private import std.string;
/**
@@ -56,28 +56,28 @@
public static void info(char[] msg, bool nline = true) {
if (nline)
- stderr.writeLine(msg);
+ derr.writeLine(msg);
else
- stderr.writeString(msg);
+ derr.writeString(msg);
}
public static void info(double n, bool nline = true) {
if (nline)
- stderr.writeLine(std.string.toString(n));
+ derr.writeLine(std.string.toString(n));
else
- stderr.writeString(std.string.toString(n) ~ " ");
+ derr.writeString(std.string.toString(n) ~ " ");
}
public static void error(char[] msg) {
- stderr.writeLine("Error: " ~ msg);
+ derr.writeLine("Error: " ~ msg);
}
public static void error(Exception e) {
- stderr.writeLine("Error: " ~ e.toString());
+ derr.writeLine("Error: " ~ e.toString());
}
public static void error(Error e) {
- stderr.writeLine("Error: " ~ e.toString());
+ derr.writeLine("Error: " ~ e.toString());
if (e.next)
error(e.next);
}
Index: torus-trooper-0.22.dfsg1/src/abagames/util/sdl/luminous.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/sdl/luminous.d 2005-01-01 22:40:28.000000000 +0100
+++ torus-trooper-0.22.dfsg1/src/abagames/util/sdl/luminous.d 2012-03-29 22:04:24.516751384 +0200
@@ -9,6 +9,7 @@
private import std.string;
private import opengl;
private import abagames.util.actor;
+import std.c.string;
/**
* Luminous effect texture.
@@ -30,7 +31,7 @@
}
private void makeLuminousTexture() {
- uint *data = td;
+ uint *data = td.ptr;
int i;
memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);
glGenTextures(1, &luminousTexture);
Index: torus-trooper-0.22.dfsg1/src/abagames/tt/barrage.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/barrage.d 2005-01-01 22:40:28.000000000 +0100
+++ torus-trooper-0.22.dfsg1/src/abagames/tt/barrage.d 2012-03-29 22:04:24.516751384 +0200
@@ -98,6 +98,7 @@
public static void load() {
char[][] dirs = listdir(BARRAGE_DIR_NAME);
foreach (char[] dirName; dirs) {
+ parser[dirName] = null;
char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
foreach (char[] fileName; files) {
if (getExt(fileName) != "xml")
Index: torus-trooper-0.22.dfsg1/src/abagames/tt/camera.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/camera.d 2005-01-09 13:50:00.000000000 +0100
+++ torus-trooper-0.22.dfsg1/src/abagames/tt/camera.d 2012-03-29 22:04:24.516751384 +0200
@@ -155,10 +155,10 @@
moveCnt--;
if (moveCnt < 0) {
moveCnt = 15 + rand.nextInt(15);
- float lox = fabs(_lookAtPos.x - _cameraPos.x);
- if (lox > PI)
- lox = PI * 2 - lox;
- float ofs = lox * 3 + fabs(_lookAtPos.y - _cameraPos.y);
+ float newlox = fabs(_lookAtPos.x - _cameraPos.x);
+ if (newlox > PI)
+ newlox = PI * 2 - newlox;
+ float ofs = newlox * 3 + fabs(_lookAtPos.y - _cameraPos.y);
zoomTrg = 3.0f / ofs;
if (zoomTrg < zoomMin)
zoomTrg = zoomMin;
Index: torus-trooper-0.22.dfsg1/src/abagames/tt/shape.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/shape.d 2004-11-13 00:46:02.000000000 +0100
+++ torus-trooper-0.22.dfsg1/src/abagames/tt/shape.d 2012-03-29 22:04:24.516751384 +0200
@@ -248,21 +248,23 @@
float wingD1, float wingD2, int color, int shp, int divNum,
int rev, bool damaged = false) {
Structure[] sts;
- Structure st = new Structure;
- st.pos.x = ox;
- st.pos.y = oy;
- st.d1 = st.d2 = 0;
- st.width = rocketLength * 0.15;
- st.height = rocketLength;
- st.shape = Structure.Shape.ROCKET;
- st.shapeXReverse = 1;
- if (!damaged)
- st.color = 1;
- else
- st.color = 0;
- if (rev == -1)
- st.pos.x *= -1;
- sts ~= st;
+ {
+ Structure st = new Structure;
+ st.pos.x = ox;
+ st.pos.y = oy;
+ st.d1 = st.d2 = 0;
+ st.width = rocketLength * 0.15;
+ st.height = rocketLength;
+ st.shape = Structure.Shape.ROCKET;
+ st.shapeXReverse = 1;
+ if (!damaged)
+ st.color = 1;
+ else
+ st.color = 0;
+ if (rev == -1)
+ st.pos.x *= -1;
+ sts ~= st;
+ }
float wofs = offset;
float whgt = rocketLength * (rand.nextFloat(0.5) + 1.5);
for (int i = 0; i < wingNum; i++) {
Index: torus-trooper-0.22.dfsg1/src/abagames/util/rand.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/rand.d 2005-01-01 22:40:28.000000000 +0100
+++ torus-trooper-0.22.dfsg1/src/abagames/util/rand.d 2012-03-29 22:04:24.516751384 +0200
@@ -165,14 +165,14 @@
void next_state()
{
- uint *p=state;
+ uint *p=state.ptr;
/* if init_genrand() has not been called, */
/* a default initial seed is used */
if (initf==0) init_genrand(5489UL);
left = N;
- next = state;
+ next = state.ptr;
for (int j=N-M+1; --j; p++)
*p = p[M] ^ TWIST(p[0], p[1]);
Index: torus-trooper-0.22.dfsg1/import/opengl.d
===================================================================
--- torus-trooper-0.22.dfsg1.orig/import/opengl.d 2004-11-10 23:45:22.000000000 +0100
+++ torus-trooper-0.22.dfsg1/import/opengl.d 2012-03-29 22:04:24.520751384 +0200
@@ -1116,7 +1116,7 @@
/*************************************************************/
void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
-void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref);
+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_);
GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
void /*APIENTRY*/glArrayElement (GLint i);
void /*APIENTRY*/glBegin (GLenum mode);
@@ -1369,7 +1369,7 @@
void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer);
void /*APIENTRY*/glShadeModel (GLenum mode);
-void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask);
+void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask);
void /*APIENTRY*/glStencilMask (GLuint mask);
void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
void /*APIENTRY*/glTexCoord1d (GLdouble s);
Index: torus-trooper-0.22.dfsg1/Makefile.pure
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ torus-trooper-0.22.dfsg1/Makefile.pure 2012-03-29 22:04:37.796751719 +0200
@@ -0,0 +1,35 @@
+SOURCES= src-hiz/abagames/tt/crystal.d src-hiz/abagames/tt/shape.d src-hiz/abagames/tt/camera.d src-hiz/abagames/tt/boot.d\
+ src-hiz/abagames/tt/barrage.d \
+ src-hiz/abagames/tt/bullettarget.d\
+ src-hiz/abagames/tt/replay.d src-hiz/abagames/tt/ship.d\
+ src-hiz/abagames/tt/particle.d src-hiz/abagames/tt/tunnel.d\
+ src-hiz/abagames/tt/enemy.d src-hiz/abagames/tt/bulletactor.d\
+ src-hiz/abagames/tt/gamemanager.d src-hiz/abagames/tt/screen.d\
+ src-hiz/abagames/tt/title.d src-hiz/abagames/tt/stagemanager.d\
+ src-hiz/abagames/tt/bulletactorpool.d src-hiz/abagames/tt/shot.d\
+ src-hiz/abagames/tt/prefmanager.d src-hiz/abagames/tt/bulletimpl.d\
+ src-hiz/abagames/tt/letter.d src-hiz/abagames/tt/soundmanager.d\
+ src-hiz/abagames/tt/floatletter.d \
+ \
+ src-hiz/abagames/util/actor.d src-hiz/abagames/util/rand.d\
+ src-hiz/abagames/util/sdl/input.d src-hiz/abagames/util/sdl/sound.d\
+ src-hiz/abagames/util/sdl/pad.d src-hiz/abagames/util/sdl/screen3d.d\
+ src-hiz/abagames/util/sdl/mainloop.d src-hiz/abagames/util/sdl/gamemanager.d\
+ src-hiz/abagames/util/sdl/screen.d src-hiz/abagames/util/sdl/recordablepad.d\
+ src-hiz/abagames/util/sdl/luminous.d src-hiz/abagames/util/sdl/sdlexception.d\
+ src-hiz/abagames/util/sdl/displaylist.d src-hiz/abagames/util/sdl/texture.d\
+ src-hiz/abagames/util/iterator.d src-hiz/abagames/util/bulletml/bullet.d\
+ src-hiz/abagames/util/bulletml/bulletsmanager.d\
+ src-hiz/abagames/util/tokenizer.d src-hiz/abagames/util/prefmanager.d\
+ src-hiz/abagames/util/vector.d src-hiz/abagames/util/logger.d\
+ import/SDL_video.d import/SDL_mixer.d
+OBJS=$(SOURCES:.d=.o)
+EXE=torus-trooper-pure
+
+all: $(EXE)
+
+$(EXE): $(OBJS)
+ gdc-v1 -o $@ $(OBJS) -lbulletml -lSDL -lGL -lGLU -lSDL_mixer
+
+$(OBJS): %.o: %.d
+ gdc-v1 -c -o $@ -Iimport -Isrc-hiz -fversion=pure $(DFLAGS) $<
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)