shithub: choc

Info  •  Files  •  Log  •  Branches

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

--- a/src/strife/p_pspr.c

+++ b/src/strife/p_pspr.c

@@ -786,7 +786,10 @@

     // keep info on armor because sigil does piercing damage

     i = player->armortype;

     player->armortype = 0;

-    P_DamageMobj(player->mo, player->mo, 0, 4 * (player->sigiltype + 1));

+

+    // BUG: setting inflictor causes firing the Sigil to always push the player

+    // toward the east, no matter what direction he is facing.

+    P_DamageMobj(player->mo, player->mo, NULL, 4 * (player->sigiltype + 1));

     // restore armor

     player->armortype = i;

--- a/src/strife/r_draw.c

+++ b/src/strife/r_draw.c

@@ -484,7 +484,6 @@

             translationtables [i+5*256] = (i & 0x0f) + 96;

             translationtables [i+6*256] = (i & 0x0f) - 112;

         }

-

         else if(i >= 0x50 && i<= 0x5f)

         {

             translationtables [i      ] = i;

@@ -491,7 +490,7 @@

             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 @@

             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 @@

             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;