(svn r23207) -Codechange: make functions private/protected/public depending on their current usage (and reorder functions a bit)

This commit is contained in:
truebrain 2011-11-13 20:41:17 +00:00
parent 8a1a57d4c9
commit 5e7bae46f8
2 changed files with 29 additions and 28 deletions

View File

@ -154,12 +154,6 @@ public:
*/ */
void Load(int version); 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. * Load and discard data from a savegame.
*/ */
@ -206,6 +200,12 @@ private:
*/ */
void Died(); 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. * Save one object (int / string / array / table) to the savegame.
* @param vm The virtual machine to get all the data from. * @param vm The virtual machine to get all the data from.

View File

@ -39,6 +39,18 @@ friend void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2
friend class AIInstance; friend class AIInstance;
friend class AIController; friend class AIController;
#ifndef DOXYGEN_AI_DOCS #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: protected:
/** /**
* Executes a raw DoCommand for the AI. * Executes a raw DoCommand for the AI.
@ -141,9 +153,10 @@ protected:
static GroupID GetNewGroupID(); 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 * Get the internal value of allow_do_command. This can differ
@ -154,11 +167,6 @@ protected:
*/ */
static bool GetAllowDoCommand(); static bool GetAllowDoCommand();
/**
* Get the pointer to store event data in.
*/
static void *&GetEventPointer();
/** /**
* Set the cost of the last command. * Set the cost of the last command.
*/ */
@ -179,13 +187,17 @@ protected:
*/ */
static int GetCallbackVariable(int index); static int GetCallbackVariable(int index);
public:
/** /**
* Store the latest result of a DoCommand per company. * Can we suspend the AI at this moment?
* @param res The result of the last command.
*/ */
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. * Store a new_vehicle_id per company.
* @param vehicle_id The new VehicleID. * @param vehicle_id The new VehicleID.
@ -209,17 +221,6 @@ public:
* @param group_id The new GroupID. * @param group_id The new GroupID.
*/ */
static void SetNewGroupID(GroupID group_id); 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 */ #endif /* DOXYGEN_AI_DOCS */
}; };