From e0d4c75cf4411f66771524bf9a7f98d15cdc6fcf Mon Sep 17 00:00:00 2001 From: truebrain Date: Tue, 29 Nov 2011 23:27:08 +0000 Subject: (svn r23368) -Codechange: move FindLibrary down a few layers, so there is no layer violation anymore --- src/script/api/script_controller.cpp | 3 +-- src/script/script_instance.hpp | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src/script') diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp index 7fe174756..055774be3 100644 --- a/src/script/api/script_controller.cpp +++ b/src/script/api/script_controller.cpp @@ -16,7 +16,6 @@ #include "script_controller.hpp" #include "../../ai/ai_instance.hpp" -#include "../../ai/ai.hpp" #include "../script_fatalerror.hpp" #include "../script_info.hpp" #include "../script_suspend.hpp" @@ -94,7 +93,7 @@ ScriptController::~ScriptController() snprintf(library_name, sizeof(library_name), "%s.%d", library, version); strtolower(library_name); - ScriptInfo *lib = (ScriptInfo *)AI::FindLibrary(library, version); + ScriptInfo *lib = ScriptObject::GetActiveInstance()->FindLibrary(library, version); if (lib == NULL) { char error[1024]; snprintf(error, sizeof(error), "couldn't find library '%s' with version %d", library, version); diff --git a/src/script/script_instance.hpp b/src/script/script_instance.hpp index 122cc5808..8aa85744c 100644 --- a/src/script/script_instance.hpp +++ b/src/script/script_instance.hpp @@ -43,6 +43,14 @@ public: */ virtual int GetSetting(const char *name) = 0; + /** + * Find a library. + * @param library The library name to find. + * @param version The version the library should have. + * @return The library if found, NULL otherwise. + */ + virtual class ScriptInfo *FindLibrary(const char *library, int version) = 0; + /** * A script in multiplayer waits for the server to handle his DoCommand. * It keeps waiting for this until this function is called. -- cgit v1.2.3-70-g09d2