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

Get rid of cbf

Browse Source
This commit is contained in:
gsemaj
2023-07-25 10:43:48 -04:00
committed by gsemaj
parent e7450b974c
commit e9cd5db8a2
5 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities.hpp
View File

@@ -73,7 +73,6 @@ public:
int type;
int hp;
int angle;
int cbf;
bool loopingPath = false;
BaseNPC(int _A, uint64_t iID, int t, int _id) {
@@ -81,7 +80,6 @@ public:
type = t;
hp = 400;
angle = _A;
cbf = 0;
id = _id;
instanceID = iID;
};
@@ -89,7 +87,7 @@ public:
virtual void enterIntoViewOf(CNSocket *sock) override;
virtual void disappearFromViewOf(CNSocket *sock) override;
sNPCAppearanceData getAppearanceData();
virtual sNPCAppearanceData getAppearanceData();
};
struct CombatNPC : public BaseNPC, public ICombatant {
@@ -118,6 +116,8 @@ struct CombatNPC : public BaseNPC, public ICombatant {
transitionHandlers[AIState::INACTIVE] = {};
}
virtual sNPCAppearanceData getAppearanceData() override;
virtual bool isExtant() override { return hp > 0; }
virtual bool addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCallback<time_t> onTick, BuffStack* stack) override;