From ca543ce9b6b6cc3cd3beea4233942346afcb21fd Mon Sep 17 00:00:00 2001 From: Nuno Date: Thu, 6 May 2021 17:54:10 +0200 Subject: [PATCH] Merge branch 'outpost_refactoring' --- .../outpost_manager/outpost.h | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/ryzom/server/src/entities_game_service/outpost_manager/outpost.h b/ryzom/server/src/entities_game_service/outpost_manager/outpost.h index 3a92e7da4..97c48dd8c 100644 --- a/ryzom/server/src/entities_game_service/outpost_manager/outpost.h +++ b/ryzom/server/src/entities_game_service/outpost_manager/outpost.h @@ -415,6 +415,19 @@ private: public: //for commands /// changes the state of the outpost void setState(OUTPOSTENUMS::TOutpostState state); + + /// update timers for client + /// the updated values are accessible with the following methods: + /// computeStateEndDateTickForClient() + /// computeRoundEndDateTickForClient() + void updateTimersForClient(); + + /// ask an update in the guild database for this outpost + void askGuildDBUpdate(COutpostGuildDBUpdater::TDBPropSet dbPropSet) const; + + /// ask an update of the outpost database + void askOutpostDBUpdate(); + private: /// get an attack/defense squad from slot @@ -435,18 +448,6 @@ private: /// \return false if index cannot be converted bool convertSpawnZoneIndex(uint32 spawnZoneIndex, TAIAlias & spawnZoneAlias) const; - /// ask an update in the guild database for this outpost - void askGuildDBUpdate(COutpostGuildDBUpdater::TDBPropSet dbPropSet) const; - - /// ask an update of the outpost database - void askOutpostDBUpdate(); - - /// update timers for client - /// the updated values are accessible with the following methods: - /// computeStateEndDateTickForClient() - /// computeRoundEndDateTickForClient() - void updateTimersForClient(); - std::string getBroadcastString(TBroadcastMessage message) const; void broadcastMessageMsg(std::vector const& audience, std::string const& message, TVectorParamCheck const& params=TVectorParamCheck()) const; void broadcastMessagePopup(std::vector const& audience, std::string const& message, TVectorParamCheck const& params=TVectorParamCheck(), TVectorParamCheck const& paramsTitle=TVectorParamCheck()) const;