diff options
author | truebrain <truebrain@openttd.org> | 2011-11-29 23:21:52 +0000 |
---|---|---|
committer | truebrain <truebrain@openttd.org> | 2011-11-29 23:21:52 +0000 |
commit | e37149a1def6a0e63dda8e0964abf1b82316761a (patch) | |
tree | d8f80cee8a3b1eb60feb883796e43300fb50cfb1 /src/ai/ai.hpp | |
parent | ae8540f5e080adebca3e54c69aa7cd85a87e550b (diff) | |
download | openttd-e37149a1def6a0e63dda8e0964abf1b82316761a.tar.xz |
(svn r23362) -Codechange: refactor AIScanner, splitting it in AIScannerInfo and AIScannerLibrary
Diffstat (limited to 'src/ai/ai.hpp')
-rw-r--r-- | src/ai/ai.hpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp index af1888914..d8647be0c 100644 --- a/src/ai/ai.hpp +++ b/src/ai/ai.hpp @@ -19,7 +19,7 @@ #include <map> /** A list that maps AI names to their AIInfo object. */ -typedef std::map<const char *, class AIInfo *, StringCompare> AIInfoList; +typedef std::map<const char *, class ScriptInfo *, StringCompare> ScriptInfoList; /** * Main AI class. Contains all functions needed to start, stop, save and load AIs. @@ -129,11 +129,11 @@ public: /** Wrapper function for AIScanner::GetAIConsoleLibraryList */ static char *GetConsoleLibraryList(char *p, const char *last); /** Wrapper function for AIScanner::GetAIInfoList */ - static const AIInfoList *GetInfoList(); + static const ScriptInfoList *GetInfoList(); /** Wrapper function for AIScanner::GetUniqueAIInfoList */ - static const AIInfoList *GetUniqueInfoList(); + static const ScriptInfoList *GetUniqueInfoList(); /** Wrapper function for AIScanner::FindInfo */ - static AIInfo *FindInfo(const char *name, int version, bool force_exact_match); + static class AIInfo *FindInfo(const char *name, int version, bool force_exact_match); /** Wrapper function for AIScanner::FindLibrary */ static class AILibrary *FindLibrary(const char *library, int version); @@ -145,10 +145,12 @@ public: #if defined(ENABLE_NETWORK) /** Wrapper function for AIScanner::HasAI */ static bool HasAI(const struct ContentInfo *ci, bool md5sum); + static bool HasAILibrary(const ContentInfo *ci, bool md5sum); #endif private: - static uint frame_counter; ///< Tick counter for the AI code - static class AIScanner *ai_scanner; ///< AIScanner instance that is used to find AIs + static uint frame_counter; ///< Tick counter for the AI code + static class AIScannerInfo *scanner_info; ///< ScriptScanner instance that is used to find AIs + static class AIScannerLibrary *scanner_library; ///< ScriptScanner instance that is used to find AI Libraries }; #else /* ENABLE_AI */ @@ -167,6 +169,7 @@ public: static void KillAll() {} static void GameLoop() {} static bool HasAI(const struct ContentInfo *ci, bool md5sum) { return false; } + static bool HasAILibrary(const struct ContentInfo *ci, bool md5sum) { return false; } static void Rescan() {} static char *GetConsoleList(char *p, const char *last, bool newest_only = false) { return p; } static void nop() { } |