cpp/openttd-patchpack/source Changeset - r18510:9d33e9643f80

Changeset - r18510:9d33e9643f80

Parent rev.

Child rev.

[Not reviewed]

master

0 19 2

truebrain - 13 years ago 2011-11-29 23:26:35
truebrain@openttd.org

(svn r23364) -Codechange: refactor AIConfig, moving it mostly to Scriptconfig

21 files changed with 817 insertions and 645 deletions:

projects/openttd_vs100.vcxproj

projects/openttd_vs100.vcxproj.filters

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/ai/ai_config.cpp

183

src/ai/ai_config.hpp

124

src/ai/ai_core.cpp

src/ai/ai_gui.cpp

src/ai/ai_info.cpp

229

src/ai/ai_info.hpp

src/ai/ai_instance.cpp

src/ai/api/ai_changelog.hpp

src/console_cmds.cpp

src/saveload/ai_sl.cpp

src/script/api/script_controller.cpp

src/script/script_config.cpp

201

src/script/script_config.hpp

191

src/script/script_info.cpp

212

src/script/script_info.hpp

src/settings.cpp

0 comments (0 inline, 0 general)

projects/openttd_vs100.vcxproj

➞

Show inline comments

@@ @@ -785,12 +785,14 @@ @@
     <ClInclude Include="..\src\table\train_cmd.h" />
     <ClInclude Include="..\src\table\tree_land.h" />
     <ClInclude Include="..\src\table\unicode.h" />
     <ClInclude Include="..\src\table\water_land.h" />
     <ClCompile Include="..\src\3rdparty\md5\md5.cpp" />
     <ClInclude Include="..\src\3rdparty\md5\md5.h" />
     <ClCompile Include="..\src\script\script_config.cpp" />
     <ClInclude Include="..\src\script\script_config.hpp" />
     <ClInclude Include="..\src\script\script_fatalerror.hpp" />
     <ClCompile Include="..\src\script\script_info.cpp" />
     <ClInclude Include="..\src\script\script_info.hpp" />
     <ClCompile Include="..\src\script\script_instance.cpp" />
     <ClInclude Include="..\src\script\script_instance.hpp" />
     <ClCompile Include="..\src\script\script_scanner.cpp" />

projects/openttd_vs100.vcxproj.filters

➞

Show inline comments

@@ @@ -1584,12 +1584,18 @@ @@
     <ClCompile Include="..\src\3rdparty\md5\md5.cpp">
       <Filter>MD5</Filter>
     </ClCompile>
     <ClInclude Include="..\src\3rdparty\md5\md5.h">
       <Filter>MD5</Filter>
     </ClInclude>
     <ClCompile Include="..\src\script\script_config.cpp">
       <Filter>Script</Filter>
     </ClCompile>
     <ClInclude Include="..\src\script\script_config.hpp">
       <Filter>Script</Filter>
     </ClInclude>
     <ClInclude Include="..\src\script\script_fatalerror.hpp">
       <Filter>Script</Filter>
     </ClInclude>
     <ClCompile Include="..\src\script\script_info.cpp">
       <Filter>Script</Filter>
     </ClCompile>

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -2456,12 +2456,20 @@ @@
 			</File>
 		</Filter>
 		<Filter
 			Name="Script"
+			>
 			<File
 				RelativePath=".\..\src\script\script_config.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_config.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_fatalerror.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_info.cpp"
+				>

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -2453,12 +2453,20 @@ @@
 			</File>
 		</Filter>
 		<Filter
 			Name="Script"
+			>
 			<File
 				RelativePath=".\..\src\script\script_config.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_config.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_fatalerror.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_info.cpp"
+				>

source.list

➞

Show inline comments

@@ @@ -550,12 +550,14 @@ table/water_land.h @@
 # MD5
 rdparty/md5/md5.cpp
 rdparty/md5/md5.h
 #if AI
 # Script
 script/script_config.cpp
 script/script_config.hpp
 script/script_fatalerror.hpp
 script/script_info.cpp
 script/script_info.hpp
 script/script_instance.cpp
 script/script_instance.hpp
 script/script_scanner.cpp

src/ai/ai_config.cpp

➞

Show inline comments

@@ @@ -11,222 +11,107 @@ @@
 #include "../stdafx.h"
 #include "../settings_type.h"
 #include "../core/random_func.hpp"
 #include "ai.hpp"
 #include "ai_config.hpp"
 void AIConfig::ChangeAI(const char *name, int version, bool force_exact_match, bool is_random_ai)
+{
 	free(this->name);
 	this->name = (name == NULL) ? NULL : strdup(name);
 	this->info = (name == NULL) ? NULL : AI::FindInfo(this->name, version, force_exact_match);
 	this->version = (info == NULL) ? -1 : info->GetVersion();
 	this->is_random_ai = is_random_ai;
 	if (this->config_list != NULL) delete this->config_list;
 	this->config_list = (info == NULL) ? NULL : new AIConfigItemList();
 	if (this->config_list != NULL) this->config_list->push_back(_start_date_config);
 	/* The special casing for start_date is here to ensure that the
 	 *  start_date setting won't change even if you chose another AI. */
 	int start_date = this->GetSetting("start_date");
 	for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		free((*it).first);
+	}
 	this->settings.clear();
 	this->SetSetting("start_date", start_date);
 	if (_game_mode == GM_NORMAL && this->info != NULL) {
 		/* If we're in an existing game and the AI is changed, set all settings
 		 *  for the AI that have the random flag to a random value. */
 		for (AIConfigItemList::const_iterator it = this->info->GetConfigList()->begin(); it != this->info->GetConfigList()->end(); it++) {
 			if ((*it).flags & AICONFIG_RANDOM) {
 				this->SetSetting((*it).name, InteractiveRandomRange((*it).max_value - (*it).min_value) + (*it).min_value);
+			}
+		}
 		this->AddRandomDeviation();
+	}
+}
 #include "ai_info.hpp"
 AIConfig::AIConfig(const AIConfig *config)
+{
 	this->name = (config->name == NULL) ? NULL : strdup(config->name);
 	this->info = config->info;
 	this->version = config->version;
 	this->config_list = NULL;
 	this->is_random_ai = config->is_random_ai;
 	for (SettingValueList::const_iterator it = config->settings.begin(); it != config->settings.end(); it++) {
 		this->settings[strdup((*it).first)] = (*it).second;
+	}
 	this->AddRandomDeviation();
+}
 AIConfig::~AIConfig()
+{
 	free(this->name);
 	this->ResetSettings();
 	if (this->config_list != NULL) delete this->config_list;
+}
 /** Configuration for AI start date, every AI has this setting. */
 ScriptConfigItem _start_date_config = {
 	"start_date",
 	"Number of days to start this AI after the previous one (give or take)",
 	AI::START_NEXT_MIN,
 	AI::START_NEXT_MAX,
 	AI::START_NEXT_MEDIUM,
 	AI::START_NEXT_EASY,
 	AI::START_NEXT_MEDIUM,
 	AI::START_NEXT_HARD,
 	AI::START_NEXT_DEVIATION,
 ,
 	SCRIPTCONFIG_NONE,
 	NULL
 };
 AIInfo *AIConfig::GetInfo() const
+{
 	return this->info;
+}
 bool AIConfig::ResetInfo(bool force_exact_match)
+{
 	this->info = AI::FindInfo(this->name, force_exact_match ? this->version : -1, force_exact_match);
 	return this->info != NULL;
+}
 const AIConfigItemList *AIConfig::GetConfigList()
+{
 	if (this->info != NULL) return this->info->GetConfigList();
 	if (this->config_list == NULL) {
 		this->config_list = new AIConfigItemList();
 		this->config_list->push_back(_start_date_config);
+	}
 	return this->config_list;
+}
 AIConfig *AIConfig::GetConfig(CompanyID company, AISettingSource source)
 /* static */ AIConfig *AIConfig::GetConfig(CompanyID company, ScriptSettingSource source)
+{
 	AIConfig **config;
-	if (source == AISS_FORCE_NEWGAME || (source == AISS_DEFAULT && _game_mode == GM_MENU)) {
+	if (source == SSS_FORCE_NEWGAME || (source == SSS_DEFAULT && _game_mode == GM_MENU)) {
 		config = &_settings_newgame.ai_config[company];
 	} else {
 		config = &_settings_game.ai_config[company];
+	}
 	if (*config == NULL) *config = new AIConfig();
 	return *config;
+}
 class AIInfo *AIConfig::GetInfo() const
+{
 	return static_cast<class AIInfo *>(ScriptConfig::GetInfo());
+}
 ScriptInfo *AIConfig::FindInfo(const char *name, int version, bool force_exact_match)
+{
 	return static_cast<ScriptInfo *>(AI::FindInfo(name, version, force_exact_match));
+}
 bool AIConfig::ResetInfo(bool force_exact_match)
+{
 	this->info = (ScriptInfo *)AI::FindInfo(this->name, force_exact_match ? this->version : -1, force_exact_match);
 	return this->info != NULL;
+}
 void AIConfig::PushExtraConfigList()
+{
 	this->config_list->push_back(_start_date_config);
+}
 void AIConfig::ClearConfigList()
+{
 	/* The special casing for start_date is here to ensure that the
 	 *  start_date setting won't change even if you chose another Script. */
 	int start_date = this->GetSetting("start_date");
 	ScriptConfig::ClearConfigList();
 	this->SetSetting("start_date", start_date);
+}
 int AIConfig::GetSetting(const char *name) const
+{
 	SettingValueList::const_iterator it = this->settings.find(name);
 	/* Return the default value if the setting is not set, or if we are in a not-custom difficult level */
 	if (it == this->settings.end() || GetGameSettings().difficulty.diff_level != 3) {
 		if (this->info == NULL) {
 	if (this->info == NULL) {
 		SettingValueList::const_iterator it = this->settings.find(name);
 		if (it == this->settings.end() || GetGameSettings().difficulty.diff_level != 3) {
 			assert(strcmp("start_date", name) == 0);
 			switch (GetGameSettings().difficulty.diff_level) {
 				case 0: return AI::START_NEXT_EASY;
 				case 1: return AI::START_NEXT_MEDIUM;
 				case 2: return AI::START_NEXT_HARD;
 				case 3: return AI::START_NEXT_MEDIUM;
 				default: NOT_REACHED();
+			}
+		}
 		return this->info->GetSettingDefaultValue(name);
 		return (*it).second;
+	}
 	return (*it).second;
 	return ScriptConfig::GetSetting(name);
+}
 void AIConfig::SetSetting(const char *name, int value)
+{
 	/* You can only set ai specific settings if an AI is selected. */
 	if (this->info == NULL && strcmp("start_date", name) != 0) return;
 	if (this->info == NULL && strcmp("start_date", name) == 0) {
 	if (this->info == NULL) {
 		if (strcmp("start_date", name) != 0) return;
 		value = Clamp(value, AI::START_NEXT_MIN, AI::START_NEXT_MAX);
 	} else {
 		const AIConfigItem *config_item = this->info->GetConfigItem(name);
 		if (config_item == NULL) return;
 		value = Clamp(value, config_item->min_value, config_item->max_value);
 		SettingValueList::iterator it = this->settings.find(name);
 		if (it != this->settings.end()) {
 			(*it).second = value;
 		} else {
 			this->settings[strdup(name)] = value;
+		}
 		return;
+	}
 	SettingValueList::iterator it = this->settings.find(name);
 	if (it != this->settings.end()) {
 		(*it).second = value;
 	} else {
 		this->settings[strdup(name)] = value;
+	}
+}
 void AIConfig::ResetSettings()
+{
 	for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		free((*it).first);
+	}
 	this->settings.clear();
+}
 void AIConfig::AddRandomDeviation()
+{
 	for (AIConfigItemList::const_iterator it = this->GetConfigList()->begin(); it != this->GetConfigList()->end(); it++) {
 		if ((*it).random_deviation != 0) {
 			this->SetSetting((*it).name, InteractiveRandomRange((*it).random_deviation * 2) - (*it).random_deviation + this->GetSetting((*it).name));
+		}
+	}
+}
 bool AIConfig::HasAI() const
+{
 	return this->info != NULL;
+}
 bool AIConfig::IsRandomAI() const
+{
 	return this->is_random_ai;
+}
 const char *AIConfig::GetName() const
+{
 	return this->name;
+}
 int AIConfig::GetVersion() const
+{
 	return this->version;
 	ScriptConfig::SetSetting(name, value);
+}
 void AIConfig::StringToSettings(const char *value)
+{
 	char *value_copy = strdup(value);
 	char *s = value_copy;
 	while (s != NULL) {
 		/* Analyze the string ('name=value,name=value\0') */
 		char *item_name = s;
 		s = strchr(s, '=');
 		if (s == NULL) break;
 		if (*s == '\0') break;
 		*s = '\0';
 		s++;
 		char *item_value = s;
 		s = strchr(s, ',');
 		if (s != NULL) {
 			*s = '\0';
 			s++;
+		}
 		this->SetSetting(item_name, atoi(item_value));
+	}
 	free(value_copy);
+}
 void AIConfig::SettingsToString(char *string, size_t size) const
+{
 	string[0] = '\0';
 	for (SettingValueList::const_iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		char no[10];
 		snprintf(no, sizeof(no), "%d", (*it).second);
 		/* Check if the string would fit in the destination */
 		size_t needed_size = strlen((*it).first) + 1 + strlen(no) + 1;
 		/* If it doesn't fit, skip the next settings */
 		if (size <= needed_size) break;
 		size -= needed_size;
 		strcat(string, (*it).first);
 		strcat(string, "=");
 		strcat(string, no);
 		strcat(string, ",");
+	}
 	/* Remove the last ',', but only if at least one setting was saved. */
 	size_t len = strlen(string);
 	if (len > 0) string[len - 1] = '\0';
+}

src/ai/ai_config.hpp

➞

Show inline comments

@@ @@ -8,151 +8,46 @@ @@
  */
 /** @file ai_config.hpp AIConfig stores the configuration settings of every AI. */
 #ifndef AI_CONFIG_HPP
 #define AI_CONFIG_HPP
 #ifdef ENABLE_AI
 #include <map>
 #include "ai_info.hpp"
 #include "../core/string_compare_type.hpp"
 #include "../company_type.h"
 #include "../script/script_config.hpp"
 /**
  * AI settings for one company slot.
  */
 class AIConfig {
 private:
 	/** List with name=>value pairs of all AI-specific settings */
 	typedef std::map<const char *, int, StringCompare> SettingValueList;
 class AIConfig : public ScriptConfig {
 public:
 	/**
 	 * Get the config of a company.
 	 */
 	static AIConfig *GetConfig(CompanyID company, ScriptSettingSource source = SSS_DEFAULT);
 public:
 	AIConfig() :
 		name(NULL),
 		version(-1),
 		info(NULL),
 		config_list(NULL),
 		is_random_ai(false)
 		ScriptConfig()
 	{}
 	/**
 	 * Create a new AI config that is a copy of an existing config.
 	 * @param config The object to copy.
 	 */
 	AIConfig(const AIConfig *config);
 	/** Delete an AI configuration. */
 	~AIConfig();
 	AIConfig(const AIConfig *config) :
 		ScriptConfig(config)
 	{}
 	/**
 	 * Set another AI to be loaded in this slot.
 	 * @param name The name of the AI.
 	 * @param version The version of the AI to load, or -1 of latest.
 	 * @param force_exact_match If true try to find the exact same version
 	 *   as specified. If false any compatible version is ok.
 	 * @param is_random Is the AI chosen randomly?
 	 */
 	void ChangeAI(const char *name, int version = -1, bool force_exact_match = false, bool is_random = false);
 	class AIInfo *GetInfo() const;
 	/* virtual */ int GetSetting(const char *name) const;
 	/* virtual */ void SetSetting(const char *name, int value);
 	/**
 	 * When ever the AI Scanner is reloaded, all infos become invalid. This
 	 *  function tells AIConfig about this.
 	 * @param force_exact_match If true try to find the exact same version
 	 *   as specified. If false any version is ok.
 	 * @return \c true if the reset was successful, \c false if the AI was no longer
 	 *  found.
 	 */
 	bool ResetInfo(bool force_exact_match);
 	/**
 	 * Get the AIInfo linked to this AIConfig.
 	 */
 	class AIInfo *GetInfo() const;
 	/**
 	 * Get the config list for this AIConfig.
 	 */
 	const AIConfigItemList *GetConfigList();
 	/**
 	 * Where to get the config from, either default (depends on current game
 	 * mode) or force either newgame or normal
 	 */
 	enum AISettingSource {
 		AISS_DEFAULT,       ///< Get the AI config from the current game mode
 		AISS_FORCE_NEWGAME, ///< Get the newgame AI config
 		AISS_FORCE_GAME,    ///< Get the AI config from the current game
 	};
 	/**
 	 * Get the config of a company.
 	 */
 	static AIConfig *GetConfig(CompanyID company, AISettingSource source = AISS_DEFAULT);
 	/**
 	 * Get the value of a setting for this config. It might fallback to his
 	 *  'info' to find the default value (if not set or if not-custom difficulty
 	 *  level).
 	 * @return The (default) value of the setting, or -1 if the setting was not
 	 *  found.
 	 */
 	int GetSetting(const char *name) const;
 	/**
 	 * Set the value of a setting for this config.
 	 */
 	void SetSetting(const char *name, int value);
 	/**
 	 * Reset all settings to their default value.
 	 */
 	void ResetSettings();
 	/**
 	 * Randomize all settings the AI requested to be randomized.
 	 */
 	void AddRandomDeviation();
 	/**
 	 * Is this config attached to an AI?
 	 */
 	bool HasAI() const;
 	/**
 	 * Is the current AI a randomly chosen AI?
 	 */
 	bool IsRandomAI() const;
 	/**
 	 * Get the name of the AI.
 	 */
 	const char *GetName() const;
 	/**
 	 * Get the version of the AI.
 	 */
 	int GetVersion() const;
 	/**
 	 * Convert a string which is stored in the config file or savegames to
 	 *  custom settings of this AI.
 	 */
 	void StringToSettings(const char *value);
 	/**
 	 * Convert the custom settings to a string that can be stored in the config
 	 *  file or savegames.
 	 */
 	void SettingsToString(char *string, size_t size) const;
 private:
 	const char *name;              ///< Name of the AI
 	int version;                   ///< Version of the AI
 	class AIInfo *info;            ///< AIInfo object for related to this AI version
 	SettingValueList settings;     ///< List with all setting=>value pairs that are configure for this AI
 	AIConfigItemList *config_list; ///< List with all settings defined by this AI
 	bool is_random_ai;             ///< True if the AI in this slot was randomly chosen.
 protected:
 	/* virtual */ void PushExtraConfigList();
 	/* virtual */ void ClearConfigList();
 	/* virtual */ ScriptInfo *FindInfo(const char *name, int version, bool force_exact_match);
 };
 #endif /* ENABLE_AI */
 #endif /* AI_CONFIG_HPP */

src/ai/ai_core.cpp

➞

Show inline comments

@@ @@ -18,12 +18,13 @@ @@
 #include "../window_func.h"
 #include "../command_func.h"
 #include "../fileio_func.h"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"
 #include "ai_info.hpp"
 #include "ai.hpp"
 #include "../script/api/script_error.hpp"
 /* static */ uint AI::frame_counter = 0;
 /* static */ AIScannerInfo *AI::scanner_info = NULL;
 /* static */ AIScannerLibrary *AI::scanner_library = NULL;
@@ @@ -40,17 +41,17 @@ @@
 	/* Clients shouldn't start AIs */
 	if (_networking && !_network_server) return;
 	AIConfig *config = AIConfig::GetConfig(company);
 	AIInfo *info = config->GetInfo();
-	if (info == NULL || (rerandomise_ai && config->IsRandomAI())) {
+	if (info == NULL || (rerandomise_ai && config->IsRandom())) {
 		info = AI::scanner_info->SelectRandomAI();
 		assert(info != NULL);
 		/* Load default data and store the name in the settings */
-		config->ChangeAI(info->GetName(), -1, false, true);
+		config->Change(info->GetName(), -1, false, true);
+	}
 	Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE);
 	Company *c = Company::Get(company);
 	c->ai_info = info;
@@ @@ -178,16 +179,16 @@ @@
 /* static */ void AI::ResetConfig()
+{
 	/* Check for both newgame as current game if we can reload the AIInfo insde
 	 *  the AIConfig. If not, remove the AI from the list (which will assign
 	 *  a random new AI on reload). */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		if (_settings_game.ai_config[c] != NULL && _settings_game.ai_config[c]->HasAI()) {
+		if (_settings_game.ai_config[c] != NULL && _settings_game.ai_config[c]->HasScript()) {
 			if (!_settings_game.ai_config[c]->ResetInfo(true)) {
 				DEBUG(ai, 0, "After a reload, the AI by the name '%s' was no longer found, and removed from the list.", _settings_game.ai_config[c]->GetName());
-				_settings_game.ai_config[c]->ChangeAI(NULL);
+				_settings_game.ai_config[c]->Change(NULL);
 				if (Company::IsValidAiID(c)) {
 					/* The code belonging to an already running AI was deleted. We can only do
 					 * one thing here to keep everything sane and that is kill the AI. After
 					 * killing the offending AI we start a random other one in it's place, just
 					 * like what would happen if the AI was missing during loading. */
 					AI::Stop(c);
@@ @@ -195,16 +196,16 @@ @@
+				}
 			} else if (Company::IsValidAiID(c)) {
 				/* Update the reference in the Company struct. */
 				Company::Get(c)->ai_info = _settings_game.ai_config[c]->GetInfo();
+			}
+		}
-		if (_settings_newgame.ai_config[c] != NULL && _settings_newgame.ai_config[c]->HasAI()) {
+		if (_settings_newgame.ai_config[c] != NULL && _settings_newgame.ai_config[c]->HasScript()) {
 			if (!_settings_newgame.ai_config[c]->ResetInfo(false)) {
 				DEBUG(ai, 0, "After a reload, the AI by the name '%s' was no longer found, and removed from the list.", _settings_newgame.ai_config[c]->GetName());
-				_settings_newgame.ai_config[c]->ChangeAI(NULL);
+				_settings_newgame.ai_config[c]->Change(NULL);
+			}
+		}
+	}
+}
 /* static */ void AI::NewEvent(CompanyID company, ScriptEvent *event)

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -25,12 +25,13 @@ @@
 #include "../network/network_content.h"
 #include "../core/backup_type.hpp"
 #include "ai.hpp"
 #include "../script/api/script_log.hpp"
 #include "ai_config.hpp"
 #include "ai_info.hpp"
 #include "ai_instance.hpp"
 #include "table/strings.h"
 #include <vector>
@@ @@ -68,13 +69,13 @@ struct AIListWindow : public Window { @@
 		this->FinishInitNested(desc); // Initializes 'this->line_height' as side effect.
 		this->vscroll->SetCount((int)this->ai_info_list->size() + 1);
 		/* Try if we can find the currently selected AI */
 		this->selected = -1;
-		if (AIConfig::GetConfig(slot)->HasAI()) {
+		if (AIConfig::GetConfig(slot)->HasScript()) {
 			AIInfo *info = AIConfig::GetConfig(slot)->GetInfo();
 			int i = 0;
 			for (ScriptInfoList::const_iterator it = this->ai_info_list->begin(); it != this->ai_info_list->end(); it++, i++) {
 				if ((*it).second == info) {
 					this->selected = i;
 					break;
@@ @@ -145,17 +146,17 @@ struct AIListWindow : public Window { @@
 	/**
 	 * Changes the AI of the current slot.
 	 */
 	void ChangeAI()
+	{
 		if (this->selected == -1) {
-			AIConfig::GetConfig(slot)->ChangeAI(NULL);
+			AIConfig::GetConfig(slot)->Change(NULL);
 		} else {
 			ScriptInfoList::const_iterator it = this->ai_info_list->begin();
 			for (int i = 0; i < this->selected; i++) it++;
-			AIConfig::GetConfig(slot)->ChangeAI((*it).second->GetName(), (*it).second->GetVersion());
+			AIConfig::GetConfig(slot)->Change((*it).second->GetName(), (*it).second->GetVersion());
+		}
 		SetWindowDirty(WC_GAME_OPTIONS, 0);
+	}
 	virtual void OnClick(Point pt, int widget, int click_count)
+	{
@@ @@ -269,13 +270,13 @@ struct AISettingsWindow : public Window @@
 	int clicked_button;                   ///< The button we clicked.
 	bool clicked_increase;                ///< Whether we clicked the increase or decrease button.
 	int timeout;                          ///< Timeout for unclicking the button.
 	int clicked_row;                      ///< The clicked row of settings.
 	int line_height;                      ///< Height of a row in the matrix widget.
 	Scrollbar *vscroll;                   ///< Cache of the vertical scrollbar.
-	typedef std::vector<const AIConfigItem *> VisibleSettingsList;
+	typedef std::vector<const ScriptConfigItem *> VisibleSettingsList;
 	VisibleSettingsList visible_settings; ///< List of visible AI settings
 	/**
 	 * Constructor for the window.
 	 * @param desc The description of the window.
 	 * @param slot The company we're changing the settings for.
@@ @@ -303,15 +304,15 @@ struct AISettingsWindow : public Window @@
 	 * gui.ai_developer_tools is enabled.
 	 */
 	void RebuildVisibleSettings()
+	{
 		visible_settings.clear();
-		AIConfigItemList::const_iterator it = this->ai_config->GetConfigList()->begin();
+		ScriptConfigItemList::const_iterator it = this->ai_config->GetConfigList()->begin();
 		for (; it != this->ai_config->GetConfigList()->end(); it++) {
-			bool no_hide = (it->flags & AICONFIG_AI_DEVELOPER) == 0;
+			bool no_hide = (it->flags & SCRIPTCONFIG_DEVELOPER) == 0;
 			if (no_hide || _settings_client.gui.ai_developer_tools) {
 				visible_settings.push_back(&(*it));
+			}
+		}
+	}
@@ @@ -340,15 +341,15 @@ struct AISettingsWindow : public Window @@
 		uint text_left    = r.left + (rtl ? WD_FRAMERECT_LEFT : 28);
 		uint text_right   = r.right - (rtl ? 28 : WD_FRAMERECT_RIGHT);
 		int y = r.top;
 		for (; this->vscroll->IsVisible(i) && it != visible_settings.end(); i++, it++) {
-			const AIConfigItem &config_item = **it;
+			const ScriptConfigItem &config_item = **it;
 			int current_value = config->GetSetting((config_item).name);
-			bool editable = _game_mode == GM_MENU || !Company::IsValidID(this->slot) || (config_item.flags & AICONFIG_INGAME) != 0;
+			bool editable = _game_mode == GM_MENU || !Company::IsValidID(this->slot) || (config_item.flags & SCRIPTCONFIG_INGAME) != 0;
 			StringID str;
 			TextColour colour;
 			uint idx = 0;
 			if (StrEmpty(config_item.description)) {
 				str = STR_JUST_STRING;
@@ @@ -356,13 +357,13 @@ struct AISettingsWindow : public Window @@
 			} else {
 				str = STR_AI_SETTINGS_SETTING;
 				colour = TC_LIGHT_BLUE;
 				SetDParamStr(idx++, config_item.description);
+			}
-			if ((config_item.flags & AICONFIG_BOOLEAN) != 0) {
+			if ((config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0) {
 				DrawFrameRect(buttons_left, y  + 2, buttons_left + 19, y + 10, (current_value != 0) ? COLOUR_GREEN : COLOUR_RED, (current_value != 0) ? FR_LOWERED : FR_NONE);
 				SetDParam(idx++, current_value == 0 ? STR_CONFIG_SETTING_OFF : STR_CONFIG_SETTING_ON);
 			} else {
 				DrawArrowButtons(buttons_left, y + 2, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value);
 				if (config_item.labels != NULL && config_item.labels->Contains(current_value)) {
 					SetDParam(idx++, STR_JUST_RAW_STRING);
@@ @@ -400,16 +401,16 @@ struct AISettingsWindow : public Window @@
 				const NWidgetBase *wid = this->GetWidget<NWidgetBase>(AIS_WIDGET_BACKGROUND);
 				int num = (pt.y - wid->pos_y) / this->line_height + this->vscroll->GetPosition();
 				if (num >= (int)this->visible_settings.size()) break;
 				VisibleSettingsList::const_iterator it = this->visible_settings.begin();
 				for (int i = 0; i < num; i++) it++;
 				const AIConfigItem config_item = **it;
 				if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot) && (config_item.flags & AICONFIG_INGAME) == 0) return;
 				const ScriptConfigItem config_item = **it;
 				if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot) && (config_item.flags & SCRIPTCONFIG_INGAME) == 0) return;
-				bool bool_item = (config_item.flags & AICONFIG_BOOLEAN) != 0;
+				bool bool_item = (config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0;
 				int x = pt.x - wid->pos_x;
 				if (_current_text_dir == TD_RTL) x = wid->current_x - x;
 				x -= 4;
 				/* One of the arrows is clicked (or green/red rect in case of bool value) */
 				if (IsInsideMM(x, 0, 21)) {
@@ @@ -459,15 +460,15 @@ struct AISettingsWindow : public Window @@
+		}
+	}
 	virtual void OnQueryTextFinished(char *str)
+	{
 		if (StrEmpty(str)) return;
-		AIConfigItemList::const_iterator it = this->ai_config->GetConfigList()->begin();
+		ScriptConfigItemList::const_iterator it = this->ai_config->GetConfigList()->begin();
 		for (int i = 0; i < this->clicked_row; i++) it++;
-		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot) && (it->flags & AICONFIG_INGAME) == 0) return;
+		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot) && (it->flags & SCRIPTCONFIG_INGAME) == 0) return;
 		int32 value = atoi(str);
 		this->ai_config->SetSetting((*it).name, value);
 		this->CheckDifficultyLevel();
 		this->SetDirty();
+	}

src/ai/ai_info.cpp

➞

Show inline comments

@@ @@ -20,28 +20,12 @@ @@
 #include "../rev.h"
 #include "ai.hpp"
 /** Maximum number of operations allowed for getting a particular setting. */
 static const int MAX_GET_SETTING_OPS = 100000;
 /** Configuration for AI start date, every AI has this setting. */
 AIConfigItem _start_date_config = {
 	"start_date",
 	"Number of days to start this AI after the previous one (give or take)",
 	AI::START_NEXT_MIN,
 	AI::START_NEXT_MAX,
 	AI::START_NEXT_MEDIUM,
 	AI::START_NEXT_EASY,
 	AI::START_NEXT_MEDIUM,
 	AI::START_NEXT_HARD,
 	AI::START_NEXT_DEVIATION,
 ,
 	AICONFIG_NONE,
 	NULL
 };
 /**
  * Check if the API version provided by the AI is supported.
  * @param api_version The API version as provided by the AI.
  */
 static bool CheckAPIVersion(const char *api_version)
+{
@@ @@ -58,17 +42,24 @@ template <> const char *GetClassName<AII @@
 	/* Create the AIInfo class, and add the RegisterAI function */
 	DefSQClass<AIInfo, ST_AI> SQAIInfo("AIInfo");
 	SQAIInfo.PreRegister(engine);
 	SQAIInfo.AddConstructor<void (AIInfo::*)(), 1>(engine, "x");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddSetting, "AddSetting");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddLabels, "AddLabels");
 	SQAIInfo.DefSQConst(engine, AICONFIG_NONE, "AICONFIG_NONE");
 	SQAIInfo.DefSQConst(engine, AICONFIG_RANDOM, "AICONFIG_RANDOM");
 	SQAIInfo.DefSQConst(engine, AICONFIG_BOOLEAN, "AICONFIG_BOOLEAN");
 	SQAIInfo.DefSQConst(engine, AICONFIG_INGAME, "AICONFIG_INGAME");
 	SQAIInfo.DefSQConst(engine, AICONFIG_AI_DEVELOPER, "AICONFIG_AI_DEVELOPER");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "CONFIG_NONE");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_RANDOM, "CONFIG_RANDOM");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_BOOLEAN, "CONFIG_BOOLEAN");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_INGAME, "CONFIG_INGAME");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_DEVELOPER, "CONFIG_DEVELOPER");
 	/* Pre 1.2 had an AI prefix */
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "AICONFIG_NONE");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_RANDOM, "AICONFIG_RANDOM");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_BOOLEAN, "AICONFIG_BOOLEAN");
 	SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_INGAME, "AICONFIG_INGAME");
 	SQAIInfo.PostRegister(engine);
 	engine->AddMethod("RegisterAI", &AIInfo::Constructor, 2, "tx");
 	engine->AddMethod("RegisterDummyAI", &AIInfo::DummyConstructor, 2, "tx");
+}
 /* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)
@@ @@ -78,21 +69,17 @@ template <> const char *GetClassName<AII @@
 	if (SQ_FAILED(sq_getinstanceup(vm, 2, &instance, 0)) || instance == NULL) return sq_throwerror(vm, _SC("Pass an instance of a child class of AIInfo to RegisterAI"));
 	AIInfo *info = (AIInfo *)instance;
 	SQInteger res = ScriptInfo::Constructor(vm, info);
 	if (res != 0) return res;
-	AIConfigItem config = _start_date_config;
+	ScriptConfigItem config = _start_date_config;
 	config.name = strdup(config.name);
 	config.description = strdup(config.description);
-	info->config_list.push_back(config);
+	info->config_list.push_front(config);
 	/* Check if we have settings */
 	if (info->engine->MethodExists(*info->SQ_instance, "GetSettings")) {
 		if (!info->GetSettings()) return SQ_ERROR;
+	}
 	if (info->engine->MethodExists(*info->SQ_instance, "MinVersionToLoad")) {
 		if (!info->engine->CallIntegerMethod(*info->SQ_instance, "MinVersionToLoad", &info->min_loadable_version, MAX_GET_SETTING_OPS)) return SQ_ERROR;
 	} else {
 		info->min_loadable_version = info->GetVersion();
+	}
 	/* When there is an UseAsRandomAI function, call it. */
@@ @@ -138,232 +125,30 @@ template <> const char *GetClassName<AII @@
 	sq_setinstanceup(vm, 2, NULL);
 	/* Register the AI to the base system */
 	static_cast<AIScannerInfo *>(info->GetScanner())->SetDummyAI(info);
 	return 0;
+}
 bool AIInfo::GetSettings()
+{
 	return this->engine->CallMethod(*this->SQ_instance, "GetSettings", NULL, MAX_GET_SETTING_OPS);
+}
 AIInfo::AIInfo() :
 	min_loadable_version(0),
 	use_as_random(false),
 	api_version(NULL)
+{
+}
 AIInfo::~AIInfo()
+{
 	/* Free all allocated strings */
 	for (AIConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		free((*it).name);
 		free((*it).description);
 		if (it->labels != NULL) {
 			for (LabelMapping::iterator it2 = (*it).labels->Begin(); it2 != (*it).labels->End(); it2++) {
 				free(it2->second);
+			}
 			delete it->labels;
+		}
+	}
 	this->config_list.clear();
 	free(this->api_version);
+}
 bool AIInfo::CanLoadFromVersion(int version) const
+{
 	if (version == -1) return true;
 	return version >= this->min_loadable_version && version <= this->GetVersion();
+}
 SQInteger AIInfo::AddSetting(HSQUIRRELVM vm)
+{
 	AIConfigItem config;
 	memset(&config, 0, sizeof(config));
 	config.max_value = 1;
 	config.step_size = 1;
 	uint items = 0;
 	/* Read the table, and find all properties we care about */
 	sq_pushnull(vm);
 	while (SQ_SUCCEEDED(sq_next(vm, -2))) {
 		const SQChar *sqkey;
 		if (SQ_FAILED(sq_getstring(vm, -2, &sqkey))) return SQ_ERROR;
 		const char *key = SQ2OTTD(sqkey);
 		if (strcmp(key, "name") == 0) {
 			const SQChar *sqvalue;
 			if (SQ_FAILED(sq_getstring(vm, -1, &sqvalue))) return SQ_ERROR;
 			char *name = strdup(SQ2OTTD(sqvalue));
 			char *s;
 			/* Don't allow '=' and ',' in configure setting names, as we need those
 			 *  2 chars to nicely store the settings as a string. */
 			while ((s = strchr(name, '=')) != NULL) *s = '_';
 			while ((s = strchr(name, ',')) != NULL) *s = '_';
 			config.name = name;
 			items |= 0x001;
 		} else if (strcmp(key, "description") == 0) {
 			const SQChar *sqdescription;
 			if (SQ_FAILED(sq_getstring(vm, -1, &sqdescription))) return SQ_ERROR;
 			config.description = strdup(SQ2OTTD(sqdescription));
 			items |= 0x002;
 		} else if (strcmp(key, "min_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.min_value = res;
 			items |= 0x004;
 		} else if (strcmp(key, "max_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.max_value = res;
 			items |= 0x008;
 		} else if (strcmp(key, "easy_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.easy_value = res;
 			items |= 0x010;
 		} else if (strcmp(key, "medium_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.medium_value = res;
 			items |= 0x020;
 		} else if (strcmp(key, "hard_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.hard_value = res;
 			items |= 0x040;
 		} else if (strcmp(key, "random_deviation") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.random_deviation = res;
 			items |= 0x200;
 		} else if (strcmp(key, "custom_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.custom_value = res;
 			items |= 0x080;
 		} else if (strcmp(key, "step_size") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.step_size = res;
 		} else if (strcmp(key, "flags") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.flags = (AIConfigFlags)res;
 			items |= 0x100;
 		} else {
 			char error[1024];
 			snprintf(error, sizeof(error), "unknown setting property '%s'", key);
 			this->engine->ThrowError(error);
 			return SQ_ERROR;
+		}
 		sq_pop(vm, 2);
+	}
 	sq_pop(vm, 1);
 	/* Don't allow both random_deviation and AICONFIG_RANDOM to
 	 * be set for the same config item. */
 	if ((items & 0x200) != 0 && (config.flags & AICONFIG_RANDOM) != 0) {
 		char error[1024];
 		snprintf(error, sizeof(error), "Setting both random_deviation and AICONFIG_RANDOM is not allowed");
 		this->engine->ThrowError(error);
 		return SQ_ERROR;
+	}
 	/* Reset the bit for random_deviation as it's optional. */
 	items &= ~0x200;
 	/* Make sure all properties are defined */
 	uint mask = (config.flags & AICONFIG_BOOLEAN) ? 0x1F3 : 0x1FF;
 	if (items != mask) {
 		char error[1024];
 		snprintf(error, sizeof(error), "please define all properties of a setting (min/max not allowed for booleans)");
 		this->engine->ThrowError(error);
 		return SQ_ERROR;
+	}
 	this->config_list.push_back(config);
 	return 0;
+}
 SQInteger AIInfo::AddLabels(HSQUIRRELVM vm)
+{
 	const SQChar *sq_setting_name;
 	if (SQ_FAILED(sq_getstring(vm, -2, &sq_setting_name))) return SQ_ERROR;
 	const char *setting_name = SQ2OTTD(sq_setting_name);
 	AIConfigItem *config = NULL;
 	for (AIConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		if (strcmp((*it).name, setting_name) == 0) config = &(*it);
+	}
 	if (config == NULL) {
 		char error[1024];
 		snprintf(error, sizeof(error), "Trying to add labels for non-defined setting '%s'", setting_name);
 		this->engine->ThrowError(error);
 		return SQ_ERROR;
+	}
 	if (config->labels != NULL) return SQ_ERROR;
 	config->labels = new LabelMapping;
 	/* Read the table and find all labels */
 	sq_pushnull(vm);
 	while (SQ_SUCCEEDED(sq_next(vm, -2))) {
 		const SQChar *sq_key;
 		const SQChar *sq_label;
 		if (SQ_FAILED(sq_getstring(vm, -2, &sq_key))) return SQ_ERROR;
 		if (SQ_FAILED(sq_getstring(vm, -1, &sq_label))) return SQ_ERROR;
 		/* Because squirrel doesn't support identifiers starting with a digit,
 		 * we skip the first character. */
 		const char *key_string = SQ2OTTD(sq_key);
 		int key = atoi(key_string + 1);
 		const char *label = SQ2OTTD(sq_label);
 		/* !Contains() prevents strdup from leaking. */
 		if (!config->labels->Contains(key)) config->labels->Insert(key, strdup(label));
 		sq_pop(vm, 2);
+	}
 	sq_pop(vm, 1);
 	return 0;
+}
 const AIConfigItemList *AIInfo::GetConfigList() const
+{
 	return &this->config_list;
+}
 const AIConfigItem *AIInfo::GetConfigItem(const char *name) const
+{
 	for (AIConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		if (strcmp((*it).name, name) == 0) return &(*it);
+	}
 	return NULL;
+}
 int AIInfo::GetSettingDefaultValue(const char *name) const
+{
 	for (AIConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		if (strcmp((*it).name, name) != 0) continue;
 		/* The default value depends on the difficulty level */
 		switch (GetGameSettings().difficulty.diff_level) {
 			case 0: return (*it).easy_value;
 			case 1: return (*it).medium_value;
 			case 2: return (*it).hard_value;
 			case 3: return (*it).custom_value;
 			default: NOT_REACHED();
+		}
+	}
 	/* There is no such setting */
 	return -1;
+}
 AILibrary::~AILibrary()
+{
 	free(this->category);
+}

src/ai/ai_info.hpp

➞

Show inline comments

@@ @@ -11,46 +11,14 @@ @@
 #ifndef AI_INFO_HPP
 #define AI_INFO_HPP
 #ifdef ENABLE_AI
 #include <list>
 #include "../core/smallmap_type.hpp"
 #include "../script/script_info.hpp"
 /** Bitmask of flags for AI settings. */
 enum AIConfigFlags {
 	AICONFIG_NONE         = 0x0, ///< No flags set.
 	AICONFIG_RANDOM       = 0x1, ///< When randomizing the AI, pick any value between min_value and max_value when on custom difficulty setting.
 	AICONFIG_BOOLEAN      = 0x2, ///< This value is a boolean (either 0 (false) or 1 (true) ).
 	AICONFIG_INGAME       = 0x4, ///< This setting can be changed while the AI is running.
 	AICONFIG_AI_DEVELOPER = 0x8, ///< This setting will only be visible when the ai development tools are active.
 };
 typedef SmallMap<int, char *> LabelMapping; ///< Map-type used to map the setting numbers to labels.
 /** Info about a single AI setting. */
 struct AIConfigItem {
 	const char *name;        ///< The name of the configuration setting.
 	const char *description; ///< The description of the configuration setting.
 	int min_value;           ///< The minimal value this configuration setting can have.
 	int max_value;           ///< The maximal value this configuration setting can have.
 	int custom_value;        ///< The default value on custom difficulty setting.
 	int easy_value;          ///< The default value on easy difficulty setting.
 	int medium_value;        ///< The default value on medium difficulty setting.
 	int hard_value;          ///< The default value on hard difficulty setting.
 	int random_deviation;    ///< The maximum random deviation from the default value.
 	int step_size;           ///< The step size in the gui.
 	AIConfigFlags flags;     ///< Flags for the configuration setting.
 	LabelMapping *labels;    ///< Text labels for the integer values.
 };
 extern AIConfigItem _start_date_config;
 typedef std::list<AIConfigItem> AIConfigItemList; ///< List of AIConfig items.
 #include "../script/script_config.hpp"
 /** All static information from an AI like name, version, etc. */
 class AIInfo : public ScriptInfo {
 public:
 	AIInfo();
 	~AIInfo();
@@ @@ -68,61 +36,30 @@ public: @@
 	/**
 	 * Create a dummy-AI.
 	 */
 	static SQInteger DummyConstructor(HSQUIRRELVM vm);
 	/**
 	 * Get the settings of the AI.
 	 */
 	bool GetSettings();
 	/**
 	 * Get the config list for this AI.
 	 */
 	const AIConfigItemList *GetConfigList() const;
 	/**
 	 * Get the description of a certain ai config option.
 	 */
 	const AIConfigItem *GetConfigItem(const char *name) const;
 	/**
 	 * Check if we can start this AI.
 	 */
 	bool CanLoadFromVersion(int version) const;
 	/**
 	 * Set a setting.
 	 */
 	SQInteger AddSetting(HSQUIRRELVM vm);
 	/**
 	 * Add labels for a setting.
 	 */
 	SQInteger AddLabels(HSQUIRRELVM vm);
 	/**
 	 * Get the default value for a setting.
 	 */
 	int GetSettingDefaultValue(const char *name) const;
 	/**
 	 * Use this AI as a random AI.
 	 */
 	bool UseAsRandomAI() const { return this->use_as_random; }
 	/**
 	 * Get the API version this AI is written for.
 	 */
 	const char *GetAPIVersion() const { return this->api_version; }
 private:
 	AIConfigItemList config_list; ///< List of settings from this AI.
 	int min_loadable_version;     ///< The AI can load savegame data if the version is equal or greater than this.
 	bool use_as_random;           ///< Should this AI be used when the user wants a "random AI"?
 	const char *api_version;      ///< API version used by this AI.
 	int min_loadable_version; ///< The AI can load savegame data if the version is equal or greater than this.
 	bool use_as_random;       ///< Should this AI be used when the user wants a "random AI"?
 	const char *api_version;  ///< API version used by this AI.
 };
 /** All static information from an AI library like name, version, etc. */
 class AILibrary : public ScriptInfo {
 public:
 	AILibrary() : ScriptInfo(), category(NULL) {};

src/ai/ai_instance.cpp

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ @@
 #include "ai_config.hpp"
 #include "ai_gui.hpp"
 #include "../script/script_fatalerror.hpp"
 #include "../script/script_suspend.hpp"
 #include "../script/script_storage.hpp"
 #include "ai_info.hpp"
 #include "ai_instance.hpp"
 /* Convert all AI related classes to Squirrel data.
  * Note: this line is a marker in squirrel_export.sh. Do not change! */
 #include "api/ai_accounting.hpp.sq"
 #include "api/ai_airport.hpp.sq"

src/ai/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -28,26 +28,28 @@ @@
  * \li AICompany::GetQuarterlyIncome
  * \li AICompany::GetQuarterlyExpenses
  * \li AICompany::GetQuarterlyCargoDelivered
  * \li AICompany::GetQuarterlyPerformanceRating
  * \li AICompany::GetQuarterlyCompanyValue
  * \li AIController::GetOpsTillSuspend
- * \li AIInfo::AICONFIG_AI_DEVELOPER
+ * \li AIInfo::CONFIG_DEVELOPER
  * \li AIOrder::GetOrderRefit
  * \li AIOrder::IsRefitOrder
  * \li AIOrder::SetOrderRefit
  * \li AITown::GetCargoGoal
  * \li AITown::GetGrowthRate
  * \li AITown::GetLastMonthReceived
  * \li AITown::GetTownAuthority
  * \li AITownEffectList (to walk over all available town effects)
  * \li AIVehicle::ERR_VEHICLE_TOO_LONG in case vehicle length limit is reached
+ *
  * API renames:
  * \li AITown::GetLastMonthTransported to AITown::GetLastMonthSupplied to better
  *     reflect what it does
  *     reflect what it does.
  * \li AIInfo has all its configure settings renamed from AICONFIG to just CONFIG
  *     like CONFIG_RANDOM.
+ *
  * API removals:
  * \li AICompany::GetCompanyValue, use AICompany::GetQuarterlyCompanyValue instead.
+ *
  * Other changes:
  * \li AITown::GetLastMonthProduction no longer has prerequisites based on town

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -1147,14 +1147,14 @@ DEF_CONSOLE_CMD(ConStartAI) @@
 		if (c->index != n) break;
 		n++;
+	}
 	AIConfig *config = AIConfig::GetConfig((CompanyID)n);
 	if (argc >= 2) {
 		config->ChangeAI(argv[1], -1, true);
 		if (!config->HasAI()) {
 		config->Change(argv[1], -1, true);
 		if (!config->HasScript()) {
 			IConsoleWarning("Failed to load the specified AI");
 			return true;
+		}
 		if (argc == 3) {
 			config->StringToSettings(argv[2]);
+		}

src/saveload/ai_sl.cpp

➞

Show inline comments

@@ @@ -36,35 +36,35 @@ static const SaveLoad _ai_company[] = { @@
 static void SaveReal_AIPL(int *index_ptr)
+{
 	CompanyID index = (CompanyID)*index_ptr;
 	AIConfig *config = AIConfig::GetConfig(index);
-	if (config->HasAI()) {
+	if (config->HasScript()) {
 		ttd_strlcpy(_ai_saveload_name, config->GetName(), lengthof(_ai_saveload_name));
 		_ai_saveload_version = config->GetVersion();
 	} else {
 		/* No AI is configured for this so store an empty string as name. */
 		_ai_saveload_name[0] = '\0';
 		_ai_saveload_version = -1;
+	}
-	_ai_saveload_is_random = config->IsRandomAI();
+	_ai_saveload_is_random = config->IsRandom();
 	_ai_saveload_settings[0] = '\0';
 	config->SettingsToString(_ai_saveload_settings, lengthof(_ai_saveload_settings));
 	SlObject(NULL, _ai_company);
 	/* If the AI was active, store his data too */
 	if (Company::IsValidAiID(index)) AI::Save(index);
+}
 static void Load_AIPL()
+{
 	/* Free all current data */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		AIConfig::GetConfig(c, AIConfig::AISS_FORCE_GAME)->ChangeAI(NULL);
+		AIConfig::GetConfig(c, AIConfig::SSS_FORCE_GAME)->Change(NULL);
+	}
 	CompanyID index;
 	while ((index = (CompanyID)SlIterateArray()) != (CompanyID)-1) {
 		if (index >= MAX_COMPANIES) SlErrorCorrupt("Too many AI configs");
@@ @@ -73,23 +73,23 @@ static void Load_AIPL() @@
 		if (_networking && !_network_server) {
 			if (Company::IsValidAiID(index)) AIInstance::LoadEmpty();
 			continue;
+		}
-		AIConfig *config = AIConfig::GetConfig(index, AIConfig::AISS_FORCE_GAME);
+		AIConfig *config = AIConfig::GetConfig(index, AIConfig::SSS_FORCE_GAME);
 		if (StrEmpty(_ai_saveload_name)) {
 			/* A random AI. */
-			config->ChangeAI(NULL, -1, false, true);
+			config->Change(NULL, -1, false, true);
 		} else {
 			config->ChangeAI(_ai_saveload_name, _ai_saveload_version, false, _ai_saveload_is_random);
 			if (!config->HasAI()) {
 			config->Change(_ai_saveload_name, _ai_saveload_version, false, _ai_saveload_is_random);
 			if (!config->HasScript()) {
 				/* No version of the AI available that can load the data. Try to load the
 				 * latest version of the AI instead. */
 				config->ChangeAI(_ai_saveload_name, -1, false, _ai_saveload_is_random);
 				if (!config->HasAI()) {
 				config->Change(_ai_saveload_name, -1, false, _ai_saveload_is_random);
 				if (!config->HasScript()) {
 					if (strcmp(_ai_saveload_name, "%_dummy") != 0) {
 						DEBUG(ai, 0, "The savegame has an AI by the name '%s', version %d which is no longer available.", _ai_saveload_name, _ai_saveload_version);
 						DEBUG(ai, 0, "A random other AI will be loaded in its place.");
 					} else {
 						DEBUG(ai, 0, "The savegame had no AIs available at the time of saving.");
 						DEBUG(ai, 0, "A random available AI will be loaded now.");

src/script/api/script_controller.cpp

➞

Show inline comments

@@ @@ -18,12 +18,13 @@ @@
 #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"
 #include "../script_suspend.hpp"
 #include "script_log.hpp"
 /* static */ void ScriptController::SetCommandDelay(int ticks)
+{
 	if (ticks <= 0) return;
@@ @@ -93,13 +94,13 @@ ScriptController::~ScriptController() @@
 	/* Internally we store libraries as 'library.version' */
 	char library_name[1024];
 	snprintf(library_name, sizeof(library_name), "%s.%d", library, version);
 	strtolower(library_name);
-	AILibrary *lib = AI::FindLibrary(library, version);
+	ScriptInfo *lib = (ScriptInfo *)AI::FindLibrary(library, version);
 	if (lib == NULL) {
 		char error[1024];
 		snprintf(error, sizeof(error), "couldn't find library '%s' with version %d", library, version);
 		throw sq_throwerror(vm, OTTD2SQ(error));
+	}

src/script/script_config.cpp

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file script_config.cpp Implementation of ScriptConfig. */
 #include "../stdafx.h"
 #include "../settings_type.h"
 #include "../core/random_func.hpp"
 #include "script_info.hpp"
 #include "script_config.hpp"
 void ScriptConfig::Change(const char *name, int version, bool force_exact_match, bool is_random)
+{
 	free(this->name);
 	this->name = (name == NULL) ? NULL : strdup(name);
 	this->info = (name == NULL) ? NULL : this->FindInfo(this->name, version, force_exact_match);
 	this->version = (info == NULL) ? -1 : info->GetVersion();
 	this->is_random = is_random;
 	if (this->config_list != NULL) delete this->config_list;
 	this->config_list = (info == NULL) ? NULL : new ScriptConfigItemList();
 	if (this->config_list != NULL) this->PushExtraConfigList();
 	this->ClearConfigList();
 	if (_game_mode == GM_NORMAL && this->info != NULL) {
 		/* If we're in an existing game and the Script is changed, set all settings
 		 *  for the Script that have the random flag to a random value. */
 		for (ScriptConfigItemList::const_iterator it = this->info->GetConfigList()->begin(); it != this->info->GetConfigList()->end(); it++) {
 			if ((*it).flags & SCRIPTCONFIG_RANDOM) {
 				this->SetSetting((*it).name, InteractiveRandomRange((*it).max_value - (*it).min_value) + (*it).min_value);
+			}
+		}
 		this->AddRandomDeviation();
+	}
+}
 ScriptConfig::ScriptConfig(const ScriptConfig *config)
+{
 	this->name = (config->name == NULL) ? NULL : strdup(config->name);
 	this->info = config->info;
 	this->version = config->version;
 	this->config_list = NULL;
 	this->is_random = config->is_random;
 	for (SettingValueList::const_iterator it = config->settings.begin(); it != config->settings.end(); it++) {
 		this->settings[strdup((*it).first)] = (*it).second;
+	}
 	this->AddRandomDeviation();
+}
 ScriptConfig::~ScriptConfig()
+{
 	free(this->name);
 	this->ResetSettings();
 	if (this->config_list != NULL) delete this->config_list;
+}
 ScriptInfo *ScriptConfig::GetInfo() const
+{
 	return this->info;
+}
 const ScriptConfigItemList *ScriptConfig::GetConfigList()
+{
 	if (this->info != NULL) return this->info->GetConfigList();
 	if (this->config_list == NULL) {
 		this->config_list = new ScriptConfigItemList();
 		this->PushExtraConfigList();
+	}
 	return this->config_list;
+}
 void ScriptConfig::ClearConfigList()
+{
 	for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		free((*it).first);
+	}
 	this->settings.clear();
+}
 int ScriptConfig::GetSetting(const char *name) const
+{
 	/* Return default values if the difficulty is not set to Custom */
 	if (GetGameSettings().difficulty.diff_level != 3) {
 		return this->info->GetSettingDefaultValue(name);
+	}
 	SettingValueList::const_iterator it = this->settings.find(name);
 	if (it == this->settings.end()) return this->info->GetSettingDefaultValue(name);
 	return (*it).second;
+}
 void ScriptConfig::SetSetting(const char *name, int value)
+{
 	/* You can only set Script specific settings if an Script is selected. */
 	if (this->info == NULL) return;
 	const ScriptConfigItem *config_item = this->info->GetConfigItem(name);
 	if (config_item == NULL) return;
 	value = Clamp(value, config_item->min_value, config_item->max_value);
 	SettingValueList::iterator it = this->settings.find(name);
 	if (it != this->settings.end()) {
 		(*it).second = value;
 	} else {
 		this->settings[strdup(name)] = value;
+	}
+}
 void ScriptConfig::ResetSettings()
+{
 	for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		free((*it).first);
+	}
 	this->settings.clear();
+}
 void ScriptConfig::AddRandomDeviation()
+{
 	for (ScriptConfigItemList::const_iterator it = this->GetConfigList()->begin(); it != this->GetConfigList()->end(); it++) {
 		if ((*it).random_deviation != 0) {
 			this->SetSetting((*it).name, InteractiveRandomRange((*it).random_deviation * 2) - (*it).random_deviation + this->GetSetting((*it).name));
+		}
+	}
+}
 bool ScriptConfig::HasScript() const
+{
 	return this->info != NULL;
+}
 bool ScriptConfig::IsRandom() const
+{
 	return this->is_random;
+}
 const char *ScriptConfig::GetName() const
+{
 	return this->name;
+}
 int ScriptConfig::GetVersion() const
+{
 	return this->version;
+}
 void ScriptConfig::StringToSettings(const char *value)
+{
 	char *value_copy = strdup(value);
 	char *s = value_copy;
 	while (s != NULL) {
 		/* Analyze the string ('name=value,name=value\0') */
 		char *item_name = s;
 		s = strchr(s, '=');
 		if (s == NULL) break;
 		if (*s == '\0') break;
 		*s = '\0';
 		s++;
 		char *item_value = s;
 		s = strchr(s, ',');
 		if (s != NULL) {
 			*s = '\0';
 			s++;
+		}
 		this->SetSetting(item_name, atoi(item_value));
+	}
 	free(value_copy);
+}
 void ScriptConfig::SettingsToString(char *string, size_t size) const
+{
 	string[0] = '\0';
 	for (SettingValueList::const_iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		char no[10];
 		snprintf(no, sizeof(no), "%d", (*it).second);
 		/* Check if the string would fit in the destination */
 		size_t needed_size = strlen((*it).first) + 1 + strlen(no) + 1;
 		/* If it doesn't fit, skip the next settings */
 		if (size <= needed_size) break;
 		size -= needed_size;
 		strcat(string, (*it).first);
 		strcat(string, "=");
 		strcat(string, no);
 		strcat(string, ",");
+	}
 	/* Remove the last ',', but only if at least one setting was saved. */
 	size_t len = strlen(string);
 	if (len > 0) string[len - 1] = '\0';
+}

src/script/script_config.hpp

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file script_config.hpp ScriptConfig stores the configuration settings of every Script. */
 #ifndef SCRIPT_CONFIG_HPP
 #define SCRIPT_CONFIG_HPP
 #include <map>
 #include <list>
 #include "../core/smallmap_type.hpp"
 #include "../core/string_compare_type.hpp"
 #include "../company_type.h"
 /** Bitmask of flags for Script settings. */
 enum ScriptConfigFlags {
 	SCRIPTCONFIG_NONE      = 0x0, ///< No flags set.
 	SCRIPTCONFIG_RANDOM    = 0x1, ///< When randomizing the Script, pick any value between min_value and max_value when on custom difficulty setting.
 	SCRIPTCONFIG_BOOLEAN   = 0x2, ///< This value is a boolean (either 0 (false) or 1 (true) ).
 	SCRIPTCONFIG_INGAME    = 0x4, ///< This setting can be changed while the Script is running.
 	SCRIPTCONFIG_DEVELOPER = 0x8, ///< This setting will only be visible when the Script development tools are active.
 };
 typedef SmallMap<int, char *> LabelMapping; ///< Map-type used to map the setting numbers to labels.
 /** Info about a single Script setting. */
 struct ScriptConfigItem {
 	const char *name;        ///< The name of the configuration setting.
 	const char *description; ///< The description of the configuration setting.
 	int min_value;           ///< The minimal value this configuration setting can have.
 	int max_value;           ///< The maximal value this configuration setting can have.
 	int custom_value;        ///< The default value on custom difficulty setting.
 	int easy_value;          ///< The default value on easy difficulty setting.
 	int medium_value;        ///< The default value on medium difficulty setting.
 	int hard_value;          ///< The default value on hard difficulty setting.
 	int random_deviation;    ///< The maximum random deviation from the default value.
 	int step_size;           ///< The step size in the gui.
 	ScriptConfigFlags flags; ///< Flags for the configuration setting.
 	LabelMapping *labels;    ///< Text labels for the integer values.
 };
 typedef std::list<ScriptConfigItem> ScriptConfigItemList; ///< List of ScriptConfig items.
 extern ScriptConfigItem _start_date_config;
 /**
  * Script settings.
  */
 class ScriptConfig {
 protected:
 	/** List with name=>value pairs of all script-specific settings */
 	typedef std::map<const char *, int, StringCompare> SettingValueList;
 public:
 	ScriptConfig() :
 		name(NULL),
 		version(-1),
 		info(NULL),
 		config_list(NULL),
 		is_random(false)
 	{}
 	/**
 	 * Create a new Script config that is a copy of an existing config.
 	 * @param config The object to copy.
 	 */
 	ScriptConfig(const ScriptConfig *config);
 	/** Delete an Script configuration. */
 	virtual ~ScriptConfig();
 	/**
 	 * Set another Script to be loaded in this slot.
 	 * @param name The name of the Script.
 	 * @param version The version of the Script to load, or -1 of latest.
 	 * @param force_exact_match If true try to find the exact same version
 	 *   as specified. If false any compatible version is ok.
 	 * @param is_random Is the Script chosen randomly?
 	 */
 	void Change(const char *name, int version = -1, bool force_exact_match = false, bool is_random = false);
 	/**
 	 * Get the ScriptInfo linked to this ScriptConfig.
 	 */
 	class ScriptInfo *GetInfo() const;
 	/**
 	 * Get the config list for this ScriptConfig.
 	 */
 	const ScriptConfigItemList *GetConfigList();
 	/**
 	 * Where to get the config from, either default (depends on current game
 	 * mode) or force either newgame or normal
 	 */
 	enum ScriptSettingSource {
 		SSS_DEFAULT,       ///< Get the Script config from the current game mode
 		SSS_FORCE_NEWGAME, ///< Get the newgame Script config
 		SSS_FORCE_GAME,    ///< Get the Script config from the current game
 	};
 	/**
 	 * Get the value of a setting for this config. It might fallback to his
 	 *  'info' to find the default value (if not set or if not-custom difficulty
 	 *  level).
 	 * @return The (default) value of the setting, or -1 if the setting was not
 	 *  found.
 	 */
 	virtual int GetSetting(const char *name) const;
 	/**
 	 * Set the value of a setting for this config.
 	 */
 	virtual void SetSetting(const char *name, int value);
 	/**
 	 * Reset all settings to their default value.
 	 */
 	void ResetSettings();
 	/**
 	 * Randomize all settings the Script requested to be randomized.
 	 */
 	void AddRandomDeviation();
 	/**
 	 * Is this config attached to an Script? In other words, is there a Script
 	 *  that is assigned to this slot.
 	 */
 	bool HasScript() const;
 	/**
 	 * Is the current Script a randomly chosen Script?
 	 */
 	bool IsRandom() const;
 	/**
 	 * Get the name of the Script.
 	 */
 	const char *GetName() const;
 	/**
 	 * Get the version of the Script.
 	 */
 	int GetVersion() const;
 	/**
 	 * Convert a string which is stored in the config file or savegames to
 	 *  custom settings of this Script.
 	 */
 	void StringToSettings(const char *value);
 	/**
 	 * Convert the custom settings to a string that can be stored in the config
 	 *  file or savegames.
 	 */
 	void SettingsToString(char *string, size_t size) const;
 protected:
 	const char *name;                  ///< Name of the Script
 	int version;                       ///< Version of the Script
 	class ScriptInfo *info;            ///< ScriptInfo object for related to this Script version
 	SettingValueList settings;         ///< List with all setting=>value pairs that are configure for this Script
 	ScriptConfigItemList *config_list; ///< List with all settings defined by this Script
 	bool is_random;                    ///< True if the AI in this slot was randomly chosen.
 	/**
 	 * In case you have mandatory non-Script-definable config entries in your
 	 *  list, add them to this function.
 	 */
 	virtual void PushExtraConfigList() {};
 	/**
 	 * Routine that clears the config list.
 	 */
 	virtual void ClearConfigList();
 	/**
 	 * This function should call back to the Scanner in charge of this Config,
 	 *  to find the ScriptInfo belonging to a name+version.
 	 */
 	virtual ScriptInfo *FindInfo(const char *name, int version, bool force_exact_match) = 0;
 };
 #endif /* SCRIPT_CONFIG_HPP */

src/script/script_info.cpp

➞

Show inline comments

@@ @@ -7,25 +7,42 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file script_info.cpp Implementation of ScriptInfo. */
 #include "../stdafx.h"
 #include "../settings_type.h"
 #include "squirrel_helper.hpp"
 #include "script_info.hpp"
 #include "script_scanner.hpp"
 /** Number of operations to get the author and similar information. */
 static const int MAX_GET_OPS            =   1000;
 /** Number of operations to create an instance of a script. */
 static const int MAX_CREATEINSTANCE_OPS = 100000;
 /** Maximum number of operations allowed for getting a particular setting. */
 static const int MAX_GET_SETTING_OPS    = 100000;
 ScriptInfo::~ScriptInfo()
+{
 	/* Free all allocated strings */
 	for (ScriptConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		free((*it).name);
 		free((*it).description);
 		if (it->labels != NULL) {
 			for (LabelMapping::iterator it2 = (*it).labels->Begin(); it2 != (*it).labels->End(); it2++) {
 				free(it2->second);
+			}
 			delete it->labels;
+		}
+	}
 	this->config_list.clear();
 	free(this->author);
 	free(this->name);
 	free(this->short_name);
 	free(this->description);
 	free(this->date);
 	free(this->instance_name);
@@ @@ -87,8 +104,203 @@ bool ScriptInfo::CheckMethod(const char @@
 	/* The GetURL function is optional. */
 	if (info->engine->MethodExists(*info->SQ_instance, "GetURL")) {
 		if (!info->engine->CallStringMethodStrdup(*info->SQ_instance, "GetURL", &info->url, MAX_GET_OPS)) return SQ_ERROR;
+	}
 	/* Check if we have settings */
 	if (info->engine->MethodExists(*info->SQ_instance, "GetSettings")) {
 		if (!info->GetSettings()) return SQ_ERROR;
+	}
 	return 0;
+}
 bool ScriptInfo::GetSettings()
+{
 	return this->engine->CallMethod(*this->SQ_instance, "GetSettings", NULL, MAX_GET_SETTING_OPS);
+}
 SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm)
+{
 	ScriptConfigItem config;
 	memset(&config, 0, sizeof(config));
 	config.max_value = 1;
 	config.step_size = 1;
 	uint items = 0;
 	/* Read the table, and find all properties we care about */
 	sq_pushnull(vm);
 	while (SQ_SUCCEEDED(sq_next(vm, -2))) {
 		const SQChar *sqkey;
 		if (SQ_FAILED(sq_getstring(vm, -2, &sqkey))) return SQ_ERROR;
 		const char *key = SQ2OTTD(sqkey);
 		if (strcmp(key, "name") == 0) {
 			const SQChar *sqvalue;
 			if (SQ_FAILED(sq_getstring(vm, -1, &sqvalue))) return SQ_ERROR;
 			char *name = strdup(SQ2OTTD(sqvalue));
 			char *s;
 			/* Don't allow '=' and ',' in configure setting names, as we need those
 			 *  2 chars to nicely store the settings as a string. */
 			while ((s = strchr(name, '=')) != NULL) *s = '_';
 			while ((s = strchr(name, ',')) != NULL) *s = '_';
 			config.name = name;
 			items |= 0x001;
 		} else if (strcmp(key, "description") == 0) {
 			const SQChar *sqdescription;
 			if (SQ_FAILED(sq_getstring(vm, -1, &sqdescription))) return SQ_ERROR;
 			config.description = strdup(SQ2OTTD(sqdescription));
 			items |= 0x002;
 		} else if (strcmp(key, "min_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.min_value = res;
 			items |= 0x004;
 		} else if (strcmp(key, "max_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.max_value = res;
 			items |= 0x008;
 		} else if (strcmp(key, "easy_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.easy_value = res;
 			items |= 0x010;
 		} else if (strcmp(key, "medium_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.medium_value = res;
 			items |= 0x020;
 		} else if (strcmp(key, "hard_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.hard_value = res;
 			items |= 0x040;
 		} else if (strcmp(key, "random_deviation") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.random_deviation = res;
 			items |= 0x200;
 		} else if (strcmp(key, "custom_value") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.custom_value = res;
 			items |= 0x080;
 		} else if (strcmp(key, "step_size") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.step_size = res;
 		} else if (strcmp(key, "flags") == 0) {
 			SQInteger res;
 			if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
 			config.flags = (ScriptConfigFlags)res;
 			items |= 0x100;
 		} else {
 			char error[1024];
 			snprintf(error, sizeof(error), "unknown setting property '%s'", key);
 			this->engine->ThrowError(error);
 			return SQ_ERROR;
+		}
 		sq_pop(vm, 2);
+	}
 	sq_pop(vm, 1);
 	/* Don't allow both random_deviation and SCRIPTCONFIG_RANDOM to
 	 * be set for the same config item. */
 	if ((items & 0x200) != 0 && (config.flags & SCRIPTCONFIG_RANDOM) != 0) {
 		char error[1024];
 		snprintf(error, sizeof(error), "Setting both random_deviation and SCRIPTCONFIG_RANDOM is not allowed");
 		this->engine->ThrowError(error);
 		return SQ_ERROR;
+	}
 	/* Reset the bit for random_deviation as it's optional. */
 	items &= ~0x200;
 	/* Make sure all properties are defined */
 	uint mask = (config.flags & SCRIPTCONFIG_BOOLEAN) ? 0x1F3 : 0x1FF;
 	if (items != mask) {
 		char error[1024];
 		snprintf(error, sizeof(error), "please define all properties of a setting (min/max not allowed for booleans)");
 		this->engine->ThrowError(error);
 		return SQ_ERROR;
+	}
 	this->config_list.push_back(config);
 	return 0;
+}
 SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm)
+{
 	const SQChar *sq_setting_name;
 	if (SQ_FAILED(sq_getstring(vm, -2, &sq_setting_name))) return SQ_ERROR;
 	const char *setting_name = SQ2OTTD(sq_setting_name);
 	ScriptConfigItem *config = NULL;
 	for (ScriptConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		if (strcmp((*it).name, setting_name) == 0) config = &(*it);
+	}
 	if (config == NULL) {
 		char error[1024];
 		snprintf(error, sizeof(error), "Trying to add labels for non-defined setting '%s'", setting_name);
 		this->engine->ThrowError(error);
 		return SQ_ERROR;
+	}
 	if (config->labels != NULL) return SQ_ERROR;
 	config->labels = new LabelMapping;
 	/* Read the table and find all labels */
 	sq_pushnull(vm);
 	while (SQ_SUCCEEDED(sq_next(vm, -2))) {
 		const SQChar *sq_key;
 		const SQChar *sq_label;
 		if (SQ_FAILED(sq_getstring(vm, -2, &sq_key))) return SQ_ERROR;
 		if (SQ_FAILED(sq_getstring(vm, -1, &sq_label))) return SQ_ERROR;
 		/* Because squirrel doesn't support identifiers starting with a digit,
 		 * we skip the first character. */
 		const char *key_string = SQ2OTTD(sq_key);
 		int key = atoi(key_string + 1);
 		const char *label = SQ2OTTD(sq_label);
 		/* !Contains() prevents strdup from leaking. */
 		if (!config->labels->Contains(key)) config->labels->Insert(key, strdup(label));
 		sq_pop(vm, 2);
+	}
 	sq_pop(vm, 1);
 	return 0;
+}
 const ScriptConfigItemList *ScriptInfo::GetConfigList() const
+{
 	return &this->config_list;
+}
 const ScriptConfigItem *ScriptInfo::GetConfigItem(const char *name) const
+{
 	for (ScriptConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		if (strcmp((*it).name, name) == 0) return &(*it);
+	}
 	return NULL;
+}
 int ScriptInfo::GetSettingDefaultValue(const char *name) const
+{
 	for (ScriptConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
 		if (strcmp((*it).name, name) != 0) continue;
 		/* The default value depends on the difficulty level */
 		switch (GetGameSettings().difficulty.diff_level) {
 			case 0: return (*it).easy_value;
 			case 1: return (*it).medium_value;
 			case 2: return (*it).hard_value;
 			case 3: return (*it).custom_value;
 			default: NOT_REACHED();
+		}
+	}
 	/* There is no such setting */
 	return -1;
+}

src/script/script_info.hpp

➞

Show inline comments

@@ @@ -12,12 +12,14 @@ @@
 #ifndef SCRIPT_INFO_HPP
 #define SCRIPT_INFO_HPP
 #include <squirrel.h>
 #include "../misc/countedptr.hpp"
 #include "script_config.hpp"
 class ScriptInfo : public SimpleCountedObject {
 public:
 	ScriptInfo() :
 		SQ_instance(NULL),
 		main_script(NULL),
 		tar_file(NULL),
@@ @@ -95,15 +97,47 @@ public: @@
 	/**
 	 * Get the scanner which has found this ScriptInfo.
 	 */
 	virtual class ScriptScanner *GetScanner() { return this->scanner; }
 	/**
 	 * Get the settings of the Script.
 	 */
 	bool GetSettings();
 	/**
 	 * Get the config list for this Script.
 	 */
 	const ScriptConfigItemList *GetConfigList() const;
 	/**
 	 * Get the description of a certain Script config option.
 	 */
 	const ScriptConfigItem *GetConfigItem(const char *name) const;
 	/**
 	 * Set a setting.
 	 */
 	SQInteger AddSetting(HSQUIRRELVM vm);
 	/**
 	 * Add labels for a setting.
 	 */
 	SQInteger AddLabels(HSQUIRRELVM vm);
 	/**
 	 * Get the default value for a setting.
 	 */
 	int GetSettingDefaultValue(const char *name) const;
 protected:
 	class Squirrel *engine;       ///< Engine used to register for Squirrel.
 	HSQOBJECT *SQ_instance;       ///< The Squirrel instance created for this info.
 	class Squirrel *engine;           ///< Engine used to register for Squirrel.
 	HSQOBJECT *SQ_instance;           ///< The Squirrel instance created for this info.
 	ScriptConfigItemList config_list; ///< List of settings from this Script.
 private:
 	char *main_script;            ///< The full path of the script.
 	char *tar_file;               ///< If, which tar file the script was in.
 	const char *author;           ///< Author of the script.
 	const char *name;             ///< Full name of the script.

src/settings.cpp

➞

Show inline comments

@@ @@ -1317,24 +1317,24 @@ static void AILoadConfig(IniFile *ini, c @@
 #ifdef ENABLE_AI
 	IniGroup *group = ini->GetGroup(grpname);
 	IniItem *item;
 	/* Clean any configured AI */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		AIConfig::GetConfig(c, AIConfig::AISS_FORCE_NEWGAME)->ChangeAI(NULL);
+		AIConfig::GetConfig(c, AIConfig::SSS_FORCE_NEWGAME)->Change(NULL);
+	}
 	/* If no group exists, return */
 	if (group == NULL) return;
 	CompanyID c = COMPANY_FIRST;
 	for (item = group->item; c < MAX_COMPANIES && item != NULL; c++, item = item->next) {
-		AIConfig *config = AIConfig::GetConfig(c, AIConfig::AISS_FORCE_NEWGAME);
+		AIConfig *config = AIConfig::GetConfig(c, AIConfig::SSS_FORCE_NEWGAME);
 		config->ChangeAI(item->name);
 		if (!config->HasAI()) {
 		config->Change(item->name);
 		if (!config->HasScript()) {
 			if (strcmp(item->name, "none") != 0) {
 				DEBUG(ai, 0, "The AI by the name '%s' was no longer found, and removed from the list.", item->name);
 				continue;
+			}
+		}
 		if (item->value != NULL) config->StringToSettings(item->value);
@@ @@ -1440,18 +1440,18 @@ static void AISaveConfig(IniFile *ini, c @@
 	IniGroup *group = ini->GetGroup(grpname);
 	if (group == NULL) return;
 	group->Clear();
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		AIConfig *config = AIConfig::GetConfig(c, AIConfig::AISS_FORCE_NEWGAME);
+		AIConfig *config = AIConfig::GetConfig(c, AIConfig::SSS_FORCE_NEWGAME);
 		const char *name;
 		char value[1024];
 		config->SettingsToString(value, lengthof(value));
-		if (config->HasAI()) {
+		if (config->HasScript()) {
 			name = config->GetName();
 		} else {
 			name = "none";
+		}
 		IniItem *item = new IniItem(group, name, strlen(name));

0 comments (0 inline, 0 general)