diff --git a/source/games/whaven/src/aidemon.cpp b/source/games/whaven/src/aidemon.cpp index 9057d3edd..75726998b 100644 --- a/source/games/whaven/src/aidemon.cpp +++ b/source/games/whaven/src/aidemon.cpp @@ -120,7 +120,7 @@ static void face(PLAYER& plr, short i) { } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; if (plr.z < spr.z) { @@ -211,7 +211,7 @@ void createDemonAI() { e.frozen; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.cast = cast; e.die; diff --git a/source/games/whaven/src/aidevil.cpp b/source/games/whaven/src/aidevil.cpp index c82102be3..2a2f749fb 100644 --- a/source/games/whaven/src/aidevil.cpp +++ b/source/games/whaven/src/aidevil.cpp @@ -155,7 +155,7 @@ static void flee(PLAYER& plr, short i) { setsprite(i, spr.x, spr.y, spr.z); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -260,7 +260,7 @@ void createDevilAI() { e.pain = pain; e.face = face; e.flee = flee; - e.attack = attack; + e.attack = attackfunc; e.resurect = resurect; e.search = search; e.frozen = frozen; diff --git a/source/games/whaven/src/aidragon.cpp b/source/games/whaven/src/aidragon.cpp index 7a87caeba..07b642c56 100644 --- a/source/games/whaven/src/aidragon.cpp +++ b/source/games/whaven/src/aidragon.cpp @@ -190,7 +190,7 @@ static void cast(PLAYER& plr, short i) { checksector6(i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; spr.lotag -= TICSPERFRAME; @@ -370,7 +370,7 @@ void createDragonAI() { e.flee = flee; e.die = die; e.cast = cast; - e.attack = attack; + e.attack = attackfunc; e.resurect = resurect; e.search = search; e.frozen = frozen; diff --git a/source/games/whaven/src/aifatwitch.cpp b/source/games/whaven/src/aifatwitch.cpp index 43addbfb5..8149614ee 100644 --- a/source/games/whaven/src/aifatwitch.cpp +++ b/source/games/whaven/src/aifatwitch.cpp @@ -133,7 +133,7 @@ static void face(PLAYER& plr, short i) { newstatus(i, ATTACK); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -267,7 +267,7 @@ void createFatwitchAI() { e.nuked = nuked; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.cast = cast; e.die = die; diff --git a/source/games/whaven/src/aifish.cpp b/source/games/whaven/src/aifish.cpp index 4f5e0e6e2..293a23cff 100644 --- a/source/games/whaven/src/aifish.cpp +++ b/source/games/whaven/src/aifish.cpp @@ -80,7 +80,7 @@ static void die(PLAYER& plr, short i) { deletesprite(i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; spr.z = sector[sprite[i].sectnum].floorz; @@ -179,7 +179,7 @@ void createFishAI() { e.info.Init(1, 1, 512, 120, 0, 32, false, 10, 0); e.chase = chase; e.die = die; - e.attack = attack; + e.attack = attackfunc; e.skirmish = skirmish; e.search = search; e.face = face; diff --git a/source/games/whaven/src/aifred.cpp b/source/games/whaven/src/aifred.cpp index 4ed7e21f3..3b3f6c1ac 100644 --- a/source/games/whaven/src/aifred.cpp +++ b/source/games/whaven/src/aifred.cpp @@ -174,7 +174,7 @@ static void face(PLAYER& plr, short i) { checkexpl(plr, i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -308,7 +308,7 @@ void createFredAI() { e.search = search; e.frozen = frozen; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.pain = pain; e.resurect = resurect; diff --git a/source/games/whaven/src/aigoblin.cpp b/source/games/whaven/src/aigoblin.cpp index 7f4845e1a..fe2c4bc0c 100644 --- a/source/games/whaven/src/aigoblin.cpp +++ b/source/games/whaven/src/aigoblin.cpp @@ -216,7 +216,7 @@ static void stand(PLAYER& plr, short i) { checksector6(i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -535,7 +535,7 @@ void createGoblinAI() { e.face = face; e.flee = flee; e.stand = stand; - e.attack = attack; + e.attack = attackfunc; e.resurect = resurect; e.search = search; e.frozen = frozen; diff --git a/source/games/whaven/src/aigonzo.cpp b/source/games/whaven/src/aigonzo.cpp index 48901356d..ddccc1018 100644 --- a/source/games/whaven/src/aigonzo.cpp +++ b/source/games/whaven/src/aigonzo.cpp @@ -342,7 +342,7 @@ static void face(PLAYER& plr, short i) { checkexpl(plr, i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); spr.z = zr_florz; @@ -729,7 +729,7 @@ void createGonzoAI() { e.frozen = frozen; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.cast = cast; e.die = die; diff --git a/source/games/whaven/src/aigron.cpp b/source/games/whaven/src/aigron.cpp index 6422dc019..b3e334541 100644 --- a/source/games/whaven/src/aigron.cpp +++ b/source/games/whaven/src/aigron.cpp @@ -270,7 +270,7 @@ static void face(PLAYER& plr, short i) { checkexpl(plr, i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; if (spr.picnum == GRONSWATTACK) { @@ -501,7 +501,7 @@ void createGronAI() { e.frozen = frozen; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.cast = cast; e.die = die; diff --git a/source/games/whaven/src/aiguardian.cpp b/source/games/whaven/src/aiguardian.cpp index 89449e656..77d7157ab 100644 --- a/source/games/whaven/src/aiguardian.cpp +++ b/source/games/whaven/src/aiguardian.cpp @@ -91,7 +91,7 @@ static void nuked(PLAYER& plr, short i) { } } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; if (plr.z < spr.z) { @@ -230,7 +230,7 @@ void createGuardianAI() { e.info.Init(isWh2() ? 35 : 32, isWh2() ? 35 : 32, 4096, 120, 0, 64, true, isWh2() ? 100 : 200, 0); e.chase = chase; e.nuked = nuked; - e.attack = attack; + e.attack = attackfunc; e.face = face; e.search = search; e.flee = flee; diff --git a/source/games/whaven/src/aiimp.cpp b/source/games/whaven/src/aiimp.cpp index cdf317b8e..4ca78b513 100644 --- a/source/games/whaven/src/aiimp.cpp +++ b/source/games/whaven/src/aiimp.cpp @@ -219,7 +219,7 @@ static void flee(PLAYER& plr, short i) { checkexpl(plr, i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -322,7 +322,7 @@ void createImpAI() { e.resurect = resurect; e.face = face; e.flee = flee; - e.attack = attack; + e.attack = attackfunc; e.search = search; e.skirmish = skirmish; } diff --git a/source/games/whaven/src/aijudy.cpp b/source/games/whaven/src/aijudy.cpp index 711a047e0..a4ae54fee 100644 --- a/source/games/whaven/src/aijudy.cpp +++ b/source/games/whaven/src/aijudy.cpp @@ -145,7 +145,7 @@ static void face(PLAYER& plr, short i) { newstatus(i, ATTACK); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -397,7 +397,7 @@ void createJudyAI() { e.nuked = nuked; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.cast = cast; e.die = die; diff --git a/source/games/whaven/src/aikatie.cpp b/source/games/whaven/src/aikatie.cpp index 55d334b47..5b9046e2b 100644 --- a/source/games/whaven/src/aikatie.cpp +++ b/source/games/whaven/src/aikatie.cpp @@ -121,7 +121,7 @@ static void face(PLAYER& plr, short i) { newstatus(i, ATTACK); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -267,7 +267,7 @@ void createKatieAI() { e.search = search; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.cast = cast; e.die = die; diff --git a/source/games/whaven/src/aikobold.cpp b/source/games/whaven/src/aikobold.cpp index a2bb7d16b..a9a29fabb 100644 --- a/source/games/whaven/src/aikobold.cpp +++ b/source/games/whaven/src/aikobold.cpp @@ -192,7 +192,7 @@ static void flee(PLAYER& plr, short i) { checkexpl(plr, i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -339,7 +339,7 @@ void createKoboldAI() { e.pain = pain; e.face = face; e.flee = flee; - e.attack = attack; + e.attack = attackfunc; e.resurect = resurect; e.search = search; e.frozen = frozen; diff --git a/source/games/whaven/src/aiminotaur.cpp b/source/games/whaven/src/aiminotaur.cpp index 8e0dd2f1b..af4e67df4 100644 --- a/source/games/whaven/src/aiminotaur.cpp +++ b/source/games/whaven/src/aiminotaur.cpp @@ -196,7 +196,7 @@ static void face(PLAYER& plr, short i) { checkexpl(plr, i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -340,7 +340,7 @@ void createMinotaurAI() { e.nuked = nuked; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.die = die; e.flee = flee; e.frozen = frozen; diff --git a/source/games/whaven/src/ainewguy.cpp b/source/games/whaven/src/ainewguy.cpp index 42ac935bd..385d821ff 100644 --- a/source/games/whaven/src/ainewguy.cpp +++ b/source/games/whaven/src/ainewguy.cpp @@ -243,7 +243,7 @@ static void flee(PLAYER& plr, short i) { setsprite(i, spr.x, spr.y, spr.z); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -430,7 +430,7 @@ void createNewGuyAI() { e.pain = pain; e.face = face; e.flee = flee; - e.attack = attack; + e.attack = attackfunc; e.die = die; e.cast = cast; } diff --git a/source/games/whaven/src/aiskeleton.cpp b/source/games/whaven/src/aiskeleton.cpp index 10384c071..f8f001ada 100644 --- a/source/games/whaven/src/aiskeleton.cpp +++ b/source/games/whaven/src/aiskeleton.cpp @@ -202,7 +202,7 @@ static void stand(PLAYER& plr, short i) { checksector6(i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -360,7 +360,7 @@ void createSkeletonAI() { e.face = face; e.flee = flee; e.stand = stand; - e.attack = attack; + e.attack = attackfunc; e.resurect = resurect; e.search = search; e.frozen = frozen; diff --git a/source/games/whaven/src/aiskully.cpp b/source/games/whaven/src/aiskully.cpp index f8fb9ee37..af8bd7768 100644 --- a/source/games/whaven/src/aiskully.cpp +++ b/source/games/whaven/src/aiskully.cpp @@ -133,7 +133,7 @@ static void face(PLAYER& plr, short i) { newstatus(i, ATTACK); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -238,7 +238,7 @@ void createSkullyAI() { e.nuked = nuked; e.pain = pain; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.cast = cast; e.die = die; diff --git a/source/games/whaven/src/aispider.cpp b/source/games/whaven/src/aispider.cpp index 960e0427b..5c607c7a7 100644 --- a/source/games/whaven/src/aispider.cpp +++ b/source/games/whaven/src/aispider.cpp @@ -176,7 +176,7 @@ static void face(PLAYER& plr, short i) { checkexpl(plr, i); } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; getzrange(spr.x, spr.y, spr.z - 1, spr.sectnum, (spr.clipdist) << 2, CLIPMASK0); @@ -306,7 +306,7 @@ void createSpiderAI() { e.search = search; e.frozen = frozen; e.face = face; - e.attack = attack; + e.attack = attackfunc; e.flee = flee; e.die = die; } diff --git a/source/games/whaven/src/aiwillow.cpp b/source/games/whaven/src/aiwillow.cpp index 0fc93fb4f..c1d5300ac 100644 --- a/source/games/whaven/src/aiwillow.cpp +++ b/source/games/whaven/src/aiwillow.cpp @@ -67,7 +67,7 @@ static void chase(PLAYER& plr, short i) { } } -static void attack(PLAYER& plr, short i) { +static void attackfunc(PLAYER& plr, short i) { SPRITE& spr = sprite[i]; spr.lotag -= TICSPERFRAME; @@ -269,7 +269,7 @@ void createWillowAI() { auto& e = enemy[WILLOWTYPE]; e.info.Init(32, 32, 512, 120, 0, 64, true, isWh2() ? 5 : 400, 0); e.chase = chase; - e.attack = attack; + e.attack = attackfunc; e.face = face; e.search = search; e.flee = flee;