zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Since sprite->filler is now fogpal, modify the CTF code that uses it to use a new variable in SW's USER struct instead.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5209 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-05-19 22:04:06 +00:00
parent 6e8e49d17f
commit 8d78f25bc5
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/sw/src/game.h
View file

@ -1532,6 +1532,8 @@ typedef struct
short FlagOwner; // The spritenum of the original flag short FlagOwner; // The spritenum of the original flag
short Vis; // Shading upgrade, for shooting, etc... short Vis; // Shading upgrade, for shooting, etc...
SWBOOL DidAlert; // Has actor done his alert noise before? SWBOOL DidAlert; // Has actor done his alert noise before?
uint8_t filler;
} USER,*USERp; } USER,*USERp;
// sprite->extra flags // sprite->extra flags

12
polymer/eduke32/source/sw/src/jweapon.c
View file

@ -2259,10 +2259,10 @@ DoCarryFlag(int16_t Weapon)
DoFlagScore(ap->pal); DoFlagScore(ap->pal);
if (SP_TAG5(fp) > 0) if (SP_TAG5(fp) > 0)
{ {
fp->filler++; fu->filler++;
if (fp->filler >= SP_TAG5(fp)) if (fu->filler >= SP_TAG5(fp))
{ {
fp->filler = 0; fu->filler = 0;
DoMatchEverything(NULL, SP_TAG6(fp), ON); DoMatchEverything(NULL, SP_TAG6(fp), ON);
} }
} }
@ -2400,10 +2400,10 @@ DoCarryFlagNoDet(int16_t Weapon)
DoFlagScore(ap->pal); DoFlagScore(ap->pal);
if (SP_TAG5(fp) > 0) if (SP_TAG5(fp) > 0)
{ {
fp->filler++; fu->filler++;
if (fp->filler >= SP_TAG5(fp)) if (fu->filler >= SP_TAG5(fp))
{ {
fp->filler = 0; fu->filler = 0;
DoMatchEverything(NULL, SP_TAG6(fp), ON); DoMatchEverything(NULL, SP_TAG6(fp), ON);
} }
} }