diff options
| -rw-r--r-- | src/strife/p_pspr.c | 5 | ||||
| -rw-r--r-- | src/strife/r_draw.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/strife/p_pspr.c b/src/strife/p_pspr.c index 42a6bd7b..269b60b0 100644 --- a/src/strife/p_pspr.c +++ b/src/strife/p_pspr.c @@ -786,7 +786,10 @@ void A_FireSigil(player_t* player, pspdef_t* pspr) // 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; 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; |