zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-22 07:50:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove static declarators from exported action functions.

Browse source 
This made GCC error out.
This commit is contained in:
Christoph Oelckers 2023-10-08 12:22:18 +02:00
parent 8ee7c188b7
commit 6528bb7e69
19 changed files with 118 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/games/blood/src/aibat.cpp
View file

@ -43,7 +43,7 @@ void batBiteSeqCallback(DBloodActor* actor)
actFireVector(actor, 0., 0., DVector3(actor->spr.Angles.Yaw.ToVector() * 64, height2 - height), kVectorBatBite);
}
static void batThinkTarget(DBloodActor* actor)
void batThinkTarget(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -93,13 +93,13 @@ static void batThinkTarget(DBloodActor* actor)
}
}
static void batThinkSearch(DBloodActor* actor)
void batThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
batThinkTarget(actor);
}
static void batThinkGoto(DBloodActor* actor)
void batThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -112,7 +112,7 @@ static void batThinkGoto(DBloodActor* actor)
batThinkTarget(actor);
}
static void batThinkPonder(DBloodActor* actor)
void batThinkPonder(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -164,7 +164,7 @@ static void batThinkPonder(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void batMoveDodgeUp(DBloodActor* actor)
void batMoveDodgeUp(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -181,7 +181,7 @@ static void batMoveDodgeUp(DBloodActor* actor)
actor->vel.Z = FixedToFloat(-0x52aaa);
}
static void batMoveDodgeDown(DBloodActor* actor)
void batMoveDodgeDown(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -200,7 +200,7 @@ static void batMoveDodgeDown(DBloodActor* actor)
actor->vel.Z = 4.26666;
}
static void batThinkChase(DBloodActor* actor)
void batThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -262,7 +262,7 @@ static void batThinkChase(DBloodActor* actor)
aiNewState(actor, NAME_batHide);
}
static void batMoveForward(DBloodActor* actor)
void batMoveForward(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -287,7 +287,7 @@ static void batMoveForward(DBloodActor* actor)
});
}
static void batMoveSwoop(DBloodActor* actor)
void batMoveSwoop(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -311,7 +311,7 @@ static void batMoveSwoop(DBloodActor* actor)
actor->vel.Z = 4.26666;
}
static void batMoveFly(DBloodActor* actor)
void batMoveFly(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);

20
source/games/blood/src/aibeast.cpp
View file

@ -124,19 +124,19 @@ void StompSeqCallback(DBloodActor* actor)
sfxPlay3DSound(actor, 9015 + Random(2), -1, 0);
}
static void MorphToBeast(DBloodActor* actor)
void MorphToBeast(DBloodActor* actor)
{
actHealDude(actor, dudeInfo[51].startHealth, dudeInfo[51].startHealth);
actor->ChangeType(kDudeBeast);
}
static void beastThinkSearch(DBloodActor* actor)
void beastThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void beastThinkGoto(DBloodActor* actor)
void beastThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -157,7 +157,7 @@ static void beastThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void beastThinkChase(DBloodActor* actor)
void beastThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -288,7 +288,7 @@ static void beastThinkChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void beastThinkSwimGoto(DBloodActor* actor)
void beastThinkSwimGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -301,7 +301,7 @@ static void beastThinkSwimGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void beastThinkSwimChase(DBloodActor* actor)
void beastThinkSwimChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -355,7 +355,7 @@ static void beastThinkSwimChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void beastMoveForward(DBloodActor* actor)
void beastMoveForward(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -371,7 +371,7 @@ static void beastMoveForward(DBloodActor* actor)
actor->vel.XY() += actor->spr.Angles.Yaw.ToVector() * pDudeInfo->FrontSpeed();
}
static void beastMoveSwim(DBloodActor* actor)
void beastMoveSwim(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -395,7 +395,7 @@ static void beastMoveSwim(DBloodActor* actor)
});
}
static void beastMoveSwimAlt(DBloodActor* actor)
void beastMoveSwimAlt(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -425,7 +425,7 @@ static void beastMoveSwimAlt(DBloodActor* actor)
actor->vel.Z = -dz / 256;
}
static void beastMoveIn(DBloodActor* actor)
void beastMoveIn(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);

20
source/games/blood/src/aiboneel.cpp
View file

@ -56,7 +56,7 @@ void eelBiteSeqCallback(DBloodActor* actor)
actFireVector(actor, 0., 0., vect, kVectorBoneelBite);
}
static void eelThinkTarget(DBloodActor* actor)
void eelThinkTarget(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -107,13 +107,13 @@ static void eelThinkTarget(DBloodActor* actor)
}
}
static void eelThinkSearch(DBloodActor* actor)
void eelThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
eelThinkTarget(actor);
}
static void eelThinkGoto(DBloodActor* actor)
void eelThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -126,7 +126,7 @@ static void eelThinkGoto(DBloodActor* actor)
eelThinkTarget(actor);
}
static void eelThinkPonder(DBloodActor* actor)
void eelThinkPonder(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -180,7 +180,7 @@ static void eelThinkPonder(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void eelMoveDodgeUp(DBloodActor* actor)
void eelMoveDodgeUp(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -197,7 +197,7 @@ static void eelMoveDodgeUp(DBloodActor* actor)
actor->vel.Z = -0.5;
}
static void eelMoveDodgeDown(DBloodActor* actor)
void eelMoveDodgeDown(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -216,7 +216,7 @@ static void eelMoveDodgeDown(DBloodActor* actor)
actor->vel.Z = 4.26666;
}
static void eelThinkChase(DBloodActor* actor)
void eelThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -273,7 +273,7 @@ static void eelThinkChase(DBloodActor* actor)
aiNewState(actor, NAME_eelSearch);
}
static void eelMoveForward(DBloodActor* actor)
void eelMoveForward(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -298,7 +298,7 @@ static void eelMoveForward(DBloodActor* actor)
}
static void eelMoveSwoop(DBloodActor* actor)
void eelMoveSwoop(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -319,7 +319,7 @@ static void eelMoveSwoop(DBloodActor* actor)
actor->vel.Z = FixedToFloat(0x22222);
}
static void eelMoveAscend(DBloodActor* actor)
void eelMoveAscend(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);

6
source/games/blood/src/aiburn.cpp
View file

@ -34,13 +34,13 @@ void BurnSeqCallback(DBloodActor*)
{
}
static void burnThinkSearch(DBloodActor* actor)
void burnThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void burnThinkGoto(DBloodActor* actor)
void burnThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -80,7 +80,7 @@ static void burnThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void burnThinkChase(DBloodActor* actor)
void burnThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

16
source/games/blood/src/aicaleb.cpp
View file

@ -51,13 +51,13 @@ void SeqAttackCallback(DBloodActor* actor)
sfxPlay3DSound(actor, 1002, -1, 0);
}
static void calebThinkSearch(DBloodActor* actor)
void calebThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void calebThinkGoto(DBloodActor* actor)
void calebThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -79,7 +79,7 @@ static void calebThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void calebThinkChase(DBloodActor* actor)
void calebThinkChase(DBloodActor* actor)
{
auto pSector = actor->sector();
auto pXSector = pSector->hasX() ? &pSector->xs() : nullptr;
@ -180,7 +180,7 @@ static void calebThinkChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void calebThinkSwimGoto(DBloodActor* actor)
void calebThinkSwimGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -193,7 +193,7 @@ static void calebThinkSwimGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void calebThinkSwimChase(DBloodActor* actor)
void calebThinkSwimChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -244,7 +244,7 @@ static void calebThinkSwimChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void calebMoveSwimChase(DBloodActor* actor)
void calebMoveSwimChase(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -269,7 +269,7 @@ static void calebMoveSwimChase(DBloodActor* actor)
}
static void calebSwimUnused(DBloodActor* actor)
void calebSwimUnused(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -297,7 +297,7 @@ static void calebSwimUnused(DBloodActor* actor)
actor->vel.Z = -dz / 256;
}
static void calebSwimMoveIn(DBloodActor* actor)
void calebSwimMoveIn(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);

12
source/games/blood/src/aicerber.cpp
View file

@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
static constexpr double Cerberus_XYOff = 350. / 16;
static constexpr double Cerberus_ZOff = 100. / 256;
constexpr double Cerberus_XYOff = 350. / 16;
constexpr double Cerberus_ZOff = 100. / 256;
void cerberusBiteSeqCallback(DBloodActor* actor)
{
@ -181,13 +181,13 @@ void cerberusBurnSeqCallback2(DBloodActor* actor)
}
}
static void cerberusThinkSearch(DBloodActor* actor)
void cerberusThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void cerberusThinkTarget(DBloodActor* actor)
void cerberusThinkTarget(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -243,7 +243,7 @@ static void cerberusThinkTarget(DBloodActor* actor)
}
}
static void cerberusThinkGoto(DBloodActor* actor)
void cerberusThinkGoto(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -268,7 +268,7 @@ static void cerberusThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void cerberusThinkChase(DBloodActor* actor)
void cerberusThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr) {
switch (actor->GetType()) {

8
source/games/blood/src/aicult.cpp
View file

@ -120,7 +120,7 @@ void cultThrowSeqCallback3(DBloodActor* actor)
pMissile->xspr.Impact = 1;
}
static bool TargetNearExplosion(sectortype* sector)
bool TargetNearExplosion(sectortype* sector)
{
BloodSectIterator it(sector);
while (auto actor = it.Next())
@ -131,13 +131,13 @@ static bool TargetNearExplosion(sectortype* sector)
return false;
}
static void cultThinkSearch(DBloodActor* actor)
void cultThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiLookForTarget(actor);
}
static void cultThinkGoto(DBloodActor* actor)
void cultThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -161,7 +161,7 @@ static void cultThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void cultThinkChase(DBloodActor* actor)
void cultThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

26
source/games/blood/src/aigarg.cpp
View file

@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
static void playStatueBreakSnd(DBloodActor* actor) {
void playStatueBreakSnd(DBloodActor* actor) {
aiPlay3DSound(actor, 313, AI_SFX_PRIORITY_1, -1);
}
@ -133,7 +133,7 @@ void ThrowSSeqCallback(DBloodActor* actor)
actFireThing(actor, 0., 0., actor->dudeSlope * 0.25 - 0.11444, kThingBone, Chance(0x6000) ? 19.2 : 17.066666);
}
static void gargThinkTarget(DBloodActor* actor)
void gargThinkTarget(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -186,13 +186,13 @@ static void gargThinkTarget(DBloodActor* actor)
}
}
static void gargThinkSearch(DBloodActor* actor)
void gargThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiLookForTarget(actor);
}
static void gargThinkGoto(DBloodActor* actor)
void gargThinkGoto(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -208,7 +208,7 @@ static void gargThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void gargMoveDodgeUp(DBloodActor* actor)
void gargMoveDodgeUp(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -228,7 +228,7 @@ static void gargMoveDodgeUp(DBloodActor* actor)
actor->vel.Z = FixedToFloat(-0x1d555);
}
static void gargMoveDodgeDown(DBloodActor* actor)
void gargMoveDodgeDown(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -250,7 +250,7 @@ static void gargMoveDodgeDown(DBloodActor* actor)
actor->vel.Z = 4.26666;
}
static void gargThinkChase(DBloodActor* actor)
void gargThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -429,21 +429,21 @@ static void gargThinkChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void entryFStatue(DBloodActor* actor)
void entryFStatue(DBloodActor* actor)
{
DUDEINFO* pDudeInfo = &dudeInfo[6];
actHealDude(actor, pDudeInfo->startHealth, pDudeInfo->startHealth);
actor->ChangeType(kDudeGargoyleFlesh);
}
static void entrySStatue(DBloodActor* actor)
void entrySStatue(DBloodActor* actor)
{
DUDEINFO* pDudeInfo = &dudeInfo[7];
actHealDude(actor, pDudeInfo->startHealth, pDudeInfo->startHealth);
actor->ChangeType(kDudeGargoyleStone);
}
static void gargMoveForward(DBloodActor* actor)
void gargMoveForward(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -471,7 +471,7 @@ static void gargMoveForward(DBloodActor* actor)
}
static void gargMoveSlow(DBloodActor* actor)
void gargMoveSlow(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -506,7 +506,7 @@ static void gargMoveSlow(DBloodActor* actor)
}
}
static void gargMoveSwoop(DBloodActor* actor)
void gargMoveSwoop(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -541,7 +541,7 @@ static void gargMoveSwoop(DBloodActor* actor)
}
static void gargMoveFly(DBloodActor* actor)
void gargMoveFly(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");

20
source/games/blood/src/aighost.cpp
View file

@ -123,7 +123,7 @@ void ghostBlastSeqCallback(DBloodActor* actor)
}
}
static void ghostThinkTarget(DBloodActor* actor)
void ghostThinkTarget(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -175,13 +175,13 @@ static void ghostThinkTarget(DBloodActor* actor)
}
}
static void ghostThinkSearch(DBloodActor* actor)
void ghostThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void ghostThinkGoto(DBloodActor* actor)
void ghostThinkGoto(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -197,7 +197,7 @@ static void ghostThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void ghostMoveDodgeUp(DBloodActor* actor)
void ghostMoveDodgeUp(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -217,7 +217,7 @@ static void ghostMoveDodgeUp(DBloodActor* actor)
actor->vel.Z = FixedToFloat(-0x1d555);
}
static void ghostMoveDodgeDown(DBloodActor* actor)
void ghostMoveDodgeDown(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -238,7 +238,7 @@ static void ghostMoveDodgeDown(DBloodActor* actor)
actor->vel.Z = 4.26666;
}
static void ghostThinkChase(DBloodActor* actor)
void ghostThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -348,7 +348,7 @@ static void ghostThinkChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void ghostMoveForward(DBloodActor* actor)
void ghostMoveForward(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -375,7 +375,7 @@ static void ghostMoveForward(DBloodActor* actor)
});
}
static void ghostMoveSlow(DBloodActor* actor)
void ghostMoveSlow(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -406,7 +406,7 @@ static void ghostMoveSlow(DBloodActor* actor)
}
}
static void ghostMoveSwoop(DBloodActor* actor)
void ghostMoveSwoop(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -436,7 +436,7 @@ static void ghostMoveSwoop(DBloodActor* actor)
});
}
static void ghostMoveFly(DBloodActor* actor)
void ghostMoveFly(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");

16
source/games/blood/src/aigilbst.cpp
View file

@ -41,13 +41,13 @@ void GillBiteSeqCallback(DBloodActor* actor)
actFireVector(actor, 0, 0, vec, kVectorGillBite);
}
static void gillThinkSearch(DBloodActor* actor)
void gillThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void gillThinkGoto(DBloodActor* actor)
void gillThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -69,7 +69,7 @@ static void gillThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void gillThinkChase(DBloodActor* actor)
void gillThinkChase(DBloodActor* actor)
{
auto pSector = actor->sector();
auto pXSector = pSector->hasX() ? &pSector->xs() : nullptr;
@ -164,7 +164,7 @@ static void gillThinkChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void gillThinkSwimGoto(DBloodActor* actor)
void gillThinkSwimGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -177,7 +177,7 @@ static void gillThinkSwimGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void gillThinkSwimChase(DBloodActor* actor)
void gillThinkSwimChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -232,7 +232,7 @@ static void gillThinkSwimChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void gillMoveSwimChase(DBloodActor* actor)
void gillMoveSwimChase(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -257,7 +257,7 @@ static void gillMoveSwimChase(DBloodActor* actor)
}
static void gillMoveSwimUnused(DBloodActor* actor)
void gillMoveSwimUnused(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -284,7 +284,7 @@ static void gillMoveSwimUnused(DBloodActor* actor)
actor->vel.Z = -(target->spr.pos.Z - actor->spr.pos.Z) / 256.;
}
static void gillSwimMoveIn(DBloodActor* actor)
void gillSwimMoveIn(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);

6
source/games/blood/src/aihand.cpp
View file

@ -44,13 +44,13 @@ void HandJumpSeqCallback(DBloodActor* actor)
}
}
static void handThinkSearch(DBloodActor* actor)
void handThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void handThinkGoto(DBloodActor* actor)
void handThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -63,7 +63,7 @@ static void handThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void handThinkChase(DBloodActor* actor)
void handThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

6
source/games/blood/src/aihound.cpp
View file

@ -48,13 +48,13 @@ void houndBurnSeqCallback(DBloodActor* actor)
actFireMissile(actor, 0, 0, DVector3(actor->spr.Angles.Yaw.ToVector(), 0), kMissileFlameHound);
}
static void houndThinkSearch(DBloodActor* actor)
void houndThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void houndThinkGoto(DBloodActor* actor)
void houndThinkGoto(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -71,7 +71,7 @@ static void houndThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void houndThinkChase(DBloodActor* actor)
void houndThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

6
source/games/blood/src/aiinnoc.cpp
View file

@ -29,13 +29,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
static void innocThinkSearch(DBloodActor* actor)
void innocThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void innocThinkGoto(DBloodActor* actor)
void innocThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -48,7 +48,7 @@ static void innocThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void innocThinkChase(DBloodActor* actor)
void innocThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

6
source/games/blood/src/aipod.cpp
View file

@ -101,13 +101,13 @@ void podExplode(DBloodActor* actor)
actRadiusDamage(actor, actor->spr.pos, actor->sector(), nDist, 1, 5 * (1 + gGameOptions.nDifficulty), dmgType, 2, nBurn);
}
static void aiPodSearch(DBloodActor* actor)
void aiPodSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void aiPodMove(DBloodActor* actor)
void aiPodMove(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -135,7 +135,7 @@ static void aiPodMove(DBloodActor* actor)
aiThinkTarget(actor);
}
static void aiPodChase(DBloodActor* actor)
void aiPodChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr) {
switch (actor->GetType()) {

6
source/games/blood/src/airat.cpp
View file

@ -41,13 +41,13 @@ void ratBiteSeqCallback(DBloodActor* actor)
}
}
static void ratThinkSearch(DBloodActor* actor)
void ratThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void ratThinkGoto(DBloodActor* actor)
void ratThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -60,7 +60,7 @@ static void ratThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void ratThinkChase(DBloodActor* actor)
void ratThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

8
source/games/blood/src/aispid.cpp
View file

@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
static void spidBlindEffect(DBloodActor* actor, int nBlind, int max)
void spidBlindEffect(DBloodActor* actor, int nBlind, int max)
{
if (actor->IsPlayerActor())
{
@ -147,13 +147,13 @@ void SpidBirthSeqCallback(DBloodActor* actor)
}
static void spidThinkSearch(DBloodActor* actor)
void spidThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void spidThinkGoto(DBloodActor* actor)
void spidThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -166,7 +166,7 @@ static void spidThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void spidThinkChase(DBloodActor* actor)
void spidThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

10
source/games/blood/src/aitchern.cpp
View file

@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
static constexpr double Tchernnobog_XYOff = 350. / 16;
constexpr double Tchernnobog_XYOff = 350. / 16;
void tchernobogFire(DBloodActor* actor)
{
@ -155,13 +155,13 @@ void tchernobogBurnSeqCallback2(DBloodActor* actor)
actFireMissile(actor, -Tchernnobog_XYOff, 0, Aim2, kMissileFireballTchernobog);
}
static void tchernobogThinkSearch(DBloodActor* actor)
void tchernobogThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void tchernobogThinkTarget(DBloodActor* actor)
void tchernobogThinkTarget(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -216,7 +216,7 @@ static void tchernobogThinkTarget(DBloodActor* actor)
}
}
static void tchernobogThinkGoto(DBloodActor* actor)
void tchernobogThinkGoto(DBloodActor* actor)
{
if (!(actor->IsDudeActor())) {
Printf(PRINT_HIGH, "actor->IsDudeActor()");
@ -232,7 +232,7 @@ static void tchernobogThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void tchernobogThinkChase(DBloodActor* actor)
void tchernobogThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{

18
source/games/blood/src/aizomba.cpp
View file

@ -51,13 +51,13 @@ void StandSeqCallback(DBloodActor* actor)
sfxPlay3DSound(actor, 1102, -1, 0);
}
static void zombaThinkSearch(DBloodActor* actor)
void zombaThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiLookForTarget(actor);
}
static void zombaThinkGoto(DBloodActor* actor)
void zombaThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -70,7 +70,7 @@ static void zombaThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void zombaThinkChase(DBloodActor* actor)
void zombaThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -122,7 +122,7 @@ static void zombaThinkChase(DBloodActor* actor)
actor->SetTarget(nullptr);
}
static void zombaThinkPonder(DBloodActor* actor)
void zombaThinkPonder(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{
@ -174,7 +174,7 @@ static void zombaThinkPonder(DBloodActor* actor)
aiNewState(actor, NAME_zombieAChase);
}
static void myThinkTarget(DBloodActor* actor)
void myThinkTarget(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -216,24 +216,24 @@ static void myThinkTarget(DBloodActor* actor)
//
//---------------------------------------------------------------------------
static void myThinkSearch(DBloodActor* actor)
void myThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
myThinkTarget(actor);
}
static void entryEZombie(DBloodActor* actor)
void entryEZombie(DBloodActor* actor)
{
actor->ChangeType(kDudeZombieAxeNormal);
actor->spr.flags |= 1;
}
static void entryAIdle(DBloodActor* actor)
void entryAIdle(DBloodActor* actor)
{
actor->SetTarget(nullptr);
}
static void entryEStand(DBloodActor* actor)
void entryEStand(DBloodActor* actor)
{
sfxPlay3DSound(actor, 1100, -1, 0);
actor->spr.Angles.Yaw = (actor->xspr.TargetPos - actor->spr.pos).Angle();

6
source/games/blood/src/aizombf.cpp
View file

@ -64,13 +64,13 @@ void ThrowSeqCallback(DBloodActor* actor)
actFireMissile(actor, 0, 0, DVector3(actor->spr.Angles.Yaw.ToVector(), 0), kMissileButcherKnife);
}
static void zombfThinkSearch(DBloodActor* actor)
void zombfThinkSearch(DBloodActor* actor)
{
aiChooseDirection(actor, actor->xspr.goalAng);
aiThinkTarget(actor);
}
static void zombfThinkGoto(DBloodActor* actor)
void zombfThinkGoto(DBloodActor* actor)
{
assert(actor->IsDudeActor());
DUDEINFO* pDudeInfo = getDudeInfo(actor);
@ -83,7 +83,7 @@ static void zombfThinkGoto(DBloodActor* actor)
aiThinkTarget(actor);
}
static void zombfThinkChase(DBloodActor* actor)
void zombfThinkChase(DBloodActor* actor)
{
if (actor->GetTarget() == nullptr)
{