mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Get/pass script controller by reference instead of pointer.

pull/14339/head
Peter Nelson 2025-06-06 21:43:05 +01:00
parent cdd555edd5
commit 49bc9d03cb
No known key found for this signature in database
GPG Key ID: 8EF8F0A467DF75ED
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ ScriptController::ScriptController(::CompanyID company) :
/* static */ uint ScriptController::GetTick() /* static */ uint ScriptController::GetTick()
{ {
return ScriptObject::GetActiveInstance().GetController()->ticks; return ScriptObject::GetActiveInstance().GetController().ticks;
} }
/* static */ int ScriptController::GetOpsTillSuspend() /* static */ int ScriptController::GetOpsTillSuspend()
@ -96,7 +96,7 @@ ScriptController::ScriptController(::CompanyID company) :
/* static */ HSQOBJECT ScriptController::Import(const std::string &library, const std::string &class_name, int version) /* static */ HSQOBJECT ScriptController::Import(const std::string &library, const std::string &class_name, int version)
{ {
ScriptController *controller = ScriptObject::GetActiveInstance().GetController(); ScriptController &controller = ScriptObject::GetActiveInstance().GetController();
Squirrel *engine = ScriptObject::GetActiveInstance().engine; Squirrel *engine = ScriptObject::GetActiveInstance().engine;
HSQUIRRELVM vm = engine->GetVM(); HSQUIRRELVM vm = engine->GetVM();
@ -114,11 +114,11 @@ ScriptController::ScriptController(::CompanyID company) :
std::string fake_class; std::string fake_class;
LoadedLibraryList::iterator it = controller->loaded_library.find(library_name); LoadedLibraryList::iterator it = controller.loaded_library.find(library_name);
if (it != controller->loaded_library.end()) { if (it != controller.loaded_library.end()) {
fake_class = (*it).second; fake_class = (*it).second;
} else { } else {
int next_number = ++controller->loaded_library_count; int next_number = ++controller.loaded_library_count;
/* Create a new fake internal name */ /* Create a new fake internal name */
fake_class = fmt::format("_internalNA{}", next_number); fake_class = fmt::format("_internalNA{}", next_number);
@ -135,7 +135,7 @@ ScriptController::ScriptController(::CompanyID company) :
sq_newslot(vm, -3, SQFalse); sq_newslot(vm, -3, SQFalse);
sq_pop(vm, 1); sq_pop(vm, 1);
controller->loaded_library[library_name] = fake_class; controller.loaded_library[library_name] = fake_class;
} }
/* Find the real class inside the fake class (like 'sets.Vector') */ /* Find the real class inside the fake class (like 'sets.Vector') */

6
src/script/script_instance.hpp
View File

@ -146,7 +146,11 @@ public:
/** /**
* Get the controller attached to the instance. * Get the controller attached to the instance.
*/ */
class ScriptController *GetController() { return controller; } class ScriptController &GetController()
{
assert(this->controller != nullptr);
return *this->controller;
}
/** /**
* Return the "this script died" value * Return the "this script died" value