Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-06-23 07:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
David Markowitz
2026-06-22 00:13:58 -07:00
parent ef44da055c
commit 361db1853c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/dComponents/ScriptComponent.h
View File

@@ -51,8 +51,10 @@ public:
// Registers a message from a script to be listened for on the parent object // Registers a message from a script to be listened for on the parent object
template<typename ScriptClass, typename DerivedMsgType> template<typename ScriptClass, typename DerivedMsgType>
void RegisterMsg(ScriptClass* scriptThis, bool (ScriptClass::*scriptHandler)(Entity&, DerivedMsgType&)) { void RegisterMsg(ScriptClass* scriptThis, bool (ScriptClass::*scriptHandler)(Entity&, DerivedMsgType&)) {
static_assert(std::is_base_of_v<GameMessages::GameMsg, DerivedMsgType>, "DerivedMsgType must derive from GameMessages::GameMsg base class.");
const auto boundMsg = std::bind(scriptHandler, scriptThis, std::placeholders::_1, std::placeholders::_2); const auto boundMsg = std::bind(scriptHandler, scriptThis, std::placeholders::_1, std::placeholders::_2);
const auto castWrapper = [this, boundMsg](GameMessages::GameMsg& msg) { auto* const parent = m_Parent;
const auto castWrapper = [parent, boundMsg](GameMessages::GameMsg& msg) {
return boundMsg(*m_Parent, static_cast<DerivedMsgType&>(msg)); return boundMsg(*m_Parent, static_cast<DerivedMsgType&>(msg));
}; };
DerivedMsgType msg; DerivedMsgType msg;

1
dScripts/ai/FV/Dragon_Instance/FvDragonInstanceServer.cpp
View File

@@ -9,5 +9,6 @@ void FvDragonInstanceServer::OnPlayerLoaded(Entity* self, Entity* player) {
destComp->SetHealth(destComp->GetMaxHealth()); destComp->SetHealth(destComp->GetMaxHealth());
destComp->SetArmor(destComp->GetMaxArmor()); destComp->SetArmor(destComp->GetMaxArmor());
destComp->SetImagination(destComp->GetMaxImagination()); destComp->SetImagination(destComp->GetMaxImagination());
Game::entityManager->SerializeEntity(player);
} }
} }