Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-05 18:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

make LoadFromXml usage consistent across comps (#673)

Browse Source
This commit is contained in:
Aaron Kimbrell
2022-07-24 21:03:22 -05:00
committed by GitHub
parent 9ed4a4f47f
commit a7fb6eb3f3
10 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dGame/Entity.cpp
View File

@@ -252,7 +252,7 @@ void Entity::Initialize()
ControllablePhysicsComponent* controllablePhysics = new ControllablePhysicsComponent(this);
if (m_Character) {
controllablePhysics->LoadFromXML(m_Character->GetXMLDoc());
controllablePhysics->LoadFromXml(m_Character->GetXMLDoc());
const auto mapID = Game::server->GetZoneID();
@@ -362,7 +362,7 @@ void Entity::Initialize()
if (buffComponentID > 0 || collectibleComponentID > 0) {
DestroyableComponent* comp = new DestroyableComponent(this);
if (m_Character) {
comp->LoadFromXML(m_Character->GetXMLDoc());
comp->LoadFromXml(m_Character->GetXMLDoc());
}
else {
if (componentID > 0) {
@@ -448,8 +448,9 @@ void Entity::Initialize()
m_Components.insert(std::make_pair(COMPONENT_TYPE_PLAYER_FORCED_MOVEMENT, new PlayerForcedMovementComponent(this)));
CharacterComponent* comp = new CharacterComponent(this, m_Character);
m_Components.insert(std::make_pair(COMPONENT_TYPE_CHARACTER, comp));
CharacterComponent* charComp = new CharacterComponent(this, m_Character);
charComp->LoadFromXml(m_Character->GetXMLDoc());
m_Components.insert(std::make_pair(COMPONENT_TYPE_CHARACTER, charComp));
}
if (compRegistryTable->GetByIDAndType(m_TemplateID, COMPONENT_TYPE_INVENTORY) > 0 || m_Character) {