Skip to content

Commit bfb3207

Browse files
committed
Revert "Fix element data not working on the client"
This reverts commit 05c8e2f.
1 parent 096a7e9 commit bfb3207

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Client/mods/deathmatch/logic/CClientEntity.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,8 +1391,8 @@ void CClientEntity::AddEntityFromRoot ( unsigned int uiTypeHash, CClientEntity*
13911391
listEntities.push_front ( pEntity );
13921392

13931393
// Apply to child elements as well
1394-
for (auto& pElement : pEntity->GetChildList ())
1395-
CClientEntity::AddEntityFromRoot ( pElement->GetTypeHash (), pElement, false );
1394+
for (auto& pEntity : pEntity->GetChildList ())
1395+
CClientEntity::AddEntityFromRoot ( pEntity->GetTypeHash (), pEntity, false );
13961396

13971397
#if CHECK_ENTITIES_FROM_ROOT
13981398
if ( bDebugCheck )
@@ -1413,8 +1413,8 @@ void CClientEntity::RemoveEntityFromRoot ( unsigned int uiTypeHash, CClientEntit
14131413
}
14141414

14151415
// Apply to child elements as well
1416-
for (auto& pElement : pEntity->GetChildList())
1417-
CClientEntity::RemoveEntityFromRoot (pElement->GetTypeHash(), pElement);
1416+
for (auto& pEntity : pEntity->GetChildList())
1417+
CClientEntity::RemoveEntityFromRoot (pEntity->GetTypeHash(), pEntity);
14181418
}
14191419

14201420
void CClientEntity::GetEntitiesFromRoot ( unsigned int uiTypeHash, lua_State* luaVM, bool bStreamedIn )

Client/mods/deathmatch/logic/CCustomData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
void CCustomData::Copy ( CCustomData* pCustomData )
2121
{
22-
for ( auto& iter : pCustomData->GetData() )
22+
for ( auto& iter : m_Data )
2323
{
2424
Set ( iter.first.c_str (), iter.second.Variable );
2525
}

0 commit comments

Comments
 (0)