(svn r23368) -Codechange: move FindLibrary down a few layers, so there is no layer violation anymore

This commit is contained in:
truebrain
2011-11-29 23:27:08 +00:00
parent fe41ceb477
commit 275670b55d
4 changed files with 16 additions and 2 deletions

View File

@@ -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);

View File

@@ -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.