Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-30 21:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into cdclient-rework

Browse Source
This commit is contained in:
Wincent Holm
2022-07-18 16:44:53 +02:00
parent db7f7c60b2 ef8c2a40f3
commit 45ae46f6f1
73 changed files with 1959 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/dBehaviors/Behavior.cpp
View File

@@ -409,7 +409,7 @@ Behavior::Behavior(const uint32_t behaviorId)
{
auto behaviorTemplateTable = CDClientManager::Instance()->GetTable<CDBehaviorTemplateTable>("BehaviorTemplate");
CDBehaviorTemplate templateInDatabase;
CDBehaviorTemplate templateInDatabase{};
if (behaviorTemplateTable) {
auto templateEntry = behaviorTemplateTable->GetByBehaviorID(behaviorId);
@@ -445,7 +445,7 @@ Behavior::Behavior(const uint32_t behaviorId)
this->m_effectId = templateInDatabase.effectID;
this->m_effectHandle = templateInDatabase.effectHandle != "" ? new std::string(templateInDatabase.effectHandle) : nullptr;
this->m_effectHandle = *templateInDatabase.effectHandle != "" ? new std::string(*templateInDatabase.effectHandle) : nullptr;
}