OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-24 04:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some stuff from playerTick to player combat step

Browse Source
This commit is contained in:
gsemaj
2022-07-30 21:43:28 -07:00
committed by gsemaj
parent b3e28ddea3
commit 2e572169c0
4 changed files with 62 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Buffs.cpp
View File

@@ -9,7 +9,7 @@ void Buff::tick(time_t currTime) {
auto it = stacks.begin();
while(it != stacks.end()) {
BuffStack& stack = *it;
if(onTick) onTick(self, this, currTime);
//if(onTick) onTick(self, this, currTime);
if(stack.durationTicks == 0) {
BuffStack deadStack = stack;
@@ -22,6 +22,10 @@ void Buff::tick(time_t currTime) {
}
}
void Buff::combatTick(time_t currTime) {
if(onCombatTick) onCombatTick(self, this, currTime);
}
void Buff::clear() {
while(!stacks.empty()) {
BuffStack stack = stacks.back();
@@ -84,9 +88,9 @@ bool Buff::isStale() {
}
/* This will practically never do anything important, but it's here just in case */
void Buff::updateCallbacks(BuffCallback<int, BuffStack*> fOnUpdate, BuffCallback<time_t> fonTick) {
void Buff::updateCallbacks(BuffCallback<int, BuffStack*> fOnUpdate, BuffCallback<time_t> fOnCombatTick) {
if(!onUpdate) onUpdate = fOnUpdate;
if(!onTick) onTick = fonTick;
if(!onCombatTick) onCombatTick = fOnCombatTick;
}
#pragma region Handlers