From 70b6b3cc2ce7eb37679ce6f4d26f54fd790589fc Mon Sep 17 00:00:00 2001 From: truebrain Date: Sun, 13 Nov 2011 20:41:17 +0000 Subject: (svn r23207) -Codechange: make functions private/protected/public depending on their current usage (and reorder functions a bit) --- src/ai/ai_instance.hpp | 12 ++++++------ src/ai/api/ai_object.hpp | 45 +++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/ai/ai_instance.hpp b/src/ai/ai_instance.hpp index d66854563..65884dc71 100644 --- a/src/ai/ai_instance.hpp +++ b/src/ai/ai_instance.hpp @@ -154,12 +154,6 @@ public: */ void Load(int version); - /** - * Call the AI Load function if it exists and data was loaded - * from a savegame. - */ - bool CallLoad(); - /** * Load and discard data from a savegame. */ @@ -206,6 +200,12 @@ private: */ void Died(); + /** + * Call the AI Load function if it exists and data was loaded + * from a savegame. + */ + bool CallLoad(); + /** * Save one object (int / string / array / table) to the savegame. * @param vm The virtual machine to get all the data from. diff --git a/src/ai/api/ai_object.hpp b/src/ai/api/ai_object.hpp index 48be653d5..3df150bac 100644 --- a/src/ai/api/ai_object.hpp +++ b/src/ai/api/ai_object.hpp @@ -39,6 +39,18 @@ friend void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2 friend class AIInstance; friend class AIController; #ifndef DOXYGEN_AI_DOCS +public: + /** + * Store the latest result of a DoCommand per company. + * @param res The result of the last command. + */ + static void SetLastCommandRes(bool res); + + /** + * Get the pointer to store log message in. + */ + static void *&GetLogPointer(); + protected: /** * Executes a raw DoCommand for the AI. @@ -141,9 +153,10 @@ protected: static GroupID GetNewGroupID(); /** - * Can we suspend the AI at this moment? + * Store a allow_do_command per company. + * @param allow The new allow. */ - static bool CanSuspend(); + static void SetAllowDoCommand(bool allow); /** * Get the internal value of allow_do_command. This can differ @@ -154,11 +167,6 @@ protected: */ static bool GetAllowDoCommand(); - /** - * Get the pointer to store event data in. - */ - static void *&GetEventPointer(); - /** * Set the cost of the last command. */ @@ -179,13 +187,17 @@ protected: */ static int GetCallbackVariable(int index); -public: /** - * Store the latest result of a DoCommand per company. - * @param res The result of the last command. + * Can we suspend the AI at this moment? */ - static void SetLastCommandRes(bool res); + static bool CanSuspend(); + + /** + * Get the pointer to store event data in. + */ + static void *&GetEventPointer(); +private: /** * Store a new_vehicle_id per company. * @param vehicle_id The new VehicleID. @@ -209,17 +221,6 @@ public: * @param group_id The new GroupID. */ static void SetNewGroupID(GroupID group_id); - - /** - * Store a allow_do_command per company. - * @param allow The new allow. - */ - static void SetAllowDoCommand(bool allow); - - /** - * Get the pointer to store log message in. - */ - static void *&GetLogPointer(); #endif /* DOXYGEN_AI_DOCS */ }; -- cgit v1.2.3-70-g09d2