OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-10-20 20:30:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generalize NPC AI stepping logic

Browse Source 
The MobAI::Mobs map still needs to be removed.
This commit is contained in:
dongresource
2021-03-31 21:05:49 +02:00
parent 3325397d17
commit 65462d01e3
7 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Entities.hpp
View File

@@ -30,12 +30,8 @@ struct Entity {
virtual bool isAlive() { return true; }
// stubs
virtual void enterIntoViewOf(CNSocket *sock) {}
virtual void disappearFromViewOf(CNSocket *sock) {}
// we don't want objects of this base class to exist
protected:
Entity() {}
virtual void enterIntoViewOf(CNSocket *sock) = 0;
virtual void disappearFromViewOf(CNSocket *sock) = 0;
};
struct EntityRef {
@@ -106,16 +102,16 @@ struct CombatNPC : public BaseNPC {
int spawnZ = 0;
int level = 0;
void (*_stepAI)() = nullptr;
void (*_stepAI)(CombatNPC*, time_t) = nullptr;
// XXX
CombatNPC(int x, int y, int z, int angle, uint64_t iID, int t, int id, int maxHP) :
BaseNPC(x, y, z, angle, iID, t, id),
maxHealth(maxHP) {}
virtual void stepAI() {
virtual void stepAI(time_t currTime) {
if (_stepAI != nullptr)
_stepAI();
_stepAI(this, currTime);
}
virtual bool isAlive() override { return appearanceData.iHP > 0; }