From de6eae7e0f9f0d7e7440a4f9cf6ee73df1b2c1ee Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 16 Nov 2019 17:36:07 +0800 Subject: [PATCH] Fix again. This needs to be fixed properly --- .../ryzom/server/src/entities_game_service/database_guild.cpp | 2 +- code/ryzom/server/src/entities_game_service/database_guild.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ryzom/server/src/entities_game_service/database_guild.cpp b/code/ryzom/server/src/entities_game_service/database_guild.cpp index c79d41e7e..b268d6ca9 100644 --- a/code/ryzom/server/src/entities_game_service/database_guild.cpp +++ b/code/ryzom/server/src/entities_game_service/database_guild.cpp @@ -511,7 +511,7 @@ void CBankAccessor_GUILD::TGUILD::TOUTPOST::TO::TSQUADS::init(ICDBStructNode *pa { node = parent->getNode( ICDBStructNode::CTextId(NLMISC::toString("SP%u", i)), false ); nlassert(node != NULL); - _SP[i].init(node, i); + C_SP[i].init(node, i); } for (uint i=0; i<24; ++i) diff --git a/code/ryzom/server/src/entities_game_service/database_guild.h b/code/ryzom/server/src/entities_game_service/database_guild.h index b9b28b7a2..f42937065 100644 --- a/code/ryzom/server/src/entities_game_service/database_guild.h +++ b/code/ryzom/server/src/entities_game_service/database_guild.h @@ -967,7 +967,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C private: ICDBStructNode *_BranchNode; - TSP _SP[24]; + TSP C_SP[24]; TT _T[24]; @@ -983,7 +983,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C TSP &getSP(uint32 index) { nlassert(index < 24); - return _SP[index]; + return C_SP[index]; } TT &getT(uint32 index) {