diff --git a/code/ryzom/common/data_common/database.xml b/code/ryzom/common/data_common/database.xml
index d4fcb68aa..b308427ec 100644
--- a/code/ryzom/common/data_common/database.xml
+++ b/code/ryzom/common/data_common/database.xml
@@ -90,7 +90,7 @@
type="I32" />
+ count="7">
@@ -504,7 +504,7 @@
@@ -1117,7 +1117,7 @@
type="I3" />
+ count="7">
@@ -1527,7 +1527,7 @@
+ count="7">
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 b36f09328..8241106bb 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"
@@ -362,7 +375,7 @@ void CBankAccessor_PLR::TUSER::init(ICDBStructNode *parent)
node = parent->getNode( ICDBStructNode::CTextId("IS_INVISIBLE"), false );
nlassert(node != NULL);
_IS_INVISIBLE = node;
-
+
node = parent->getNode( ICDBStructNode::CTextId("COUNTER"), false );
nlassert(node != NULL);
_COUNTER = node;
@@ -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);
@@ -3130,7 +3143,7 @@ void CBankAccessor_PLR::TPACK_ANIMAL::init(ICDBStructNode *parent)
// branch init
- for (uint i=0; i<4; ++i)
+ for (uint i=0; i<7; ++i)
{
node = parent->getNode( ICDBStructNode::CTextId(NLMISC::toString("BEAST%u", i)), false );
nlassert(node != NULL);
@@ -3180,10 +3193,10 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
nlassert(node != NULL);
_DESPAWN = node;
- // WARNING: let the value to true, else it'll corrupt backups
- node = parent->getNode( ICDBStructNode::CTextId("NAME"), true );
+ node = parent->getNode( ICDBStructNode::CTextId("NAME"), false );
nlassert(node != NULL);
_NAME = node;
+
// branch init
@@ -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 23da9b616..887ef483e 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;
@@ -956,6 +968,8 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
void setIS_INVISIBLE(CCDBSynchronised &dbGroup, bool value, bool forceSending = false)
{
+
+
_setProp(dbGroup, _IS_INVISIBLE, value, forceSending);
}
@@ -971,7 +985,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
{
return _IS_INVISIBLE;
}
-
+
void setCOUNTER(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
{
@@ -1001,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)
@@ -1319,7 +1333,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
}
};
-
+
class TTARGET
{
public:
@@ -9081,6 +9095,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
ICDBStructNode *_HUNGER;
ICDBStructNode *_DESPAWN;
ICDBStructNode *_NAME;
+
public:
void init(ICDBStructNode *parent, uint index);
@@ -9269,9 +9284,11 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
{
return _DESPAWN;
}
-
+
void setNAME(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
{
+
+
_setProp(dbGroup, _NAME, value, forceSending);
}
@@ -9282,18 +9299,19 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
return value;
}
-
+
ICDBStructNode *getNAMECDBNode()
{
return _NAME;
}
+
};
private:
ICDBStructNode *_BranchNode;
- TBEAST _BEAST[4];
+ TBEAST _BEAST[7];
public:
@@ -9307,7 +9325,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
TBEAST &getBEAST(uint32 index)
{
- nlassert(index < 4);
+ nlassert(index < 7);
return _BEAST[index];
}
@@ -9972,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];
@@ -10073,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)
@@ -10708,4 +10726,4 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
};
-#endif // INCLUDED_DATABASE_PLR_H
+#endif // INCLUDED_database_PLR_H