From fa2bd028a3ca775c8a2b84710aef54834429248e Mon Sep 17 00:00:00 2001 From: Sit Melai Date: Fri, 2 Sep 2016 22:29:22 +0200 Subject: [PATCH] regenerated database_plr.h/.cpp files --- .../entities_game_service/database_plr.cpp | 75 +++--- .../src/entities_game_service/database_plr.h | 251 +++++++++--------- 2 files changed, 156 insertions(+), 170 deletions(-) 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 01c848d3b..a3bb9757e 100644 --- a/code/ryzom/server/src/entities_game_service/database_plr.cpp +++ b/code/ryzom/server/src/entities_game_service/database_plr.cpp @@ -1,18 +1,3 @@ -// Ryzom - MMORPG Framework -// Copyright (C) 2010 Winch Gate Property Limited -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . ///////////////////////////////////////////////////////////////// // WARNING : this is a generated file, don't change it ! @@ -362,7 +347,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; @@ -658,21 +643,21 @@ void CBankAccessor_PLR::TTARGET::TBARS::init(ICDBStructNode *parent) nlassert(node != NULL); _UID = node; - node = parent->getNode( ICDBStructNode::CTextId("HP"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore1"), false ); nlassert(node != NULL); - _HP = node; + _ChaScore1 = node; - node = parent->getNode( ICDBStructNode::CTextId("SAP"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore3"), false ); nlassert(node != NULL); - _SAP = node; + _ChaScore3 = node; - node = parent->getNode( ICDBStructNode::CTextId("STA"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore2"), false ); nlassert(node != NULL); - _STA = node; + _ChaScore2 = node; - node = parent->getNode( ICDBStructNode::CTextId("FOCUS"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore4"), false ); nlassert(node != NULL); - _FOCUS = node; + _ChaScore4 = node; node = parent->getNode( ICDBStructNode::CTextId("PLAYER_LEVEL"), false ); nlassert(node != NULL); @@ -869,17 +854,17 @@ void CBankAccessor_PLR::TGROUP::TArray::init(ICDBStructNode *parent, uint index) nlassert(node != NULL); _NAME = node; - node = parent->getNode( ICDBStructNode::CTextId("HP"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore1"), false ); nlassert(node != NULL); - _HP = node; + _ChaScore1 = node; - node = parent->getNode( ICDBStructNode::CTextId("SAP"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore3"), false ); nlassert(node != NULL); - _SAP = node; + _ChaScore3 = node; - node = parent->getNode( ICDBStructNode::CTextId("STA"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore2"), false ); nlassert(node != NULL); - _STA = node; + _ChaScore2 = node; node = parent->getNode( ICDBStructNode::CTextId("POS"), false ); nlassert(node != NULL); @@ -2559,33 +2544,33 @@ void CBankAccessor_PLR::TEXECUTE_PHRASE::TLINK::TArray::init(ICDBStructNode *par nlassert(node != NULL); _COUNTER = node; - node = parent->getNode( ICDBStructNode::CTextId("HP_COST"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore1_COST"), false ); nlassert(node != NULL); - _HP_COST = node; + _ChaScore1_COST = node; - node = parent->getNode( ICDBStructNode::CTextId("SAP_COST"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore3_COST"), false ); nlassert(node != NULL); - _SAP_COST = node; + _ChaScore3_COST = node; - node = parent->getNode( ICDBStructNode::CTextId("STA_COST"), false ); + node = parent->getNode( ICDBStructNode::CTextId("ChaScore2_COST"), false ); nlassert(node != NULL); - _STA_COST = node; + _ChaScore2_COST = node; node = parent->getNode( ICDBStructNode::CTextId("TARGET_NAME"), false ); nlassert(node != NULL); _TARGET_NAME = node; - node = parent->getNode( ICDBStructNode::CTextId("TARGET_HP"), false ); + node = parent->getNode( ICDBStructNode::CTextId("TARGET_ChaScore1"), false ); nlassert(node != NULL); - _TARGET_HP = node; + _TARGET_ChaScore1 = node; - node = parent->getNode( ICDBStructNode::CTextId("TARGET_SAP"), false ); + node = parent->getNode( ICDBStructNode::CTextId("TARGET_ChaScore3"), false ); nlassert(node != NULL); - _TARGET_SAP = node; + _TARGET_ChaScore3 = node; - node = parent->getNode( ICDBStructNode::CTextId("TARGET_STA"), false ); + node = parent->getNode( ICDBStructNode::CTextId("TARGET_ChaScore2"), false ); nlassert(node != NULL); - _TARGET_STA = node; + _TARGET_ChaScore2 = node; // branch init @@ -3139,11 +3124,11 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint node = parent->getNode( ICDBStructNode::CTextId("DESPAWN"), false ); 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 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 67e0f7798..f9ce84f35 100644 --- a/code/ryzom/server/src/entities_game_service/database_plr.h +++ b/code/ryzom/server/src/entities_game_service/database_plr.h @@ -1,22 +1,7 @@ -// Ryzom - MMORPG Framework -// Copyright (C) 2010 Winch Gate Property Limited -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// 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 +#ifndef INCLUDED_database_PLR_H +#define INCLUDED_database_PLR_H ///////////////////////////////////////////////////////////////// // WARNING : this is a generated file, don't change it ! ///////////////////////////////////////////////////////////////// @@ -956,6 +941,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 +958,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C { return _IS_INVISIBLE; } - + void setCOUNTER(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false) { @@ -1313,14 +1300,13 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C { return _DODGE; } - - TBRICK_TICK_RANGE &getBRICK_TICK_RANGE() + TBRICK_TICK_RANGE &getBRICK_TICK_RANGE() { return _BRICK_TICK_RANGE; } - + }; - + class TTARGET { public: @@ -1334,10 +1320,10 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C ICDBStructNode *_BranchNode; ICDBStructNode *_UID; - ICDBStructNode *_HP; - ICDBStructNode *_SAP; - ICDBStructNode *_STA; - ICDBStructNode *_FOCUS; + ICDBStructNode *_ChaScore1; + ICDBStructNode *_ChaScore3; + ICDBStructNode *_ChaScore2; + ICDBStructNode *_ChaScore4; ICDBStructNode *_PLAYER_LEVEL; @@ -1374,93 +1360,93 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C return _UID; } - void setHP(CCDBSynchronised &dbGroup, sint8 value, bool forceSending = false) + void setChaScore1(CCDBSynchronised &dbGroup, sint8 value, bool forceSending = false) { - _setProp(dbGroup, _HP, value, forceSending); + _setProp(dbGroup, _ChaScore1, value, forceSending); } - sint8 getHP(const CCDBSynchronised &dbGroup) + sint8 getChaScore1(const CCDBSynchronised &dbGroup) { sint8 value; - _getProp(dbGroup, _HP, value); + _getProp(dbGroup, _ChaScore1, value); return value; } - ICDBStructNode *getHPCDBNode() + ICDBStructNode *getChaScore1CDBNode() { - return _HP; + return _ChaScore1; } - void setSAP(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false) + void setChaScore3(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false) { // Check that the value is not out of database precision - STOP_IF(value > (1<<7)-1, "setSAP : Value out of bound : trying to store "< (1<<7)-1, "setChaScore3 : Value out of bound : trying to store "< (1<<7)-1, "setSTA : Value out of bound : trying to store "< (1<<7)-1, "setChaScore2 : Value out of bound : trying to store "< (1<<7)-1, "setFOCUS : Value out of bound : trying to store "< (1<<7)-1, "setChaScore4 : Value out of bound : trying to store "< (1<<7)-1, "setSAP : Value out of bound : trying to store "< (1<<7)-1, "setChaScore3 : Value out of bound : trying to store "< (1<<7)-1, "setSTA : Value out of bound : trying to store "< (1<<7)-1, "setChaScore2 : Value out of bound : trying to store "< (1<<7)-1, "setTARGET_HP : Value out of bound : trying to store "< (1<<7)-1, "setTARGET_ChaScore1 : Value out of bound : trying to store "< (1<<7)-1, "setTARGET_SAP : Value out of bound : trying to store "< (1<<7)-1, "setTARGET_ChaScore3 : Value out of bound : trying to store "< (1<<7)-1, "setTARGET_STA : Value out of bound : trying to store "< (1<<7)-1, "setTARGET_ChaScore2 : Value out of bound : trying to store "<