gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: do not use interactive random anymore for script configuration

Browse Source
This commit is contained in:
Rubidium 2023-01-14 13:38:05 +01:00 committed by rubidium42
parent c5ff61c5f2
commit 921c6591f9
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ai/ai_scanner.cpp
View File

@ -14,6 +14,7 @@
#include "../core/random_func.hpp" #include "../core/random_func.hpp"
#include "../script/squirrel_class.hpp" #include "../script/squirrel_class.hpp"
#include "../script/api/script_object.hpp"
#include "ai_info.hpp" #include "ai_info.hpp"
#include "ai_scanner.hpp" #include "ai_scanner.hpp"
@ -77,12 +78,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
} }
/* Find a random AI */ /* Find a random AI */
uint pos; uint pos = ScriptObject::GetRandomizer(OWNER_NONE).Next(num_random_ais);
if (_networking) {
pos = InteractiveRandomRange(num_random_ais);
} else {
pos = RandomRange(num_random_ais);
}
/* Find the Nth item from the array */ /* Find the Nth item from the array */
ScriptInfoList::const_iterator it = this->info_single_list.begin(); ScriptInfoList::const_iterator it = this->info_single_list.begin();

5
src/script/script_config.cpp
View File

@ -11,6 +11,7 @@
#include "../settings_type.h" #include "../settings_type.h"
#include "../core/random_func.hpp" #include "../core/random_func.hpp"
#include "script_info.hpp" #include "script_info.hpp"
#include "api/script_object.hpp"
#include "../textfile_gui.h" #include "../textfile_gui.h"
#include "../string_func.h" #include "../string_func.h"
@ -35,7 +36,7 @@ void ScriptConfig::Change(const char *name, int version, bool force_exact_match,
* for the Script that have the random flag to a random value. */ * for the Script that have the random flag to a random value. */
for (const auto &item : *this->info->GetConfigList()) { for (const auto &item : *this->info->GetConfigList()) {
if (item.flags & SCRIPTCONFIG_RANDOM) { if (item.flags & SCRIPTCONFIG_RANDOM) {
this->SetSetting(item.name, InteractiveRandomRange(item.max_value + 1 - item.min_value) + item.min_value); this->SetSetting(item.name, ScriptObject::GetRandomizer(OWNER_NONE).Next(item.max_value + 1 - item.min_value) + item.min_value);
} }
} }
@ -157,7 +158,7 @@ void ScriptConfig::AddRandomDeviation()
{ {
for (const auto &item : *this->GetConfigList()) { for (const auto &item : *this->GetConfigList()) {
if (item.random_deviation != 0) { if (item.random_deviation != 0) {
this->SetSetting(item.name, InteractiveRandomRange(item.random_deviation * 2 + 1) - item.random_deviation + this->GetSetting(item.name)); this->SetSetting(item.name, ScriptObject::GetRandomizer(OWNER_NONE).Next(item.random_deviation * 2 + 1) - item.random_deviation + this->GetSetting(item.name));
} }
} }
} }