summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authormycroft <mycroft>2002-08-22 04:18:43 +0000
committermycroft <mycroft>2002-08-22 04:18:43 +0000
commitc0a232a86f8ef90b474b02a025241dfca4d231a4 (patch)
treed90a4b911b75e117057098630a9a53cbde6b9abe /games
parenta961941a10b7e4faaf780fa6a0b0936b211bba0c (diff)
downloadpkgsrc-c0a232a86f8ef90b474b02a025241dfca4d231a4.tar.gz
Deal with some obvious pointer size issues that prevent xdoom even loading the
WAD file on LP64. Whether it works beyond that point now, I don't know.
Diffstat (limited to 'games')
-rw-r--r--games/xdoom/distinfo4
-rw-r--r--games/xdoom/patches/patch-ar65
2 files changed, 65 insertions, 4 deletions
diff --git a/games/xdoom/distinfo b/games/xdoom/distinfo
index 38b5dc48f07..d20149996f1 100644
--- a/games/xdoom/distinfo
+++ b/games/xdoom/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/19 14:49:47 mycroft Exp $
+$NetBSD: distinfo,v 1.6 2002/08/22 04:18:43 mycroft Exp $
SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99
Size (doomsrc.zip) = 362698 bytes
@@ -21,7 +21,7 @@ SHA1 (patch-an) = 2c146291dcacf250986a8a014dd1b0d69bb8f825
SHA1 (patch-ao) = b2d0ae80d2832c0aac89da1a078afedd7d97362d
SHA1 (patch-ap) = 14c78b5911fda030aa6d89426632ee0b42c4da96
SHA1 (patch-aq) = 83b21a11e8007ea04fbedf10330887469b48dbab
-SHA1 (patch-ar) = 25e47aa4b31ef3a429f31607ea79b6710d34234a
+SHA1 (patch-ar) = 9f7285b05baf484f6546cc6678088e02cd0ff7ea
SHA1 (patch-as) = 8d56b0a78a6cedb3b1ad63d9418081fb0277cf3d
SHA1 (patch-at) = 96e5a88b7f250c35b148353d77eb6e598e35c661
SHA1 (patch-au) = ce66a255347aa3ec6ec0c7826e352e5b53a0e69d
diff --git a/games/xdoom/patches/patch-ar b/games/xdoom/patches/patch-ar
index d3d63b3f9a9..6cd794d3e71 100644
--- a/games/xdoom/patches/patch-ar
+++ b/games/xdoom/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.1 2000/02/03 16:01:15 abs Exp $
+$NetBSD: patch-ar,v 1.2 2002/08/22 04:18:44 mycroft Exp $
--- linuxdoom-1.10/r_data.c.orig Mon Dec 22 20:57:47 1997
-+++ linuxdoom-1.10/r_data.c Thu Feb 3 01:34:00 2000
++++ linuxdoom-1.10/r_data.c Mon Aug 22 04:13:08 2022
@@ -84,10 +84,10 @@
typedef struct
{
@@ -15,3 +15,64 @@ $NetBSD: patch-ar,v 1.1 2000/02/03 16:01:15 abs Exp $
short patchcount;
mappatch_t patches[1];
} maptexture_t;
+@@ -479,13 +479,13 @@
+ }
+ numtextures = numtextures1 + numtextures2;
+
+- textures = Z_Malloc (numtextures*4, PU_STATIC, 0);
+- texturecolumnlump = Z_Malloc (numtextures*4, PU_STATIC, 0);
+- texturecolumnofs = Z_Malloc (numtextures*4, PU_STATIC, 0);
+- texturecomposite = Z_Malloc (numtextures*4, PU_STATIC, 0);
+- texturecompositesize = Z_Malloc (numtextures*4, PU_STATIC, 0);
+- texturewidthmask = Z_Malloc (numtextures*4, PU_STATIC, 0);
+- textureheight = Z_Malloc (numtextures*4, PU_STATIC, 0);
++ textures = Z_Malloc (numtextures*sizeof(*textures), PU_STATIC, 0);
++ texturecolumnlump = Z_Malloc (numtextures*sizeof(*texturecolumnlump), PU_STATIC, 0);
++ texturecolumnofs = Z_Malloc (numtextures*sizeof(*texturecolumnofs), PU_STATIC, 0);
++ texturecomposite = Z_Malloc (numtextures*sizeof(*texturecomposite), PU_STATIC, 0);
++ texturecompositesize = Z_Malloc (numtextures*sizeof(*texturecompositesize), PU_STATIC, 0);
++ texturewidthmask = Z_Malloc (numtextures*sizeof(*texturewidthmask), PU_STATIC, 0);
++ textureheight = Z_Malloc (numtextures*sizeof(*textureheight), PU_STATIC, 0);
+
+ totalwidth = 0;
+
+@@ -567,7 +567,7 @@
+ R_GenerateLookup (i);
+
+ // Create translation table for global animation.
+- texturetranslation = Z_Malloc ((numtextures+1)*4, PU_STATIC, 0);
++ texturetranslation = Z_Malloc ((numtextures+1)*sizeof(*texturetranslation), PU_STATIC, 0);
+
+ for (i=0 ; i<numtextures ; i++)
+ texturetranslation[i] = i;
+@@ -587,7 +587,7 @@
+ numflats = lastflat - firstflat + 1;
+
+ // Create translation table for global animation.
+- flattranslation = Z_Malloc ((numflats+1)*4, PU_STATIC, 0);
++ flattranslation = Z_Malloc ((numflats+1)*sizeof(*flattranslation), PU_STATIC, 0);
+
+ for (i=0 ; i<numflats ; i++)
+ flattranslation[i] = i;
+@@ -609,9 +609,9 @@
+ lastspritelump = W_GetNumForName ("S_END") - 1;
+
+ numspritelumps = lastspritelump - firstspritelump + 1;
+- spritewidth = Z_Malloc (numspritelumps*4, PU_STATIC, 0);
+- spriteoffset = Z_Malloc (numspritelumps*4, PU_STATIC, 0);
+- spritetopoffset = Z_Malloc (numspritelumps*4, PU_STATIC, 0);
++ spritewidth = Z_Malloc (numspritelumps*sizeof(*spritewidth), PU_STATIC, 0);
++ spriteoffset = Z_Malloc (numspritelumps*sizeof(*spriteoffset), PU_STATIC, 0);
++ spritetopoffset = Z_Malloc (numspritelumps*sizeof(*spritetopoffset), PU_STATIC, 0);
+
+ for (i=0 ; i< numspritelumps ; i++)
+ {
+@@ -639,7 +639,7 @@
+ lump = W_GetNumForName("COLORMAP");
+ length = W_LumpLength (lump) + 255;
+ colormaps = Z_Malloc (length, PU_STATIC, 0);
+- colormaps = (byte *)( ((int)colormaps + 255)&~0xff);
++ colormaps = (byte *)( ((long)colormaps + 255)&~0xff);
+ W_ReadLump (lump,colormaps);
+ }
+