- Fixed: R_DrawPSprite() did not initialize the colormap for the targeter

vissprites.


SVN r1883 (trunk)

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.

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:

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;
 	}