summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2009-01-27 21:55:17 +0000
committerSimon Howard2009-01-27 21:55:17 +0000
commitd67c5cd7ae78261a730508bc5bb4ed78ccf6fa05 (patch)
tree471dad6e67a2007389c7f62455ff6cee587de71d
parent2932aef2247dd4f6c654416e4272cfbf872401a1 (diff)
downloadchocolate-doom-d67c5cd7ae78261a730508bc5bb4ed78ccf6fa05.tar.gz
chocolate-doom-d67c5cd7ae78261a730508bc5bb4ed78ccf6fa05.tar.bz2
chocolate-doom-d67c5cd7ae78261a730508bc5bb4ed78ccf6fa05.zip
Fix for R_InitTranslationTables to not align on a 256 byte boundary
(fixes 64 bit) Subversion-branch: /branches/raven-branch Subversion-revision: 1435
-rw-r--r--src/heretic/r_draw.c3
-rw-r--r--src/hexen/r_draw.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/heretic/r_draw.c b/src/heretic/r_draw.c
index f795b318..5a20b50a 100644
--- a/src/heretic/r_draw.c
+++ b/src/heretic/r_draw.c
@@ -244,8 +244,7 @@ void R_InitTranslationTables(void)
V_LoadTintTable();
// Allocate translation tables
- translationtables = Z_Malloc(256 * 3 + 255, PU_STATIC, 0);
- translationtables = (byte *) (((int) translationtables + 255) & ~255);
+ translationtables = Z_Malloc(256 * 3, PU_STATIC, 0);
// Fill out the translation tables
for (i = 0; i < 256; i++)
diff --git a/src/hexen/r_draw.c b/src/hexen/r_draw.c
index e606233d..a4bb2403 100644
--- a/src/hexen/r_draw.c
+++ b/src/hexen/r_draw.c
@@ -328,9 +328,7 @@ void R_InitTranslationTables(void)
V_LoadTintTable();
// Allocate translation tables
- translationtables = Z_Malloc(256 * 3 * (MAXPLAYERS - 1) + 255,
- PU_STATIC, 0);
- translationtables = (byte *) (((int) translationtables + 255) & ~255);
+ translationtables = Z_Malloc(256 * 3 * (MAXPLAYERS - 1), PU_STATIC, 0);
for (i = 0; i < 3 * (MAXPLAYERS - 1); i++)
{