mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2025-12-23 13:10:19 +00:00
Merge remote-tracking branch 'refs/remotes/origin/main'
Conflicts: CMakeLists.txt dGame/CMakeLists.txt dGame/Entity.cpp dGame/dBehaviors/AttackDelayBehavior.cpp dGame/dBehaviors/PlayEffectBehavior.cpp
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "Recorder.h"
|
||||
|
||||
void PlayEffectBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
|
||||
void PlayEffectBehavior::Handle(BehaviorContext* context, RakNet::BitStream& bitStream, BehaviorBranchContext branch) {
|
||||
const auto& target = branch.target == LWOOBJID_EMPTY ? context->originator : branch.target;
|
||||
|
||||
Cinema::Recording::Recorder::RegisterEffectForActor(target, this->m_effectId);
|
||||
@@ -17,7 +17,7 @@ void PlayEffectBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bit
|
||||
PlayFx(u"", target);
|
||||
}
|
||||
|
||||
void PlayEffectBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
|
||||
void PlayEffectBehavior::Calculate(BehaviorContext* context, RakNet::BitStream& bitStream, BehaviorBranchContext branch) {
|
||||
const auto& target = branch.target == LWOOBJID_EMPTY ? context->originator : branch.target;
|
||||
|
||||
//PlayFx(u"", target);
|
||||
|
||||
Reference in New Issue
Block a user