summaryrefslogtreecommitdiff
path: root/src/strife/r_draw.c
diff options
context:
space:
mode:
authorJames Haley2011-02-14 04:23:39 +0000
committerJames Haley2011-02-14 04:23:39 +0000
commit9e13008481a526eca87ca480bf6bc52b0f31e795 (patch)
tree4ff35c15266418df00ea3f1b646fa62a6a29d434 /src/strife/r_draw.c
parent63903f9aac430d321a3063fbc79d61ccae6db22e (diff)
downloadchocolate-doom-9e13008481a526eca87ca480bf6bc52b0f31e795.tar.gz
chocolate-doom-9e13008481a526eca87ca480bf6bc52b0f31e795.tar.bz2
chocolate-doom-9e13008481a526eca87ca480bf6bc52b0f31e795.zip
Made note of vanilla Sigil damage thrust bug, and repaired two issues
with color translations (fixes Harris's weird white/green spot when he dies). Subversion-branch: /branches/strife-branch Subversion-revision: 2266
Diffstat (limited to 'src/strife/r_draw.c')
-rw-r--r--src/strife/r_draw.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/strife/r_draw.c b/src/strife/r_draw.c
index d6c6b6f9..61226b15 100644
--- a/src/strife/r_draw.c
+++ b/src/strife/r_draw.c
@@ -484,14 +484,13 @@ void R_InitTranslationTables (void)
translationtables [i+5*256] = (i & 0x0f) + 96;
translationtables [i+6*256] = (i & 0x0f) - 112;
}
-
else if(i >= 0x50 && i<= 0x5f)
{
translationtables [i ] = i;
translationtables [i+ 256] = i;
translationtables [i+2*256] = i;
translationtables [i+3*256] = i;
- translationtables [i+4*256] = (i & 0x0f) + -128;
+ translationtables [i+4*256] = (i & 0x0f) + 0x80;
translationtables [i+5*256] = (i & 0x0f) + 16;
translationtables [i+6*256] = (i & 0x0f) + 64;
}
@@ -514,6 +513,9 @@ void R_InitTranslationTables (void)
translationtables [i+4*256] = (i & 0x0f) - 96;
translationtables [i+5*256] = (i & 0x0f) + 32;
translationtables [i+6*256] = (i & 0x0f);
+ // haleyjd 20110213: missing code:
+ if(!(i & 0x0f))
+ translationtables[i+6*256] = 1;
}
else if(i >= 0xf7 && i<= 0xfb)
{
@@ -535,7 +537,7 @@ void R_InitTranslationTables (void)
translationtables [i+5*256] = i;
translationtables [i+6*256] = i;
}
- else if(i >= 0x20 && i<= 0x40)
+ else if(i >= 0x20 && i <= 0x3f) // haleyjd 20110213: fixed upper end
{
translationtables [i ] = col2;
translationtables [i+ 256] = col2;