From 2932aef2247dd4f6c654416e4272cfbf872401a1 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 27 Jan 2009 21:45:52 +0000
Subject: Don't align "colormaps" on a 256 byte boundary (fix for 64 bit)

Subversion-branch: /branches/raven-branch
Subversion-revision: 1434
---
 src/heretic/r_data.c | 3 +--
 src/hexen/r_data.c   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/heretic/r_data.c b/src/heretic/r_data.c
index 2192e8a6..9846196a 100644
--- a/src/heretic/r_data.c
+++ b/src/heretic/r_data.c
@@ -524,9 +524,8 @@ void R_InitColormaps(void)
 // 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);
 }
 
diff --git a/src/hexen/r_data.c b/src/hexen/r_data.c
index 3c2c652f..bd020073 100644
--- a/src/hexen/r_data.c
+++ b/src/hexen/r_data.c
@@ -499,9 +499,8 @@ void R_InitColormaps(void)
 // 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);
 }
 
-- 
cgit v1.2.3