From f9a3ca8b6fdf23bc9533bda6e7842ec09a509d26 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 22 May 2020 18:35:25 +0200 Subject: [PATCH] - fixed compilation. --- source/blood/src/actor.cpp | 2 -- source/blood/src/nnexts.cpp | 5 +++-- source/blood/src/nnexts.h | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp index 71247e7fc..574c03c2e 100644 --- a/source/blood/src/actor.cpp +++ b/source/blood/src/actor.cpp @@ -2359,8 +2359,6 @@ const EXPLOSION explodeInfo[] = { }, }; -int gDudeDrag = 0x2a00; - short gAffectedSectors[kMaxSectors]; short gAffectedXWalls[kMaxXWalls]; static const short gPlayerGibThingComments[] = { diff --git a/source/blood/src/nnexts.cpp b/source/blood/src/nnexts.cpp index 84862761f..d6c288198 100644 --- a/source/blood/src/nnexts.cpp +++ b/source/blood/src/nnexts.cpp @@ -552,7 +552,7 @@ void nnExtInitModernStuff(bool bSaveLoad) { if (pXCond2->rxID != rx || pCond2->index == pCond->index || sum1 != sum2) continue; else if ((pCond2->type != pCond->type) ^ (pCond2->cstat != pCond->cstat)) { - initprintf("> ELSE IF found for condition #%d (RX ID: %d, CONDID: %d)\n", i, rx, pXCond->data1); + Printf("> ELSE IF found for condition #%d (RX ID: %d, CONDID: %d)\n", i, rx, pXCond->data1); pXCond2->rxID = pXCond2->busyTime = 0; pXCond->sysData2 = pCond2->index; i = a; found = true; @@ -1569,7 +1569,8 @@ void trPlayerCtrlGiveStuff(XSPRITE* pXSource, PLAYER* pPlayer, TRPLAYERCTRL* pCt for (int i = 0; i < 11; i++) { if (gWeaponItemData[i].type != weapon) continue; - WEAPONITEMDATA* pWeaponData = &gWeaponItemData[i]; int nAmmoType = pWeaponData->ammoType; + const WEAPONITEMDATA* pWeaponData = &gWeaponItemData[i]; + int nAmmoType = pWeaponData->ammoType; switch (pXSource->data2) { case 1: pPlayer->hasWeapon[weapon] = true; diff --git a/source/blood/src/nnexts.h b/source/blood/src/nnexts.h index a1b685b61..8b334c768 100644 --- a/source/blood/src/nnexts.h +++ b/source/blood/src/nnexts.h @@ -61,9 +61,11 @@ BEGIN_BLD_NS #define kModernTypeFlag4 0x0004 #define kMaxRandomizeRetries 16 -#define kPercentFull 100 +#define kPercFull 100 #define kCondRange 100 + + // modern statnums enum { kStatModernBase = 20, @@ -71,7 +73,7 @@ kStatModernDudeTargetChanger = kStatModernBase, kStatModernCondition = 21, kStatModernEventRedirector = 22, kStatModernPlayerLinker = 23, -kStatModernSeqSpawner = 24, +kStatModernBrokenDudeLeech = 24, kStatModernQavScene = 25, kStatModernTmp = 39, kStatModernMax = 40, @@ -253,7 +255,6 @@ void aiSetGenIdleState(spritetype* pSprite, XSPRITE* pXSprite); int aiFightGetTargetDist(spritetype* pSprite, DUDEINFO* pDudeInfo, spritetype* pTarget); int aiFightGetFineTargetDist(spritetype* pSprite, spritetype* pTarget); bool aiFightDudeCanSeeTarget(XSPRITE* pXDude, DUDEINFO* pDudeInfo, spritetype* pTarget); -bool aiFightIsAnnoyingUnit(spritetype* pDude); bool aiFightUnitCanFly(spritetype* pDude); bool aiFightIsMeleeUnit(spritetype* pDude); bool aiFightDudeIsAffected(XSPRITE* pXDude);