OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-01-08 10:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(WIP) Point 1: step functions

Browse Source
This commit is contained in:
gsemaj
2022-04-12 17:12:08 -04:00
parent 0c4cdaeabf
commit 3d572432b3
6 changed files with 168 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Entities.hpp
View File

@@ -83,6 +83,8 @@ public:
virtual bool isAlive() = 0;
virtual int getCurrentHP() = 0;
virtual int32_t getID() = 0;
virtual void step(time_t currTime) = 0;
};
/*
@@ -122,8 +124,6 @@ struct CombatNPC : public BaseNPC, public ICombatant {
int level = 0;
int speed = 300;
void (*_stepAI)(CombatNPC*, time_t) = nullptr;
CombatNPC(int x, int y, int z, int angle, uint64_t iID, int t, int id, int maxHP)
: BaseNPC(angle, iID, t, id), maxHealth(maxHP) {
spawnX = x;
@@ -131,11 +131,6 @@ struct CombatNPC : public BaseNPC, public ICombatant {
spawnZ = z;
}
virtual void stepAI(time_t currTime) {
if (_stepAI != nullptr)
_stepAI(this, currTime);
}
virtual bool isExtant() override { return hp > 0; }
virtual int takeDamage(EntityRef src, int amt) override;
@@ -143,6 +138,7 @@ struct CombatNPC : public BaseNPC, public ICombatant {
virtual bool isAlive() override;
virtual int getCurrentHP() override;
virtual int32_t getID() override;
virtual void step(time_t currTime) override;
};
// Mob is in MobAI.hpp, Player is in Player.hpp