From 1eb4241663fb9d2770fdaf5d7371db13279751f5 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 27 Sep 2009 02:31:03 +0000 Subject: [PATCH] - Fixed: R_DrawPSprite() did not initialize the colormap for the targeter vissprites. SVN r1883 (trunk) --- docs/rh-log.txt | 2 ++ src/asm_ia32/tmap.asm | 4 ---- src/r_things.cpp | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 1483d0b83..29d38e45d 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ September 26, 2009 +- Fixed: R_DrawPSprite() did not initialize the colormap for the targeter + vissprites. - Added a check for SPAC_AnyCross to P_TestActivateLine() before the "monster" activation checks. They are actually non-player checks and interfered with SPAC_AnyCross. diff --git a/src/asm_ia32/tmap.asm b/src/asm_ia32/tmap.asm index e6658f20f..e4c477598 100644 --- a/src/asm_ia32/tmap.asm +++ b/src/asm_ia32/tmap.asm @@ -623,10 +623,6 @@ rdcp1: sub edi,SPACEFILLER4 cmp BYTE [CPU+66],byte 5 jg rdcploop2 -; need 12 bytes of filler to make it aligned - db 0x8D,0x80,0,0,0,0 ; lea eax,[eax+00000000] - db 0x8D,0xBF,0,0,0,0 ; lea edi,[edi+00000000] - align 16 ; The registers should now look like this: diff --git a/src/r_things.cpp b/src/r_things.cpp index 3e9b8b0b3..be5499e3e 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1699,6 +1699,7 @@ void R_DrawPSprite (pspdef_t* psp, int pspnum, AActor *owner, fixed_t sx, fixed_ else { VisPSpritesBaseColormap[pspnum] = basecolormap; + vis->colormap = basecolormap->Maps; vis->RenderStyle = STYLE_Normal; }