From ad98b1414a5cbf344775f59fc85eb93014180f7f Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 11 Aug 2018 15:35:40 +0200 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/ryzom/server/src/ai_service/ai_bot.cpp | 1 - code/ryzom/server/src/ai_service/ai_grp_npc.h | 2 +- code/ryzom/server/src/ai_service/ai_script_comp.h | 8 ++------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/code/ryzom/server/src/ai_service/ai_bot.cpp b/code/ryzom/server/src/ai_service/ai_bot.cpp index 2fb47023a..6698de755 100644 --- a/code/ryzom/server/src/ai_service/ai_bot.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot.cpp @@ -88,7 +88,6 @@ void CSpawnBot::setVisualPropertiesName() return; // the npc name is displayed as a fauna } - CVisualPropertiesInterface::setName(dataSetRow(), name); } diff --git a/code/ryzom/server/src/ai_service/ai_grp_npc.h b/code/ryzom/server/src/ai_service/ai_grp_npc.h index bac75d1a9..1f838584d 100644 --- a/code/ryzom/server/src/ai_service/ai_grp_npc.h +++ b/code/ryzom/server/src/ai_service/ai_grp_npc.h @@ -190,7 +190,7 @@ public: uint32 getAggroDist() { return _AggroDist; } uint32& despawnTime() { return _DespawnTime; } - uint32& respawnTime() { return _RespawnTime; } + uint32& respawnTime() { return _RespawnTime; } AITYPES::CPropertySetWithExtraList& faction() { return _faction; } AITYPES::CPropertySetWithExtraList& ennemyFaction() { return _ennemyFaction; } diff --git a/code/ryzom/server/src/ai_service/ai_script_comp.h b/code/ryzom/server/src/ai_service/ai_script_comp.h index a35253d66..d4782ac18 100644 --- a/code/ryzom/server/src/ai_service/ai_script_comp.h +++ b/code/ryzom/server/src/ai_service/ai_script_comp.h @@ -56,9 +56,7 @@ public: static CFightScriptCompReader *getScriptReader (const std::string &str); - static CFightScriptComp *createScriptComp (const std::string &str) -protected: -private: + static CFightScriptComp *createScriptComp(const std::string &str); }; @@ -74,8 +72,6 @@ public: typedef CHashMap > TFightScriptMap; static TFightScriptMap _ScriptCompList; -protected: -private: }; @@ -116,7 +112,7 @@ public: CFightSelectFilterReader() {} virtual ~CFightSelectFilterReader() {} - CFightScriptComp *create (const std::string &inStr) + CFightScriptComp *create(const std::string &inStr); std::string getName () const { return std::string("SELECT");