From 8d78f25bc5ca3cdc1ba6ad964f244da386fb5041 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Tue, 19 May 2015 22:04:06 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.eduke32.com/eduke32@5209 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/sw/src/game.h | 2 ++ polymer/eduke32/source/sw/src/jweapon.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/polymer/eduke32/source/sw/src/game.h b/polymer/eduke32/source/sw/src/game.h index 8569c2aae..e5f16d5e8 100644 --- a/polymer/eduke32/source/sw/src/game.h +++ b/polymer/eduke32/source/sw/src/game.h @@ -1532,6 +1532,8 @@ typedef struct short FlagOwner; // The spritenum of the original flag short Vis; // Shading upgrade, for shooting, etc... SWBOOL DidAlert; // Has actor done his alert noise before? + + uint8_t filler; } USER,*USERp; // sprite->extra flags diff --git a/polymer/eduke32/source/sw/src/jweapon.c b/polymer/eduke32/source/sw/src/jweapon.c index 1e9b42ad5..876a65cb5 100644 --- a/polymer/eduke32/source/sw/src/jweapon.c +++ b/polymer/eduke32/source/sw/src/jweapon.c @@ -2259,10 +2259,10 @@ DoCarryFlag(int16_t Weapon) DoFlagScore(ap->pal); if (SP_TAG5(fp) > 0) { - fp->filler++; - if (fp->filler >= SP_TAG5(fp)) + fu->filler++; + if (fu->filler >= SP_TAG5(fp)) { - fp->filler = 0; + fu->filler = 0; DoMatchEverything(NULL, SP_TAG6(fp), ON); } } @@ -2400,10 +2400,10 @@ DoCarryFlagNoDet(int16_t Weapon) DoFlagScore(ap->pal); if (SP_TAG5(fp) > 0) { - fp->filler++; - if (fp->filler >= SP_TAG5(fp)) + fu->filler++; + if (fu->filler >= SP_TAG5(fp)) { - fp->filler = 0; + fu->filler = 0; DoMatchEverything(NULL, SP_TAG6(fp), ON); } }