dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23367) -Codechange: refactor GetSetting to ScriptInstance, to avoid global variable in script_controller

Browse Source
This commit is contained in:
truebrain
2011-11-29 23:27:01 +00:00
parent bfbadccf69
commit fe41ceb477
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/api/script_controller.cpp
View File

@@ -11,14 +11,11 @@
#include "../../stdafx.h"
#include "../../string_func.h"
#include "../../company_base.h"
#include "../../company_func.h"
#include "../../script/squirrel.hpp"
#include "../../rev.h"
#include "script_controller.hpp"
#include "../../ai/ai_instance.hpp"
#include "../../ai/ai_config.hpp"
#include "../../ai/ai.hpp"
#include "../script_fatalerror.hpp"
#include "../script_info.hpp"
@@ -78,7 +75,7 @@ ScriptController::~ScriptController()
/* static */ int ScriptController::GetSetting(const char *name)
{
return AIConfig::GetConfig(_current_company)->GetSetting(name);
return ScriptObject::GetActiveInstance()->GetSetting(name);
}
/* static */ uint ScriptController::GetVersion()

2
src/script/api/script_object.cpp
View File

@@ -12,10 +12,12 @@
#include "../../stdafx.h"
#include "../../script/squirrel.hpp"
#include "../../command_func.h"
#include "../../company_func.h"
#include "../../network/network.h"
#include "../../tunnelbridge.h"
#include "../script_storage.hpp"
#include "../../ai/ai_config.hpp"
#include "../../ai/ai_instance.hpp"
#include "../script_fatalerror.hpp"
#include "../script_suspend.hpp"