zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-03-03 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Default target value to -1

Browse source 
# Conflicts:
#	source/blood/src/trig.cpp
This commit is contained in:
nukeykt 2019-10-15 22:30:05 +09:00 committed by Christoph Oelckers
parent 97feb8d59c
commit a94404232b
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/blood/src/actor.cpp
View file

@ -5694,7 +5694,7 @@ void actProcessSprites(void)
if (gModernMap && (pXSprite->locked || pXSprite->isTriggered)) if (gModernMap && (pXSprite->locked || pXSprite->isTriggered))
continue; continue;
//if (pSprite->type == kThingDroppedLifeLeech) pXSprite->target = -1; why? if (pSprite->type == kThingDroppedLifeLeech) pXSprite->target = -1;
for (int nSprite2 = headspritestat[kStatDude]; nSprite2 >= 0; nSprite2 = nNextSprite) for (int nSprite2 = headspritestat[kStatDude]; nSprite2 >= 0; nSprite2 = nNextSprite)
{ {
@ -5710,7 +5710,7 @@ void actProcessSprites(void)
int proxyDist = 96; int proxyDist = 96;
if (pSprite->type == kModernThingEnemyLifeLeech) proxyDist = 512; if (pSprite->type == kModernThingEnemyLifeLeech) proxyDist = 512;
else if (pSprite->type == kThingDroppedLifeLeech /*&& pXSprite->target == -1*/) { else if (pSprite->type == kThingDroppedLifeLeech && pXSprite->target == -1) {
int nOwner = actOwnerIdToSpriteId(pSprite->owner); int nOwner = actOwnerIdToSpriteId(pSprite->owner);
spritetype *pOwner = &sprite[nOwner]; spritetype *pOwner = &sprite[nOwner];
PLAYER *pPlayer = &gPlayer[pOwner->type-kDudePlayer1]; PLAYER *pPlayer = &gPlayer[pOwner->type-kDudePlayer1];
@ -6367,6 +6367,8 @@ spritetype * actSpawnSprite(int nSector, int x, int y, int z, int nStat, char a6
int nXSprite = dbInsertXSprite(nSprite); int nXSprite = dbInsertXSprite(nSprite);
gSpriteHit[nXSprite].florhit = 0; gSpriteHit[nXSprite].florhit = 0;
gSpriteHit[nXSprite].ceilhit = 0; gSpriteHit[nXSprite].ceilhit = 0;
if (!VanillaMode())
xsprite[nXSprite].target = -1;
} }
return pSprite; return pSprite;
} }
@ -6455,6 +6457,8 @@ spritetype * actSpawnSprite(spritetype *pSource, int nStat)
int nXSprite = dbInsertXSprite(nSprite); int nXSprite = dbInsertXSprite(nSprite);
gSpriteHit[nXSprite].florhit = 0; gSpriteHit[nXSprite].florhit = 0;
gSpriteHit[nXSprite].ceilhit = 0; gSpriteHit[nXSprite].ceilhit = 0;
if (!VanillaMode())
xsprite[nXSprite].target = -1;
return pSprite; return pSprite;
} }

3
source/blood/src/trig.cpp
View file

@ -25,6 +25,9 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#include "build.h"
#include "pragmas.h"
#include "common_game.h"
#include "resource.h" #include "resource.h"
#include "trig.h" #include "trig.h"