diff options
Diffstat (limited to 'games-fps/wolfgl/files')
| -rw-r--r-- | games-fps/wolfgl/files/0.93-gcc.patch | 212 | ||||
| -rw-r--r-- | games-fps/wolfgl/files/0.93-gcc4.patch | 80 | ||||
| -rw-r--r-- | games-fps/wolfgl/files/0.93-sample-rate.patch | 11 | ||||
| -rw-r--r-- | games-fps/wolfgl/files/0.93-sprite.patch | 82 | ||||
| -rw-r--r-- | games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch | 11 |
5 files changed, 396 insertions, 0 deletions
diff --git a/games-fps/wolfgl/files/0.93-gcc.patch b/games-fps/wolfgl/files/0.93-gcc.patch new file mode 100644 index 000000000000..3789aa2e255d --- /dev/null +++ b/games-fps/wolfgl/files/0.93-gcc.patch @@ -0,0 +1,212 @@ +diff -abur common/console.c common/console.c +--- common/console.c 2000-09-27 16:19:44.000000000 +0200 ++++ common/console.c 2003-09-11 19:59:46.037562040 +0200 +@@ -3,6 +3,14 @@ + #include "id_us.h" + #include "console.h" + ++#ifdef _LINUX ++#include <string.h> ++#endif ++ ++#ifdef _LINUX ++#include <string.h> ++#endif ++ + static char con_lines[32][45]; // buffer + static int con_active; // console is visible + static int con_current; // current line +Only in common: console.c.orig +diff -abur common/id_in.h common/id_in.h +--- common/id_in.h 2000-09-27 16:04:26.000000000 +0200 ++++ common/id_in.h 2003-09-11 19:32:14.368653880 +0200 +@@ -178,6 +178,7 @@ + + void IN_Startup(); + void IN_Shutdown(); ++void IN_KeyEvent(unsigned char key); + void IN_Default(wbool gotit, ControlType in); + void IN_ClearKeysDown(); + void IN_ReadControl(int player, ControlInfo *info); +Only in common: id_in.h.rej +diff -abur common/id_vh.c common/id_vh.c +--- common/id_vh.c 2000-09-26 17:39:36.000000000 +0200 ++++ common/id_vh.c 2003-09-11 19:24:57.183116184 +0200 +@@ -230,3 +230,4 @@ + + } + */ +\ No newline at end of file ++ +Only in common: id_vh.c.rej +diff -abur common/opengl.c common/opengl.c +--- common/opengl.c 2000-09-27 16:04:26.000000000 +0200 ++++ common/opengl.c 2003-09-11 19:22:35.622636648 +0200 +@@ -1,5 +1,10 @@ + #include <stdio.h> + #include <stdlib.h> ++ ++#ifdef _LINUX ++#include <string.h> ++#endif ++ + #include "system.h" + #include "opengl.h" + #include "wl_def.h" +diff -abur common/wl_act2.c common/wl_act2.c +--- common/wl_act2.c 2000-09-27 16:04:26.000000000 +0200 ++++ common/wl_act2.c 2003-09-11 19:19:45.511497472 +0200 +@@ -1,5 +1,9 @@ + // WL_ACT2.C + ++#ifdef _LINUX ++#include <stdlib.h> ++#endif ++ + #include "wl_def.h" + + //============================================================================= +diff -abur common/wl_agent.c common/wl_agent.c +--- common/wl_agent.c 2003-09-11 20:04:40.738760648 +0200 ++++ common/wl_agent.c 2003-09-11 19:57:06.860760592 +0200 +@@ -3,6 +3,10 @@ + #include <string.h> + #include "wl_def.h" + ++#ifdef _LINUX ++#include <stdlib.h> ++#endif ++ + //============================================================================= + // LOCAL CONSTANTS + //============================================================================= +diff -abur common/wl_draw.c common/wl_draw.c +--- common/wl_draw.c 2003-09-11 20:04:40.739760496 +0200 ++++ common/wl_draw.c 2003-09-11 19:20:33.512200256 +0200 +@@ -2,6 +2,11 @@ + + #include <stdio.h> + #include <stdlib.h> ++ ++#ifdef _LINUX ++#include <string.h> ++#endif ++ + #include "system.h" + #include "opengl.h" + #include "wl_def.h" +diff -abur common/wl_menu.c common/wl_menu.c +--- common/wl_menu.c 2000-09-27 16:04:27.000000000 +0200 ++++ common/wl_menu.c 2003-09-11 20:07:38.892677136 +0200 +@@ -5,6 +5,10 @@ + // + //////////////////////////////////////////////////////////////////// + ++#ifdef _LINUX ++#include "../linux/input.h" ++#endif ++ + #include <string.h> + #include "opengl.h" + #include "wl_def.h" +diff -abur common/wl_menu.h common/wl_menu.h +--- common/wl_menu.h 2000-09-26 17:38:31.000000000 +0200 ++++ common/wl_menu.h 2003-09-11 18:31:41.593919584 +0200 +@@ -233,3 +233,4 @@ + void NonShareware(); + /*int GetYorN(int x,int y,int pic); + */ +\ No newline at end of file ++ +diff -abur common/wl_play.c common/wl_play.c +--- common/wl_play.c 2000-09-27 16:04:27.000000000 +0200 ++++ common/wl_play.c 2003-09-11 19:40:31.293109880 +0200 +@@ -1,6 +1,11 @@ + // WL_PLAY.C + + #include <memory.h> ++ ++#ifdef _LINUX ++#include "../linux/input.h" ++#endif ++ + #include "wl_def.h" + #include "system.h" + +diff -abur common/wl_state.c common/wl_state.c +--- common/wl_state.c 2000-09-27 16:04:27.000000000 +0200 ++++ common/wl_state.c 2003-09-11 19:23:26.895841936 +0200 +@@ -2,6 +2,10 @@ + + #include "wl_def.h" + ++#ifdef _LINUX ++#include <stdlib.h> ++#endif ++ + //============================================================================= + // GLOBAL VARIABLES + //============================================================================= +diff -abur common/wl_text.c common/wl_text.c +--- common/wl_text.c 2000-09-26 17:40:23.000000000 +0200 ++++ common/wl_text.c 2003-09-11 19:19:00.110399488 +0200 +@@ -4,6 +4,10 @@ + #include "wl_def.h" + #include "system.h" + ++#ifdef _LINUX ++#include <string.h> ++#endif ++ + #ifndef SPEAR + + void FreeMusic(); // WL_MENU.C +diff -abur linux/sound.c linux/sound.c +--- linux/sound.c 2000-09-26 17:57:48.000000000 +0200 ++++ linux/sound.c 2003-09-11 19:55:16.702507192 +0200 +@@ -9,6 +9,8 @@ + #include <stdlib.h> + + #include <sys/time.h> ++#include <string.h> ++#include <errno.h> + + #include <fcntl.h> + #include <unistd.h> +diff -abur linux/sound.h linux/sound.h +--- linux/sound.h 2000-09-26 17:57:48.000000000 +0200 ++++ linux/sound.h 2003-09-11 19:44:03.663824624 +0200 +@@ -1,5 +1,8 @@ + void S_LoadSound(int id, void* data, long length); + void S_PlaySound(int id, int pan); ++void S_UpdateSound(); ++void S_InitSound(); ++void S_ShutDownSound(); + + extern int DigitalDevice; + +diff -abur linux/system.c linux/system.c +--- linux/system.c 2000-09-26 17:57:48.000000000 +0200 ++++ linux/system.c 2003-09-11 19:42:14.955350824 +0200 +@@ -1,9 +1,12 @@ + #include <stdio.h> ++#include <string.h> ++#include <unistd.h> + #include <sys/time.h> + #include <X11/keysym.h> + #include <GL/gl.h> + #include <GL/glx.h> + #include "wl_def.h" ++#include "sound.h" + + int screen_width, screen_height; + Display *dpy; +@@ -117,7 +120,7 @@ + visinfo = glXChooseVisual( dpy, scrnum, attrib ); + if (!visinfo) { + printf("Error: couldn't get an RGB, Double-buffered visual\n"); +- exit(1); ++ _exit(1); + } + + /* window attributes */ diff --git a/games-fps/wolfgl/files/0.93-gcc4.patch b/games-fps/wolfgl/files/0.93-gcc4.patch new file mode 100644 index 000000000000..5dcccd76049b --- /dev/null +++ b/games-fps/wolfgl/files/0.93-gcc4.patch @@ -0,0 +1,80 @@ +diff -ur wolfgl-0.93-orig/common/id_ca.c wolfgl-0.93/common/id_ca.c +--- wolfgl-0.93-orig/common/id_ca.c 2006-01-28 16:59:10.000000000 -0500 ++++ wolfgl-0.93/common/id_ca.c 2006-01-28 17:04:26.000000000 -0500 +@@ -252,6 +252,7 @@ + { + unsigned short ch,chhigh,count,offset; + unsigned short *copyptr, *inptr, *outptr; ++ unsigned char *uc_inptr; + + length/=2; + +@@ -268,13 +269,17 @@ + if (!count) + { + // have to insert a word containing the tag byte +- ch |= *((unsigned char*)inptr)++; ++ uc_inptr = (unsigned char*)inptr; ++ ch |= *(uc_inptr)++; ++ inptr = (unsigned short *)uc_inptr; + *outptr++ = ch; + length--; + } + else + { +- offset = *((unsigned char*)inptr)++; ++ uc_inptr = (unsigned char*)inptr; ++ offset = *(uc_inptr)++; ++ inptr = (unsigned short *)uc_inptr; + copyptr = outptr - offset; + length -= count; + while (count--) +@@ -287,7 +292,9 @@ + if (!count) + { + // have to insert a word containing the tag byte +- ch |= *((unsigned char*)inptr)++; ++ uc_inptr = (unsigned char*)inptr; ++ ch |= *(uc_inptr)++; ++ inptr = (unsigned short *)uc_inptr; + *outptr++ = ch; + length --; + } +@@ -806,7 +813,7 @@ + + for (i=0;i<NUMCHUNKS;i++) + if (grsegs[i]) +- MM_SetPurge (&(memptr)grsegs[i],3); ++ MM_SetPurge ((memptr)&grsegs[i],3); + ca_levelbit<<=1; + ca_levelnum++; + } +@@ -862,7 +869,7 @@ + + for (i = 0; i < NUMCHUNKS; i++) + if (grsegs[i]) +- MM_SetPurge (&(memptr)grsegs[i],3); ++ MM_SetPurge ((memptr)&grsegs[i],3); + } + + //=========================================================================== +diff -ur wolfgl-0.93-orig/common/wl_game.c wolfgl-0.93/common/wl_game.c +--- wolfgl-0.93-orig/common/wl_game.c 2006-01-28 16:59:10.000000000 -0500 ++++ wolfgl-0.93/common/wl_game.c 2006-01-28 17:07:08.000000000 -0500 +@@ -545,13 +545,13 @@ + { + // solid wall + tilemap[x][y] = tile; +- (unsigned short)actorat[x][y] = tile; ++ actorat[x][y] = tile; + } + else + { + // area floor + tilemap[x][y] = 0; +- (unsigned short)actorat[x][y] = 0; ++ actorat[x][y] = 0; + } + } + + diff --git a/games-fps/wolfgl/files/0.93-sample-rate.patch b/games-fps/wolfgl/files/0.93-sample-rate.patch new file mode 100644 index 000000000000..4beb8886355d --- /dev/null +++ b/games-fps/wolfgl/files/0.93-sample-rate.patch @@ -0,0 +1,11 @@ +--- linux/sound.c.orig 2003-09-11 20:28:32.032170976 +0200 ++++ linux/sound.c 2003-09-11 20:28:45.111182664 +0200 +@@ -64,7 +64,7 @@ + #define BUFMUL 4 + #define MIXBUFFERSIZE (SAMPLECOUNT*BUFMUL) + +-#define SAMPLERATE 11025 // Hz ++#define SAMPLERATE 8000 // Hz + #define SAMPLESIZE 2 // 16bit + + // The actual output device. diff --git a/games-fps/wolfgl/files/0.93-sprite.patch b/games-fps/wolfgl/files/0.93-sprite.patch new file mode 100644 index 000000000000..0ba91fc76a24 --- /dev/null +++ b/games-fps/wolfgl/files/0.93-sprite.patch @@ -0,0 +1,82 @@ +--- common/wl_agent.c.orig 2003-09-11 20:39:02.674298800 +0200 ++++ common/wl_agent.c 2003-09-11 20:42:17.229721880 +0200 +@@ -919,32 +919,31 @@ + viewdist = 0x7fffffffl; + closest = NULL; + +-// while (1) ++ while (1) + { + oldclosest = closest; + + for (check=ob->next ; check ; check=check->next) + if ((check->flags & FL_SHOOTABLE) +- //&& ++ && + // (check->flags & FL_VISABLE) && +-// (abs(check->viewx - centerx) < shootdelta) ++ (abs(check->viewx - centerx) < shootdelta) + ) +-// { ++ { + if (CheckLine(check)) +-// if (check->transx < viewdist) ++ if (check->transx < viewdist) + { +-// viewdist = check->transx; ++ viewdist = check->transx; + closest = check; +- break; + } +-// } ++ } + + if (closest == oldclosest) + return; // no more targets, all missed + + // trace a line from player to enemey +-// if (CheckLine(closest)) +-// break; ++ if (CheckLine(closest)) ++ break; + } + + // hit something +--- common/wl_draw.c.orig 2003-09-11 20:43:26.473195272 +0200 ++++ common/wl_draw.c 2003-09-11 20:46:57.859059736 +0200 +@@ -877,7 +877,7 @@ + tilespot = &tilemap[0][0]+spotloc; + + // could be in any of the nine surrounding tiles +- if ((*visspot) || ++ if (1 || (*visspot) || + (*(visspot-1) && !*(tilespot-1)) || + (*(visspot+1) && !*(tilespot+1)) || + (*(visspot-65) && !*(tilespot-65)) || +@@ -980,6 +980,8 @@ + + for (obj = player->next; obj; obj = obj->next) + { ++ int sprite; ++ + if (!areabyplayer[obj->areanumber]) + continue; + if (!gamestates[obj->state].shapenum) +@@ -989,10 +991,14 @@ + glTranslated((float)obj->x/(1<<16), (float)obj->y/(1<<16), 0); + glRotated(-player->angle, 0,0,1); + +- if (texture_index[PMSpriteStart+gamestates[obj->state].shapenum] == 0) +- CreateSprite(PMSpriteStart+gamestates[obj->state].shapenum); ++ sprite = gamestates[obj->state].shapenum; ++ if (gamestates[obj->state].rotate) ++ sprite += CalcRotate(obj); ++ ++ if (texture_index[PMSpriteStart+sprite] == 0) ++ CreateSprite(PMSpriteStart+sprite); + else +- glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+gamestates[obj->state].shapenum]); ++ glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+sprite]); + + glBegin(GL_QUADS); + glTexCoord2f(0,0); diff --git a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch b/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch new file mode 100644 index 000000000000..6916df70bcc4 --- /dev/null +++ b/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch @@ -0,0 +1,11 @@ +--- linux/Makefile.old 2009-02-06 14:27:11.000000000 +0100 ++++ linux/Makefile 2009-02-06 14:27:40.000000000 +0100 +@@ -19,7 +19,7 @@ + @echo 'Do not call this file directly' + + wolfgl: $(LINUX_OBJS) $(COMMON_OBJS) +- $(CC) $(LINK_FLAGS) $(COMMON_OBJS) $(LINUX_OBJS) -o $(OUTDIR)/wolfgl ++ $(CC) $(LDFLAGS) $(COMMON_OBJS) $(LINUX_OBJS) $(LINK_FLAGS) -o $(OUTDIR)/wolfgl + + # common directory + |