mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 14:01:45 +00:00
- Fixed: R_DrawPSprite() did not initialize the colormap for the targeter
vissprites. SVN r1883 (trunk)
This commit is contained in:
parent
c801bb7f49
commit
1eb4241663
3 changed files with 3 additions and 4 deletions
|
@ -1,4 +1,6 @@
|
||||||
September 26, 2009
|
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"
|
- Added a check for SPAC_AnyCross to P_TestActivateLine() before the "monster"
|
||||||
activation checks. They are actually non-player checks and interfered with
|
activation checks. They are actually non-player checks and interfered with
|
||||||
SPAC_AnyCross.
|
SPAC_AnyCross.
|
||||||
|
|
|
@ -623,10 +623,6 @@ rdcp1: sub edi,SPACEFILLER4
|
||||||
cmp BYTE [CPU+66],byte 5
|
cmp BYTE [CPU+66],byte 5
|
||||||
jg rdcploop2
|
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
|
align 16
|
||||||
|
|
||||||
; The registers should now look like this:
|
; The registers should now look like this:
|
||||||
|
|
|
@ -1699,6 +1699,7 @@ void R_DrawPSprite (pspdef_t* psp, int pspnum, AActor *owner, fixed_t sx, fixed_
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
VisPSpritesBaseColormap[pspnum] = basecolormap;
|
VisPSpritesBaseColormap[pspnum] = basecolormap;
|
||||||
|
vis->colormap = basecolormap->Maps;
|
||||||
vis->RenderStyle = STYLE_Normal;
|
vis->RenderStyle = STYLE_Normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue