From 374a850565c4871e3b2ef5dcdf94677e49f7f066 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 25 Jul 2020 17:56:39 +0200 Subject: [PATCH] - merged all of Blood's ai state headers together to reduce number of files and include clutter. --- source/blood/src/actor.cpp | 20 +- source/blood/src/ai.cpp | 20 +- source/blood/src/aibat.cpp | 1 - source/blood/src/aibat.h | 47 ----- source/blood/src/aibeast.cpp | 1 - source/blood/src/aibeast.h | 50 ----- source/blood/src/aiboneel.cpp | 1 - source/blood/src/aiboneel.h | 47 ----- source/blood/src/aiburn.cpp | 2 +- source/blood/src/aiburn.h | 59 ------ source/blood/src/aicaleb.cpp | 1 - source/blood/src/aicaleb.h | 47 ----- source/blood/src/aicerber.cpp | 1 - source/blood/src/aicerber.h | 48 ----- source/blood/src/aicult.cpp | 2 +- source/blood/src/aicult.h | 67 ------ source/blood/src/aigarg.cpp | 1 - source/blood/src/aigarg.h | 54 ----- source/blood/src/aighost.cpp | 1 - source/blood/src/aighost.h | 46 ----- source/blood/src/aigilbst.cpp | 1 - source/blood/src/aigilbst.h | 46 ----- source/blood/src/aihand.cpp | 1 - source/blood/src/aihand.h | 36 ---- source/blood/src/aihound.cpp | 1 - source/blood/src/aihound.h | 37 ---- source/blood/src/aiinnoc.cpp | 1 - source/blood/src/aiinnoc.h | 35 ---- source/blood/src/aipod.cpp | 2 +- source/blood/src/aipod.h | 45 ----- source/blood/src/airat.cpp | 1 - source/blood/src/airat.h | 36 ---- source/blood/src/aispid.cpp | 1 - source/blood/src/aispid.h | 37 ---- source/blood/src/aistate.h | 358 +++++++++++++++++++++++++++++++++ source/blood/src/aitchern.cpp | 1 - source/blood/src/aitchern.h | 38 ---- source/blood/src/aiunicult.cpp | 2 +- source/blood/src/aizomba.cpp | 2 +- source/blood/src/aizomba.h | 46 ----- source/blood/src/aizombf.cpp | 1 - source/blood/src/aizombf.h | 39 ---- source/blood/src/loadsave.cpp | 20 +- source/blood/src/view.cpp | 2 +- 44 files changed, 367 insertions(+), 938 deletions(-) delete mode 100644 source/blood/src/aibat.h delete mode 100644 source/blood/src/aibeast.h delete mode 100644 source/blood/src/aiboneel.h delete mode 100644 source/blood/src/aiburn.h delete mode 100644 source/blood/src/aicaleb.h delete mode 100644 source/blood/src/aicerber.h delete mode 100644 source/blood/src/aicult.h delete mode 100644 source/blood/src/aigarg.h delete mode 100644 source/blood/src/aighost.h delete mode 100644 source/blood/src/aigilbst.h delete mode 100644 source/blood/src/aihand.h delete mode 100644 source/blood/src/aihound.h delete mode 100644 source/blood/src/aiinnoc.h delete mode 100644 source/blood/src/aipod.h delete mode 100644 source/blood/src/airat.h delete mode 100644 source/blood/src/aispid.h create mode 100644 source/blood/src/aistate.h delete mode 100644 source/blood/src/aitchern.h delete mode 100644 source/blood/src/aizomba.h delete mode 100644 source/blood/src/aizombf.h diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp index c87dc6bbe..419ae4b7b 100644 --- a/source/blood/src/actor.cpp +++ b/source/blood/src/actor.cpp @@ -33,25 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aibat.h" -#include "aibeast.h" -#include "aiboneel.h" -#include "aiburn.h" -#include "aicaleb.h" -#include "aicerber.h" -#include "aicult.h" -#include "aigarg.h" -#include "aighost.h" -#include "aigilbst.h" -#include "aihand.h" -#include "aihound.h" -#include "aiinnoc.h" -#include "aipod.h" -#include "airat.h" -#include "aispid.h" -#include "aitchern.h" -#include "aizomba.h" -#include "aizombf.h" +#include "aistate.h" #include "aiunicult.h" #include "blood.h" #include "callback.h" diff --git a/source/blood/src/ai.cpp b/source/blood/src/ai.cpp index c8604dfa9..a824a9e3d 100644 --- a/source/blood/src/ai.cpp +++ b/source/blood/src/ai.cpp @@ -29,25 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "common_game.h" #include "actor.h" #include "ai.h" -#include "aibat.h" -#include "aibeast.h" -#include "aiboneel.h" -#include "aiburn.h" -#include "aicaleb.h" -#include "aicerber.h" -#include "aicult.h" -#include "aigarg.h" -#include "aighost.h" -#include "aigilbst.h" -#include "aihand.h" -#include "aihound.h" -#include "aiinnoc.h" -#include "aipod.h" -#include "airat.h" -#include "aispid.h" -#include "aitchern.h" -#include "aizomba.h" -#include "aizombf.h" +#include "aistate.h" #include "aiunicult.h" #include "blood.h" #include "db.h" diff --git a/source/blood/src/aibat.cpp b/source/blood/src/aibat.cpp index ca80dbc34..a0f06f789 100644 --- a/source/blood/src/aibat.cpp +++ b/source/blood/src/aibat.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aibat.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aibat.h b/source/blood/src/aibat.h deleted file mode 100644 index 4eae831f0..000000000 --- a/source/blood/src/aibat.h +++ /dev/null @@ -1,47 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE batIdle; -extern AISTATE batFlyIdle; -extern AISTATE batChase; -extern AISTATE batPonder; -extern AISTATE batGoto; -extern AISTATE batBite; -extern AISTATE batRecoil; -extern AISTATE batSearch; -extern AISTATE batSwoop; -extern AISTATE batFly; -extern AISTATE batTurn; -extern AISTATE batHide; -extern AISTATE batDodgeUp; -extern AISTATE batDodgeUpRight; -extern AISTATE batDodgeUpLeft; -extern AISTATE batDodgeDown; -extern AISTATE batDodgeDownRight; -extern AISTATE batDodgeDownLeft; - -END_BLD_NS diff --git a/source/blood/src/aibeast.cpp b/source/blood/src/aibeast.cpp index 678290a9d..dc16cffe0 100644 --- a/source/blood/src/aibeast.cpp +++ b/source/blood/src/aibeast.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aibeast.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aibeast.h b/source/blood/src/aibeast.h deleted file mode 100644 index 247ce4aa6..000000000 --- a/source/blood/src/aibeast.h +++ /dev/null @@ -1,50 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE beastIdle; -extern AISTATE beastChase; -extern AISTATE beastDodge; -extern AISTATE beastGoto; -extern AISTATE beastSlash; -extern AISTATE beastStomp; -extern AISTATE beastSearch; -extern AISTATE beastRecoil; -extern AISTATE beastTeslaRecoil; -extern AISTATE beastSwimIdle; -extern AISTATE beastSwimChase; -extern AISTATE beastSwimDodge; -extern AISTATE beastSwimGoto; -extern AISTATE beastSwimSearch; -extern AISTATE beastSwimSlash; -extern AISTATE beastSwimRecoil; -extern AISTATE beastMorphToBeast; -extern AISTATE beastMorphFromCultist; -extern AISTATE beast138FB4; -extern AISTATE beast138FD0; -extern AISTATE beast138FEC; - -END_BLD_NS diff --git a/source/blood/src/aiboneel.cpp b/source/blood/src/aiboneel.cpp index 64c8424b8..69a44a608 100644 --- a/source/blood/src/aiboneel.cpp +++ b/source/blood/src/aiboneel.cpp @@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aiboneel.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aiboneel.h b/source/blood/src/aiboneel.h deleted file mode 100644 index b49623cb9..000000000 --- a/source/blood/src/aiboneel.h +++ /dev/null @@ -1,47 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE eelIdle; -extern AISTATE eelFlyIdle; -extern AISTATE eelChase; -extern AISTATE eelPonder; -extern AISTATE eelGoto; -extern AISTATE eelBite; -extern AISTATE eelRecoil; -extern AISTATE eelSearch; -extern AISTATE eelSwoop; -extern AISTATE eelFly; -extern AISTATE eelTurn; -extern AISTATE eelHide; -extern AISTATE eelDodgeUp; -extern AISTATE eelDodgeUpRight; -extern AISTATE eelDodgeUpLeft; -extern AISTATE eelDodgeDown; -extern AISTATE eelDodgeDownRight; -extern AISTATE eelDodgeDownLeft; - -END_BLD_NS diff --git a/source/blood/src/aiburn.cpp b/source/blood/src/aiburn.cpp index c874d209f..657c1da07 100644 --- a/source/blood/src/aiburn.cpp +++ b/source/blood/src/aiburn.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aiburn.h" +#include "aistate.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aiburn.h b/source/blood/src/aiburn.h deleted file mode 100644 index aa58046cc..000000000 --- a/source/blood/src/aiburn.h +++ /dev/null @@ -1,59 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE cultistBurnIdle; -extern AISTATE cultistBurnChase; -extern AISTATE cultistBurnGoto; -extern AISTATE cultistBurnSearch; -extern AISTATE cultistBurnAttack; -extern AISTATE zombieABurnChase; -extern AISTATE zombieABurnGoto; -extern AISTATE zombieABurnSearch; -extern AISTATE zombieABurnAttack; -extern AISTATE zombieFBurnChase; -extern AISTATE zombieFBurnGoto; -extern AISTATE zombieFBurnSearch; -extern AISTATE zombieFBurnAttack; -extern AISTATE innocentBurnChase; -extern AISTATE innocentBurnGoto; -extern AISTATE innocentBurnSearch; -extern AISTATE innocentBurnAttack; -extern AISTATE beastBurnChase; -extern AISTATE beastBurnGoto; -extern AISTATE beastBurnSearch; -extern AISTATE beastBurnAttack; -extern AISTATE tinycalebBurnChase; -extern AISTATE tinycalebBurnGoto; -extern AISTATE tinycalebBurnSearch; -extern AISTATE tinycalebBurnAttack; -extern AISTATE genDudeBurnIdle; -extern AISTATE genDudeBurnChase; -extern AISTATE genDudeBurnGoto; -extern AISTATE genDudeBurnSearch; -extern AISTATE genDudeBurnAttack; - -END_BLD_NS diff --git a/source/blood/src/aicaleb.cpp b/source/blood/src/aicaleb.cpp index 8109eed4a..3ebd00781 100644 --- a/source/blood/src/aicaleb.cpp +++ b/source/blood/src/aicaleb.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aicaleb.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aicaleb.h b/source/blood/src/aicaleb.h deleted file mode 100644 index ea4a28714..000000000 --- a/source/blood/src/aicaleb.h +++ /dev/null @@ -1,47 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE tinycalebIdle; -extern AISTATE tinycalebChase; -extern AISTATE tinycalebDodge; -extern AISTATE tinycalebGoto; -extern AISTATE tinycalebAttack; -extern AISTATE tinycalebSearch; -extern AISTATE tinycalebRecoil; -extern AISTATE tinycalebTeslaRecoil; -extern AISTATE tinycalebSwimIdle; -extern AISTATE tinycalebSwimChase; -extern AISTATE tinycalebSwimDodge; -extern AISTATE tinycalebSwimGoto; -extern AISTATE tinycalebSwimSearch; -extern AISTATE tinycalebSwimAttack; -extern AISTATE tinycalebSwimRecoil; -extern AISTATE tinycaleb139660; -extern AISTATE tinycaleb13967C; -extern AISTATE tinycaleb139698; - -END_BLD_NS diff --git a/source/blood/src/aicerber.cpp b/source/blood/src/aicerber.cpp index fec67f1f5..89946ab94 100644 --- a/source/blood/src/aicerber.cpp +++ b/source/blood/src/aicerber.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aicerber.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aicerber.h b/source/blood/src/aicerber.h deleted file mode 100644 index 6b4f3b416..000000000 --- a/source/blood/src/aicerber.h +++ /dev/null @@ -1,48 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE cerberusIdle; -extern AISTATE cerberusSearch; -extern AISTATE cerberusChase; -extern AISTATE cerberusRecoil; -extern AISTATE cerberusTeslaRecoil; -extern AISTATE cerberusGoto; -extern AISTATE cerberusBite; -extern AISTATE cerberusBurn; -extern AISTATE cerberus3Burn; -extern AISTATE cerberus2Idle; -extern AISTATE cerberus2Search; -extern AISTATE cerberus2Chase; -extern AISTATE cerberus2Recoil; -extern AISTATE cerberus2Goto; -extern AISTATE cerberus2Bite; -extern AISTATE cerberus2Burn; -extern AISTATE cerberus4Burn; -extern AISTATE cerberus139890; -extern AISTATE cerberus1398AC; - -END_BLD_NS diff --git a/source/blood/src/aicult.cpp b/source/blood/src/aicult.cpp index 440883331..d5a6f6bf2 100644 --- a/source/blood/src/aicult.cpp +++ b/source/blood/src/aicult.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aicult.h" +#include "aistate.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aicult.h b/source/blood/src/aicult.h deleted file mode 100644 index 39d647955..000000000 --- a/source/blood/src/aicult.h +++ /dev/null @@ -1,67 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE cultistIdle; -extern AISTATE cultistProneIdle; -extern AISTATE fanaticProneIdle; -extern AISTATE cultistProneIdle3; -extern AISTATE cultistChase; -extern AISTATE fanaticChase; -extern AISTATE cultistDodge; -extern AISTATE cultistGoto; -extern AISTATE cultistProneChase; -extern AISTATE cultistProneDodge; -extern AISTATE cultistTThrow; -extern AISTATE cultistSThrow; -extern AISTATE cultistTsThrow; -extern AISTATE cultistDThrow; -extern AISTATE cultist139A78; -extern AISTATE cultist139A94; -extern AISTATE cultist139AB0; -extern AISTATE cultist139ACC; -extern AISTATE cultist139AE8; -extern AISTATE cultistSearch; -extern AISTATE cultistSFire; -extern AISTATE cultistTFire; -extern AISTATE cultistTsFire; -extern AISTATE cultistSProneFire; -extern AISTATE cultistTProneFire; -extern AISTATE cultistTsProneFire; -extern AISTATE cultistRecoil; -extern AISTATE cultistProneRecoil; -extern AISTATE cultistTeslaRecoil; -extern AISTATE cultistSwimIdle; -extern AISTATE cultistSwimChase; -extern AISTATE cultistSwimDodge; -extern AISTATE cultistSwimGoto; -extern AISTATE cultistSwimSearch; -extern AISTATE cultistSSwimFire; -extern AISTATE cultistTSwimFire; -extern AISTATE cultistTsSwimFire; -extern AISTATE cultistSwimRecoil; - -END_BLD_NS diff --git a/source/blood/src/aigarg.cpp b/source/blood/src/aigarg.cpp index 637f941c4..2cd7d4903 100644 --- a/source/blood/src/aigarg.cpp +++ b/source/blood/src/aigarg.cpp @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aigarg.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aigarg.h b/source/blood/src/aigarg.h deleted file mode 100644 index c76c87bee..000000000 --- a/source/blood/src/aigarg.h +++ /dev/null @@ -1,54 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE gargoyleFIdle; -extern AISTATE gargoyleStatueIdle; -extern AISTATE gargoyleFChase; -extern AISTATE gargoyleFGoto; -extern AISTATE gargoyleFSlash; -extern AISTATE gargoyleFThrow; -extern AISTATE gargoyleSThrow; -extern AISTATE gargoyleSBlast; -extern AISTATE gargoyleFRecoil; -extern AISTATE gargoyleFSearch; -extern AISTATE gargoyleFMorph2; -extern AISTATE gargoyleFMorph; -extern AISTATE gargoyleSMorph2; -extern AISTATE gargoyleSMorph; -extern AISTATE gargoyleSwoop; -extern AISTATE gargoyleFly; -extern AISTATE gargoyleTurn; -extern AISTATE gargoyleDodgeUp; -extern AISTATE gargoyleFDodgeUpRight; -extern AISTATE gargoyleFDodgeUpLeft; -extern AISTATE gargoyleDodgeDown; -extern AISTATE gargoyleFDodgeDownRight; -extern AISTATE gargoyleFDodgeDownLeft; -extern AISTATE statueFBreakSEQ; -extern AISTATE statueSBreakSEQ; - -END_BLD_NS diff --git a/source/blood/src/aighost.cpp b/source/blood/src/aighost.cpp index a2b661b87..1a893e4a7 100644 --- a/source/blood/src/aighost.cpp +++ b/source/blood/src/aighost.cpp @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aighost.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aighost.h b/source/blood/src/aighost.h deleted file mode 100644 index 831ea11f2..000000000 --- a/source/blood/src/aighost.h +++ /dev/null @@ -1,46 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once - -BEGIN_BLD_NS - -extern AISTATE ghostIdle; -extern AISTATE ghostChase; -extern AISTATE ghostGoto; -extern AISTATE ghostSlash; -extern AISTATE ghostThrow; -extern AISTATE ghostBlast; -extern AISTATE ghostRecoil; -extern AISTATE ghostTeslaRecoil; -extern AISTATE ghostSearch; -extern AISTATE ghostSwoop; -extern AISTATE ghostFly; -extern AISTATE ghostTurn; -extern AISTATE ghostDodgeUp; -extern AISTATE ghostDodgeUpRight; -extern AISTATE ghostDodgeUpLeft; -extern AISTATE ghostDodgeDown; -extern AISTATE ghostDodgeDownRight; -extern AISTATE ghostDodgeDownLeft; - -END_BLD_NS diff --git a/source/blood/src/aigilbst.cpp b/source/blood/src/aigilbst.cpp index 13277003e..8a3a71c2b 100644 --- a/source/blood/src/aigilbst.cpp +++ b/source/blood/src/aigilbst.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aigilbst.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aigilbst.h b/source/blood/src/aigilbst.h deleted file mode 100644 index 29b935699..000000000 --- a/source/blood/src/aigilbst.h +++ /dev/null @@ -1,46 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE gillBeastIdle; -extern AISTATE gillBeastChase; -extern AISTATE gillBeastDodge; -extern AISTATE gillBeastGoto; -extern AISTATE gillBeastBite; -extern AISTATE gillBeastSearch; -extern AISTATE gillBeastRecoil; -extern AISTATE gillBeastSwimIdle; -extern AISTATE gillBeastSwimChase; -extern AISTATE gillBeastSwimDodge; -extern AISTATE gillBeastSwimGoto; -extern AISTATE gillBeastSwimSearch; -extern AISTATE gillBeastSwimBite; -extern AISTATE gillBeastSwimRecoil; -extern AISTATE gillBeast13A138; -extern AISTATE gillBeast13A154; -extern AISTATE gillBeast13A170; - -END_BLD_NS diff --git a/source/blood/src/aihand.cpp b/source/blood/src/aihand.cpp index 7a5d4d583..19ee7ea27 100644 --- a/source/blood/src/aihand.cpp +++ b/source/blood/src/aihand.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aihand.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aihand.h b/source/blood/src/aihand.h deleted file mode 100644 index 247dc35f3..000000000 --- a/source/blood/src/aihand.h +++ /dev/null @@ -1,36 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE handIdle; -extern AISTATE hand13A3B4; -extern AISTATE handSearch; -extern AISTATE handChase; -extern AISTATE handRecoil; -extern AISTATE handGoto; -extern AISTATE handJump; - -END_BLD_NS diff --git a/source/blood/src/aihound.cpp b/source/blood/src/aihound.cpp index c4d608743..c17d2c835 100644 --- a/source/blood/src/aihound.cpp +++ b/source/blood/src/aihound.cpp @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aihound.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aihound.h b/source/blood/src/aihound.h deleted file mode 100644 index dcb3579c7..000000000 --- a/source/blood/src/aihound.h +++ /dev/null @@ -1,37 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE houndIdle; -extern AISTATE houndSearch; -extern AISTATE houndChase; -extern AISTATE houndRecoil; -extern AISTATE houndTeslaRecoil; -extern AISTATE houndGoto; -extern AISTATE houndBite; -extern AISTATE houndBurn; - -END_BLD_NS diff --git a/source/blood/src/aiinnoc.cpp b/source/blood/src/aiinnoc.cpp index b90a09d70..cd3379288 100644 --- a/source/blood/src/aiinnoc.cpp +++ b/source/blood/src/aiinnoc.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aiinnoc.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aiinnoc.h b/source/blood/src/aiinnoc.h deleted file mode 100644 index 8bdff897d..000000000 --- a/source/blood/src/aiinnoc.h +++ /dev/null @@ -1,35 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE innocentIdle; -extern AISTATE innocentSearch; -extern AISTATE innocentChase; -extern AISTATE innocentRecoil; -extern AISTATE innocentTeslaRecoil; -extern AISTATE innocentGoto; - -END_BLD_NS diff --git a/source/blood/src/aipod.cpp b/source/blood/src/aipod.cpp index 6683f3aae..aabfdba1d 100644 --- a/source/blood/src/aipod.cpp +++ b/source/blood/src/aipod.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aipod.h" +#include "aistate.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aipod.h b/source/blood/src/aipod.h deleted file mode 100644 index 826e6ad31..000000000 --- a/source/blood/src/aipod.h +++ /dev/null @@ -1,45 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE podIdle; -extern AISTATE pod13A600; -extern AISTATE podSearch; -extern AISTATE pod13A638; -extern AISTATE podRecoil; -extern AISTATE podChase; -extern AISTATE tentacleIdle; -extern AISTATE tentacle13A6A8; -extern AISTATE tentacle13A6C4; -extern AISTATE tentacle13A6E0; -extern AISTATE tentacle13A6FC; -extern AISTATE tentacle13A718; -extern AISTATE tentacleSearch; -extern AISTATE tentacle13A750; -extern AISTATE tentacleRecoil; -extern AISTATE tentacleChase; - -END_BLD_NS diff --git a/source/blood/src/airat.cpp b/source/blood/src/airat.cpp index 214fe1ce8..21d8c337f 100644 --- a/source/blood/src/airat.cpp +++ b/source/blood/src/airat.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "airat.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/airat.h b/source/blood/src/airat.h deleted file mode 100644 index d44af86bf..000000000 --- a/source/blood/src/airat.h +++ /dev/null @@ -1,36 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE ratIdle; -extern AISTATE ratSearch; -extern AISTATE ratChase; -extern AISTATE ratDodge; -extern AISTATE ratRecoil; -extern AISTATE ratGoto; -extern AISTATE ratBite; - -END_BLD_NS diff --git a/source/blood/src/aispid.cpp b/source/blood/src/aispid.cpp index 6cc349569..d8e3456aa 100644 --- a/source/blood/src/aispid.cpp +++ b/source/blood/src/aispid.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aispid.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aispid.h b/source/blood/src/aispid.h deleted file mode 100644 index 722f581b5..000000000 --- a/source/blood/src/aispid.h +++ /dev/null @@ -1,37 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE spidIdle; -extern AISTATE spidChase; -extern AISTATE spidDodge; -extern AISTATE spidGoto; -extern AISTATE spidSearch; -extern AISTATE spidBite; -extern AISTATE spidJump; -extern AISTATE spid13A92C; - -END_BLD_NS diff --git a/source/blood/src/aistate.h b/source/blood/src/aistate.h new file mode 100644 index 000000000..c96cdf128 --- /dev/null +++ b/source/blood/src/aistate.h @@ -0,0 +1,358 @@ +//------------------------------------------------------------------------- +/* +Copyright (C) 2010-2019 EDuke32 developers and contributors +Copyright (C) 2019 Nuke.YKT + +This file is part of NBlood. + +NBlood is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 2 +as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +//------------------------------------------------------------------------- +#pragma once +#include "ai.h" + +BEGIN_BLD_NS + +extern AISTATE batIdle; +extern AISTATE batFlyIdle; +extern AISTATE batChase; +extern AISTATE batPonder; +extern AISTATE batGoto; +extern AISTATE batBite; +extern AISTATE batRecoil; +extern AISTATE batSearch; +extern AISTATE batSwoop; +extern AISTATE batFly; +extern AISTATE batTurn; +extern AISTATE batHide; +extern AISTATE batDodgeUp; +extern AISTATE batDodgeUpRight; +extern AISTATE batDodgeUpLeft; +extern AISTATE batDodgeDown; +extern AISTATE batDodgeDownRight; +extern AISTATE batDodgeDownLeft; + +extern AISTATE beastIdle; +extern AISTATE beastChase; +extern AISTATE beastDodge; +extern AISTATE beastGoto; +extern AISTATE beastSlash; +extern AISTATE beastStomp; +extern AISTATE beastSearch; +extern AISTATE beastRecoil; +extern AISTATE beastTeslaRecoil; +extern AISTATE beastSwimIdle; +extern AISTATE beastSwimChase; +extern AISTATE beastSwimDodge; +extern AISTATE beastSwimGoto; +extern AISTATE beastSwimSearch; +extern AISTATE beastSwimSlash; +extern AISTATE beastSwimRecoil; +extern AISTATE beastMorphToBeast; +extern AISTATE beastMorphFromCultist; +extern AISTATE beast138FB4; +extern AISTATE beast138FD0; +extern AISTATE beast138FEC; + +extern AISTATE eelIdle; +extern AISTATE eelFlyIdle; +extern AISTATE eelChase; +extern AISTATE eelPonder; +extern AISTATE eelGoto; +extern AISTATE eelBite; +extern AISTATE eelRecoil; +extern AISTATE eelSearch; +extern AISTATE eelSwoop; +extern AISTATE eelFly; +extern AISTATE eelTurn; +extern AISTATE eelHide; +extern AISTATE eelDodgeUp; +extern AISTATE eelDodgeUpRight; +extern AISTATE eelDodgeUpLeft; +extern AISTATE eelDodgeDown; +extern AISTATE eelDodgeDownRight; +extern AISTATE eelDodgeDownLeft; + +extern AISTATE cultistBurnIdle; +extern AISTATE cultistBurnChase; +extern AISTATE cultistBurnGoto; +extern AISTATE cultistBurnSearch; +extern AISTATE cultistBurnAttack; +extern AISTATE zombieABurnChase; +extern AISTATE zombieABurnGoto; +extern AISTATE zombieABurnSearch; +extern AISTATE zombieABurnAttack; +extern AISTATE zombieFBurnChase; +extern AISTATE zombieFBurnGoto; +extern AISTATE zombieFBurnSearch; +extern AISTATE zombieFBurnAttack; +extern AISTATE innocentBurnChase; +extern AISTATE innocentBurnGoto; +extern AISTATE innocentBurnSearch; +extern AISTATE innocentBurnAttack; +extern AISTATE beastBurnChase; +extern AISTATE beastBurnGoto; +extern AISTATE beastBurnSearch; +extern AISTATE beastBurnAttack; +extern AISTATE tinycalebBurnChase; +extern AISTATE tinycalebBurnGoto; +extern AISTATE tinycalebBurnSearch; +extern AISTATE tinycalebBurnAttack; +extern AISTATE genDudeBurnIdle; +extern AISTATE genDudeBurnChase; +extern AISTATE genDudeBurnGoto; +extern AISTATE genDudeBurnSearch; +extern AISTATE genDudeBurnAttack; + +extern AISTATE tinycalebIdle; +extern AISTATE tinycalebChase; +extern AISTATE tinycalebDodge; +extern AISTATE tinycalebGoto; +extern AISTATE tinycalebAttack; +extern AISTATE tinycalebSearch; +extern AISTATE tinycalebRecoil; +extern AISTATE tinycalebTeslaRecoil; +extern AISTATE tinycalebSwimIdle; +extern AISTATE tinycalebSwimChase; +extern AISTATE tinycalebSwimDodge; +extern AISTATE tinycalebSwimGoto; +extern AISTATE tinycalebSwimSearch; +extern AISTATE tinycalebSwimAttack; +extern AISTATE tinycalebSwimRecoil; +extern AISTATE tinycaleb139660; +extern AISTATE tinycaleb13967C; +extern AISTATE tinycaleb139698; + +extern AISTATE cerberusIdle; +extern AISTATE cerberusSearch; +extern AISTATE cerberusChase; +extern AISTATE cerberusRecoil; +extern AISTATE cerberusTeslaRecoil; +extern AISTATE cerberusGoto; +extern AISTATE cerberusBite; +extern AISTATE cerberusBurn; +extern AISTATE cerberus3Burn; +extern AISTATE cerberus2Idle; +extern AISTATE cerberus2Search; +extern AISTATE cerberus2Chase; +extern AISTATE cerberus2Recoil; +extern AISTATE cerberus2Goto; +extern AISTATE cerberus2Bite; +extern AISTATE cerberus2Burn; +extern AISTATE cerberus4Burn; +extern AISTATE cerberus139890; +extern AISTATE cerberus1398AC; + +extern AISTATE cultistIdle; +extern AISTATE cultistProneIdle; +extern AISTATE fanaticProneIdle; +extern AISTATE cultistProneIdle3; +extern AISTATE cultistChase; +extern AISTATE fanaticChase; +extern AISTATE cultistDodge; +extern AISTATE cultistGoto; +extern AISTATE cultistProneChase; +extern AISTATE cultistProneDodge; +extern AISTATE cultistTThrow; +extern AISTATE cultistSThrow; +extern AISTATE cultistTsThrow; +extern AISTATE cultistDThrow; +extern AISTATE cultist139A78; +extern AISTATE cultist139A94; +extern AISTATE cultist139AB0; +extern AISTATE cultist139ACC; +extern AISTATE cultist139AE8; +extern AISTATE cultistSearch; +extern AISTATE cultistSFire; +extern AISTATE cultistTFire; +extern AISTATE cultistTsFire; +extern AISTATE cultistSProneFire; +extern AISTATE cultistTProneFire; +extern AISTATE cultistTsProneFire; +extern AISTATE cultistRecoil; +extern AISTATE cultistProneRecoil; +extern AISTATE cultistTeslaRecoil; +extern AISTATE cultistSwimIdle; +extern AISTATE cultistSwimChase; +extern AISTATE cultistSwimDodge; +extern AISTATE cultistSwimGoto; +extern AISTATE cultistSwimSearch; +extern AISTATE cultistSSwimFire; +extern AISTATE cultistTSwimFire; +extern AISTATE cultistTsSwimFire; +extern AISTATE cultistSwimRecoil; + +extern AISTATE gargoyleFIdle; +extern AISTATE gargoyleStatueIdle; +extern AISTATE gargoyleFChase; +extern AISTATE gargoyleFGoto; +extern AISTATE gargoyleFSlash; +extern AISTATE gargoyleFThrow; +extern AISTATE gargoyleSThrow; +extern AISTATE gargoyleSBlast; +extern AISTATE gargoyleFRecoil; +extern AISTATE gargoyleFSearch; +extern AISTATE gargoyleFMorph2; +extern AISTATE gargoyleFMorph; +extern AISTATE gargoyleSMorph2; +extern AISTATE gargoyleSMorph; +extern AISTATE gargoyleSwoop; +extern AISTATE gargoyleFly; +extern AISTATE gargoyleTurn; +extern AISTATE gargoyleDodgeUp; +extern AISTATE gargoyleFDodgeUpRight; +extern AISTATE gargoyleFDodgeUpLeft; +extern AISTATE gargoyleDodgeDown; +extern AISTATE gargoyleFDodgeDownRight; +extern AISTATE gargoyleFDodgeDownLeft; +extern AISTATE statueFBreakSEQ; +extern AISTATE statueSBreakSEQ; + +extern AISTATE ghostIdle; +extern AISTATE ghostChase; +extern AISTATE ghostGoto; +extern AISTATE ghostSlash; +extern AISTATE ghostThrow; +extern AISTATE ghostBlast; +extern AISTATE ghostRecoil; +extern AISTATE ghostTeslaRecoil; +extern AISTATE ghostSearch; +extern AISTATE ghostSwoop; +extern AISTATE ghostFly; +extern AISTATE ghostTurn; +extern AISTATE ghostDodgeUp; +extern AISTATE ghostDodgeUpRight; +extern AISTATE ghostDodgeUpLeft; +extern AISTATE ghostDodgeDown; +extern AISTATE ghostDodgeDownRight; +extern AISTATE ghostDodgeDownLeft; + +extern AISTATE gillBeastIdle; +extern AISTATE gillBeastChase; +extern AISTATE gillBeastDodge; +extern AISTATE gillBeastGoto; +extern AISTATE gillBeastBite; +extern AISTATE gillBeastSearch; +extern AISTATE gillBeastRecoil; +extern AISTATE gillBeastSwimIdle; +extern AISTATE gillBeastSwimChase; +extern AISTATE gillBeastSwimDodge; +extern AISTATE gillBeastSwimGoto; +extern AISTATE gillBeastSwimSearch; +extern AISTATE gillBeastSwimBite; +extern AISTATE gillBeastSwimRecoil; +extern AISTATE gillBeast13A138; +extern AISTATE gillBeast13A154; +extern AISTATE gillBeast13A170; + +extern AISTATE handIdle; +extern AISTATE hand13A3B4; +extern AISTATE handSearch; +extern AISTATE handChase; +extern AISTATE handRecoil; +extern AISTATE handGoto; +extern AISTATE handJump; + +extern AISTATE houndIdle; +extern AISTATE houndSearch; +extern AISTATE houndChase; +extern AISTATE houndRecoil; +extern AISTATE houndTeslaRecoil; +extern AISTATE houndGoto; +extern AISTATE houndBite; +extern AISTATE houndBurn; + +extern AISTATE innocentIdle; +extern AISTATE innocentSearch; +extern AISTATE innocentChase; +extern AISTATE innocentRecoil; +extern AISTATE innocentTeslaRecoil; +extern AISTATE innocentGoto; + +extern AISTATE podIdle; +extern AISTATE pod13A600; +extern AISTATE podSearch; +extern AISTATE pod13A638; +extern AISTATE podRecoil; +extern AISTATE podChase; +extern AISTATE tentacleIdle; +extern AISTATE tentacle13A6A8; +extern AISTATE tentacle13A6C4; +extern AISTATE tentacle13A6E0; +extern AISTATE tentacle13A6FC; +extern AISTATE tentacle13A718; +extern AISTATE tentacleSearch; +extern AISTATE tentacle13A750; +extern AISTATE tentacleRecoil; +extern AISTATE tentacleChase; + +extern AISTATE ratIdle; +extern AISTATE ratSearch; +extern AISTATE ratChase; +extern AISTATE ratDodge; +extern AISTATE ratRecoil; +extern AISTATE ratGoto; +extern AISTATE ratBite; + +extern AISTATE spidIdle; +extern AISTATE spidChase; +extern AISTATE spidDodge; +extern AISTATE spidGoto; +extern AISTATE spidSearch; +extern AISTATE spidBite; +extern AISTATE spidJump; +extern AISTATE spid13A92C; + +extern AISTATE tchernobogIdle; +extern AISTATE tchernobogSearch; +extern AISTATE tchernobogChase; +extern AISTATE tchernobogRecoil; +extern AISTATE tcherno13A9B8; +extern AISTATE tcherno13A9D4; +extern AISTATE tcherno13A9F0; +extern AISTATE tcherno13AA0C; +extern AISTATE tcherno13AA28; + +extern AISTATE zombieAIdle; +extern AISTATE zombieAChase; +extern AISTATE zombieAPonder; +extern AISTATE zombieAGoto; +extern AISTATE zombieAHack; +extern AISTATE zombieASearch; +extern AISTATE zombieARecoil; +extern AISTATE zombieATeslaRecoil; +extern AISTATE zombieARecoil2; +extern AISTATE zombieAStand; +extern AISTATE zombieEIdle; +extern AISTATE zombieEUp2; +extern AISTATE zombieEUp; +extern AISTATE zombie2Idle; +extern AISTATE zombie2Search; +extern AISTATE zombieSIdle; +extern AISTATE zombie13AC2C; + +extern AISTATE zombieFIdle; +extern AISTATE zombieFChase; +extern AISTATE zombieFGoto; +extern AISTATE zombieFDodge; +extern AISTATE zombieFHack; +extern AISTATE zombieFPuke; +extern AISTATE zombieFThrow; +extern AISTATE zombieFSearch; +extern AISTATE zombieFRecoil; +extern AISTATE zombieFTeslaRecoil; + + +END_BLD_NS diff --git a/source/blood/src/aitchern.cpp b/source/blood/src/aitchern.cpp index a1b59a680..cdc9da23e 100644 --- a/source/blood/src/aitchern.cpp +++ b/source/blood/src/aitchern.cpp @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aitchern.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aitchern.h b/source/blood/src/aitchern.h deleted file mode 100644 index 6e16bbc67..000000000 --- a/source/blood/src/aitchern.h +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE tchernobogIdle; -extern AISTATE tchernobogSearch; -extern AISTATE tchernobogChase; -extern AISTATE tchernobogRecoil; -extern AISTATE tcherno13A9B8; -extern AISTATE tcherno13A9D4; -extern AISTATE tcherno13A9F0; -extern AISTATE tcherno13AA0C; -extern AISTATE tcherno13AA28; - -END_BLD_NS diff --git a/source/blood/src/aiunicult.cpp b/source/blood/src/aiunicult.cpp index 7e3766733..971575bc4 100644 --- a/source/blood/src/aiunicult.cpp +++ b/source/blood/src/aiunicult.cpp @@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" +#include "aistate.h" #include "aiunicult.h" #include "blood.h" #include "db.h" @@ -54,7 +55,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "raze_sound.h" #include "gib.h" -#include "aiburn.h" BEGIN_BLD_NS static void genDudeAttack1(int, int); diff --git a/source/blood/src/aizomba.cpp b/source/blood/src/aizomba.cpp index 711fe6aaf..27aa72179 100644 --- a/source/blood/src/aizomba.cpp +++ b/source/blood/src/aizomba.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aizomba.h" +#include "aistate.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aizomba.h b/source/blood/src/aizomba.h deleted file mode 100644 index fb5fc622a..000000000 --- a/source/blood/src/aizomba.h +++ /dev/null @@ -1,46 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE zombieAIdle; -extern AISTATE zombieAChase; -extern AISTATE zombieAPonder; -extern AISTATE zombieAGoto; -extern AISTATE zombieAHack; -extern AISTATE zombieASearch; -extern AISTATE zombieARecoil; -extern AISTATE zombieATeslaRecoil; -extern AISTATE zombieARecoil2; -extern AISTATE zombieAStand; -extern AISTATE zombieEIdle; -extern AISTATE zombieEUp2; -extern AISTATE zombieEUp; -extern AISTATE zombie2Idle; -extern AISTATE zombie2Search; -extern AISTATE zombieSIdle; -extern AISTATE zombie13AC2C; - -END_BLD_NS diff --git a/source/blood/src/aizombf.cpp b/source/blood/src/aizombf.cpp index 2ec3b6f6a..08379826d 100644 --- a/source/blood/src/aizombf.cpp +++ b/source/blood/src/aizombf.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actor.h" #include "ai.h" -#include "aizombf.h" #include "blood.h" #include "db.h" #include "dude.h" diff --git a/source/blood/src/aizombf.h b/source/blood/src/aizombf.h deleted file mode 100644 index a7a06608f..000000000 --- a/source/blood/src/aizombf.h +++ /dev/null @@ -1,39 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010-2019 EDuke32 developers and contributors -Copyright (C) 2019 Nuke.YKT - -This file is part of NBlood. - -NBlood is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -//------------------------------------------------------------------------- -#pragma once -#include "ai.h" - -BEGIN_BLD_NS - -extern AISTATE zombieFIdle; -extern AISTATE zombieFChase; -extern AISTATE zombieFGoto; -extern AISTATE zombieFDodge; -extern AISTATE zombieFHack; -extern AISTATE zombieFPuke; -extern AISTATE zombieFThrow; -extern AISTATE zombieFSearch; -extern AISTATE zombieFRecoil; -extern AISTATE zombieFTeslaRecoil; - -END_BLD_NS diff --git a/source/blood/src/loadsave.cpp b/source/blood/src/loadsave.cpp index c55ba0e07..46b935833 100644 --- a/source/blood/src/loadsave.cpp +++ b/source/blood/src/loadsave.cpp @@ -51,25 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "raze_music.h" #include "mapinfo.h" -#include "aibat.h" -#include "aibeast.h" -#include "aiboneel.h" -#include "aiburn.h" -#include "aicaleb.h" -#include "aicerber.h" -#include "aicult.h" -#include "aigarg.h" -#include "aighost.h" -#include "aigilbst.h" -#include "aihand.h" -#include "aihound.h" -#include "aiinnoc.h" -#include "aipod.h" -#include "airat.h" -#include "aispid.h" -#include "aitchern.h" -#include "aizomba.h" -#include "aizombf.h" +#include "aistate.h" #include "aiunicult.h" diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp index af4a09b26..fe5a2d6b5 100644 --- a/source/blood/src/view.cpp +++ b/source/blood/src/view.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "mmulti.h" #include "common_game.h" -#include "aihand.h" +#include "aistate.h" #include "blood.h" #include "choke.h" #include "config.h"