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 3f5cc03df..90014e7e2 100644
--- a/code/ryzom/server/src/entities_game_service/database_guild.cpp
+++ b/code/ryzom/server/src/entities_game_service/database_guild.cpp
@@ -1,3 +1,4 @@
+
// Ryzom - MMORPG Framework
// Copyright (C) 2010 Winch Gate Property Limited
//
@@ -15,8 +16,20 @@
// along with this program. If not, see .
/////////////////////////////////////////////////////////////////
-// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+//
/////////////////////////////////////////////////////////////////
+
#include "stdpch.h"
#include "database_guild.h"
@@ -138,7 +151,7 @@ void CBankAccessor_GUILD::TGUILD::TFAME::init(ICDBStructNode *parent)
// branch init
- for (uint i=0; i<6; ++i)
+ for (uint i=0; i<7; ++i)
{
node = parent->getNode( ICDBStructNode::CTextId(NLMISC::toString("%u", i)), false );
nlassert(node != NULL);
@@ -509,7 +522,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);
+ _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 13bec33d6..fb8611cf5 100644
--- a/code/ryzom/server/src/entities_game_service/database_guild.h
+++ b/code/ryzom/server/src/entities_game_service/database_guild.h
@@ -1,3 +1,7 @@
+
+
+#ifndef INCLUDED_database_GUILD_H
+#define INCLUDED_database_GUILD_H
// Ryzom - MMORPG Framework
// Copyright (C) 2010 Winch Gate Property Limited
//
@@ -14,11 +18,19 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-
-#ifndef INCLUDED_database_GUILD_H
-#define INCLUDED_database_GUILD_H
/////////////////////////////////////////////////////////////////
-// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+//
/////////////////////////////////////////////////////////////////
#include "nel/misc/string_common.h"
@@ -28,16 +40,13 @@
#include "game_share/far_position.h"
-
-inline void _setProp(CCDBSynchronised &db, ICDBStructNode *node, TCharConnectionState value, bool forceSending = false)
-{
- db.x_setProp(node, uint64(value), forceSending);
-}
-inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, TCharConnectionState &value)
-{
- value = (TCharConnectionState)db.x_getProp(node);
-}
-
+ inline void _setProp(CCDBSynchronised &db,
+ ICDBStructNode *node, TCharConnectionState value, bool
+ forceSending = false) { db.x_setProp(node, uint64(value),
+ forceSending); } inline void _getProp(const CCDBSynchronised
+ &db, ICDBStructNode *node, TCharConnectionState
+ &value) { value =
+ (TCharConnectionState)db.x_getProp(node); }
#ifndef _SET_PROP_ACCESSOR_
@@ -151,15 +160,15 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
class TGUILD
- {
+ {
public:
class TFAME
- {
+ {
public:
class TArray
- {
+ {
public:
@@ -249,7 +258,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
ICDBStructNode *_CULT_ALLEGIANCE;
ICDBStructNode *_CIV_ALLEGIANCE;
- TArray _Array[6];
+ TArray _Array[7];
public:
@@ -309,18 +318,18 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
}
TArray &getArray(uint32 index)
{
- nlassert(index < 6);
+ nlassert(index < 7);
return _Array[index];
}
};
class TMEMBERS
- {
+ {
public:
class TArray
- {
+ {
public:
@@ -465,7 +474,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
class TINVENTORY
- {
+ {
public:
@@ -529,6 +538,8 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
void setMONEY(CCDBGroup &dbGroup, uint64 value, bool forceSending = false)
{
+
+
_setProp(dbGroup.Database, _MONEY, value, forceSending);
}
@@ -548,15 +559,15 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
class TOUTPOST
- {
+ {
public:
class TO
- {
+ {
public:
class TGUILD
- {
+ {
public:
@@ -686,11 +697,11 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
class TSQUAD_SPAWN_ZONE
- {
+ {
public:
class TArray
- {
+ {
public:
@@ -778,11 +789,11 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
class TSQUAD_SHOP
- {
+ {
public:
class TArray
- {
+ {
public:
@@ -849,11 +860,11 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
class TSQUADS
- {
+ {
public:
class TSP
- {
+ {
public:
@@ -896,7 +907,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
class TT
- {
+ {
public:
@@ -961,17 +972,19 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
}
};
+
private:
ICDBStructNode *_BranchNode;
- TSP __SP[24];
+ TSP _SP[24];
TT _T[24];
+
public:
void init(ICDBStructNode *parent);
- // accessors to branch node
+ // accessor to branch node
ICDBStructNode *getCDBNode()
{
return _BranchNode;
@@ -980,7 +993,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
TSP &getSP(uint32 index)
{
nlassert(index < 24);
- return __SP[index];
+ return _SP[index];
}
TT &getT(uint32 index)
{
@@ -991,11 +1004,11 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
class TBUILDINGS
- {
+ {
public:
class TArray
- {
+ {
public:
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.cpp b/code/ryzom/server/src/entities_game_service/database_plr.cpp
index e76c9f0b4..0b599ddaa 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.cpp
+++ b/code/ryzom/server/src/entities_game_service/database_plr.cpp
@@ -1,3 +1,4 @@
+
// Ryzom - MMORPG Framework
// Copyright (C) 2010 Winch Gate Property Limited
//
@@ -15,8 +16,20 @@
// along with this program. If not, see .
/////////////////////////////////////////////////////////////////
-// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+//
/////////////////////////////////////////////////////////////////
+
#include "stdpch.h"
#include "database_plr.h"
@@ -377,7 +390,7 @@ void CBankAccessor_PLR::TUSER::init(ICDBStructNode *parent)
_SKILL_POINTS_[i].init(node, i);
}
- for (uint i=0; i<6; ++i)
+ for (uint i=0; i<7; ++i)
{
node = parent->getNode( ICDBStructNode::CTextId(NLMISC::toString("FACTION_POINTS_%u", i)), false );
nlassert(node != NULL);
@@ -3180,7 +3193,7 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
nlassert(node != NULL);
_DESPAWN = node;
- node = parent->getNode( ICDBStructNode::CTextId("NAME"), true );
+ node = parent->getNode( ICDBStructNode::CTextId("NAME"), false );
nlassert(node != NULL);
_NAME = node;
@@ -3363,7 +3376,7 @@ void CBankAccessor_PLR::TFAME::init(ICDBStructNode *parent)
// branch init
- for (uint i=0; i<6; ++i)
+ for (uint i=0; i<7; ++i)
{
node = parent->getNode( ICDBStructNode::CTextId(NLMISC::toString("PLAYER%u", i)), false );
nlassert(node != NULL);
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.h b/code/ryzom/server/src/entities_game_service/database_plr.h
index bef0cb796..9396fb7b4 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.h
+++ b/code/ryzom/server/src/entities_game_service/database_plr.h
@@ -1,3 +1,7 @@
+
+
+#ifndef INCLUDED_database_PLR_H
+#define INCLUDED_database_PLR_H
// Ryzom - MMORPG Framework
// Copyright (C) 2010 Winch Gate Property Limited
//
@@ -14,11 +18,19 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-
-#ifndef INCLUDED_DATABASE_PLR_H
-#define INCLUDED_DATABASE_PLR_H
/////////////////////////////////////////////////////////////////
-// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+// WARNING : this is a generated file, don't change it !
+//
+//
+//
+//
+//
+//
/////////////////////////////////////////////////////////////////
#include "nel/misc/string_common.h"
@@ -493,7 +505,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
ICDBStructNode *_IS_INVISIBLE;
ICDBStructNode *_COUNTER;
TSKILL_POINTS_ _SKILL_POINTS_[4];
- TFACTION_POINTS_ _FACTION_POINTS_[6];
+ TFACTION_POINTS_ _FACTION_POINTS_[7];
TRRPS_LEVELS _RRPS_LEVELS[6];
TNPC_CONTROL _NPC_CONTROL;
@@ -1003,7 +1015,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
}
TFACTION_POINTS_ &getFACTION_POINTS_(uint32 index)
{
- nlassert(index < 6);
+ nlassert(index < 7);
return _FACTION_POINTS_[index];
}
TRRPS_LEVELS &getRRPS_LEVELS(uint32 index)
@@ -9978,7 +9990,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
ICDBStructNode *_CIV_ALLEGIANCE;
ICDBStructNode *_THRESHOLD_TRADE;
ICDBStructNode *_THRESHOLD_KOS;
- TPLAYER _PLAYER[6];
+ TPLAYER _PLAYER[7];
TTRIBE _TRIBE[53];
@@ -10079,7 +10091,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
}
TPLAYER &getPLAYER(uint32 index)
{
- nlassert(index < 6);
+ nlassert(index < 7);
return _PLAYER[index];
}
TTRIBE &getTRIBE(uint32 index)
@@ -10714,4 +10726,4 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
-#endif // INCLUDED_DATABASE_PLR_H
+#endif // INCLUDED_database_PLR_H