diff options
| author | Simon Howard | 2009-01-27 21:45:52 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-01-27 21:45:52 +0000 |
| commit | 2932aef2247dd4f6c654416e4272cfbf872401a1 (patch) | |
| tree | 45028b0bc53cd8c7e41b8128c8ce9be3a86b2742 | |
| parent | 1f19598df064341e8e92b70e466ca8b9f373b4a6 (diff) | |
| download | chocolate-doom-2932aef2247dd4f6c654416e4272cfbf872401a1.tar.gz chocolate-doom-2932aef2247dd4f6c654416e4272cfbf872401a1.tar.bz2 chocolate-doom-2932aef2247dd4f6c654416e4272cfbf872401a1.zip | |
Don't align "colormaps" on a 256 byte boundary (fix for 64 bit)
Subversion-branch: /branches/raven-branch
Subversion-revision: 1434
| -rw-r--r-- | src/heretic/r_data.c | 3 | ||||
| -rw-r--r-- | 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); } |