(svn r15410) -Cleanup: get rid of most of the references to the 'patches' except where it's used for backward compatability.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 62c2f37fb..8827601bc 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -316,7 +316,7 @@ struct AISettingsWindow : public Window {
 					/* Display a query box so users can enter a custom value. */
 					this->clicked_row = num;
 					SetDParam(0, this->ai_config->GetSetting(config_item.name));
-					ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_CONFIG_PATCHES_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
+					ShowQueryString(STR_CONFIG_SETTING_INT32, STR_CONFIG_SETTING_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
 				}
 
 				this->SetDirty();
diff --git a/src/ai/api/ai_gamesettings.cpp b/src/ai/api/ai_gamesettings.cpp
index 16c95e72b..cc3bc56ac 100644
--- a/src/ai/api/ai_gamesettings.cpp
+++ b/src/ai/api/ai_gamesettings.cpp
@@ -8,7 +8,7 @@
 /* static */ bool AIGameSettings::IsValid(const char *setting)
 {
 	uint i;
-	const SettingDesc *sd = GetPatchFromName(setting, &i);
+	const SettingDesc *sd = GetSettingFromName(setting, &i);
 	return sd != NULL && sd->desc.cmd != SDT_STRING;
 }
 
@@ -17,7 +17,7 @@
 	if (!IsValid(setting)) return -1;
 
 	uint i;
-	const SettingDesc *sd = GetPatchFromName(setting, &i);
+	const SettingDesc *sd = GetSettingFromName(setting, &i);
 
 	void *ptr = GetVariableAddress(&_settings_game, &sd->save);
 	if (sd->desc.cmd == SDT_BOOLX) return *(bool*)ptr;
diff --git a/src/ai/api/ai_gamesettings.hpp b/src/ai/api/ai_gamesettings.hpp
index 67c8d964e..12df6625b 100644
--- a/src/ai/api/ai_gamesettings.hpp
+++ b/src/ai/api/ai_gamesettings.hpp
@@ -22,7 +22,7 @@
  *
  * @note The names of the setting for AIGameSettings::IsValid and
  *       AIGameSettings::GetValue are the same ones as those that are shown by
- *       the list_patches command in the in-game console. Settings that are
+ *       the list_settings command in the in-game console. Settings that are
  *       string based are NOT supported and AIGAmeSettings::IsValid will return
  *       false for them. These settings will not be supported either because
  *       they have no relevance for the AI (default client names, server IPs,
diff --git a/src/ai/api/ai_industrytype.hpp b/src/ai/api/ai_industrytype.hpp
index f5773a4d3..9118a5638 100644
--- a/src/ai/api/ai_industrytype.hpp
+++ b/src/ai/api/ai_industrytype.hpp
@@ -89,7 +89,7 @@ public:
 	 * @param industry_type The type of the industry.
 	 * @pre IsValidIndustryType(industry_type).
 	 * @return True if you can prospect this type of industry.
-	 * @note If the patch setting "Manual primary industry construction method" is set
+	 * @note If the setting "Manual primary industry construction method" is set
 	 * to either "None" or "as other industries" this function always returns false.
 	 */
 	static bool CanProspectIndustry(IndustryType industry_type);