shithub: choc

Download patch

ref: 2932aef2247dd4f6c654416e4272cfbf872401a1
parent: 1f19598df064341e8e92b70e466ca8b9f373b4a6
author: Simon Howard <[email protected]>
date: Tue Jan 27 16:45:52 EST 2009 

Don't align "colormaps" on a 256 byte boundary (fix for 64 bit)

Subversion-branch: /branches/raven-branch
Subversion-revision: 1434


--- a/src/heretic/r_data.c
+++ b/src/heretic/r_data.c
@@ -524,9 +524,8 @@
 // 256 byte align tables
 //
     lump = W_GetNumForName("COLORMAP");
-    length = W_LumpLength(lump) + 255;
+    length = W_LumpLength(lump);
     colormaps = Z_Malloc(length, PU_STATIC, 0);
-    colormaps = (byte *) (((int) colormaps + 255) & ~0xff);
     W_ReadLump(lump, colormaps);
 }
 
--- a/src/hexen/r_data.c
+++ b/src/hexen/r_data.c
@@ -499,9 +499,8 @@
 // 256 byte align tables
 //
     lump = W_GetNumForName("COLORMAP");
-    length = W_LumpLength(lump) + 255;
+    length = W_LumpLength(lump);
     colormaps = Z_Malloc(length, PU_STATIC, 0);
-    colormaps = (byte *) (((int) colormaps + 255) & ~0xff);
     W_ReadLump(lump, colormaps);
 }