cpp/openttd-patchpack/source Changeset - r25651:a1c1075679ae

Changeset - r25651:a1c1075679ae

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

rubidium42 - 3 years ago 2021-05-30 09:51:21
rubidium@openttd.org

Codechange: make the name of SettingDesc a std::string

6 files changed with 22 insertions and 22 deletions:

src/gamelog.cpp

src/gamelog.h

src/script/api/script_gamesettings.cpp

src/settings.cpp

src/settings_internal.h

src/table/settings/settings.ini

0 comments (0 inline, 0 general)

src/gamelog.cpp

➞

Show inline comments

@@ @@ -480,20 +480,20 @@ void GamelogOldver() @@
 /**
  * Logs change in game settings. Only non-networksafe settings are logged
  * @param name setting name
  * @param oldval old setting value
  * @param newval new setting value
  */
-void GamelogSetting(const char *name, int32 oldval, int32 newval)
+void GamelogSetting(const std::string &name, int32 oldval, int32 newval)
+{
 	assert(_gamelog_action_type == GLAT_SETTING);
 	LoggedChange *lc = GamelogChange(GLCT_SETTING);
 	if (lc == nullptr) return;
 	lc->setting.name = stredup(name);
+	lc->setting.name = stredup(name.c_str());
 	lc->setting.oldval = oldval;
 	lc->setting.newval = newval;
+}
 /**

src/gamelog.h

➞

Show inline comments

@@ @@ -45,13 +45,13 @@ void GamelogPrintConsole(); @@
 void GamelogEmergency();
 bool GamelogTestEmergency();
 void GamelogRevision();
 void GamelogMode();
 void GamelogOldver();
-void GamelogSetting(const char *name, int32 oldval, int32 newval);
+void GamelogSetting(const std::string &name, int32 oldval, int32 newval);
 void GamelogGRFUpdate(const GRFConfig *oldg, const GRFConfig *newg);
 void GamelogGRFAddList(const GRFConfig *newg);
 void GamelogGRFRemove(uint32 grfid);
 void GamelogGRFAdd(const GRFConfig *newg);
 void GamelogGRFCompatible(const GRFIdentifier *newg);

src/script/api/script_gamesettings.cpp

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ @@
 	if (!IsValid(setting)) return false;
 	const SettingDesc *sd = GetSettingFromName(setting);
 	if ((sd->flags & SF_NO_NETWORK_SYNC) != 0) return false;
 	return ScriptObject::DoCommand(0, 0, value, CMD_CHANGE_SETTING, sd->name);
+	return ScriptObject::DoCommand(0, 0, value, CMD_CHANGE_SETTING, sd->name.c_str());
+}
 /* static */ bool ScriptGameSettings::IsDisabledVehicleType(ScriptVehicle::VehicleType vehicle_type)
+{
 	switch (vehicle_type) {
 		case ScriptVehicle::VT_RAIL:  return _settings_game.ai.ai_disable_veh_train;

src/settings.cpp

➞

Show inline comments

@@ @@ -1977,19 +1977,19 @@ void IConsoleGetSetting(const char *name @@
 		return;
+	}
 	const void *object = (_game_mode == GM_MENU || force_newgame) ? &_settings_newgame : &_settings_game;
 	if (sd->IsStringSetting()) {
 		IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s'", name, sd->AsStringSetting()->Read(object).c_str());
+		IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s'", sd->name.c_str(), sd->AsStringSetting()->Read(object).c_str());
 	} else if (sd->IsIntSetting()) {
 		char value[20];
 		sd->FormatValue(value, lastof(value), object);
 		const IntSettingDesc *int_setting = sd->AsIntSetting();
 		IConsolePrintF(CC_WARNING, "Current value for '%s' is: '%s' (min: %s%d, max: %u)",
 			name, value, (sd->flags & SF_GUI_0_IS_SPECIAL) ? "(0) " : "", int_setting->min, int_setting->max);
+			sd->name.c_str(), value, (sd->flags & SF_GUI_0_IS_SPECIAL) ? "(0) " : "", int_setting->min, int_setting->max);
+	}
+}
 /**
  * List all settings and their value to the console
+ *
@@ @@ -1998,16 +1998,16 @@ void IConsoleGetSetting(const char *name @@
 void IConsoleListSettings(const char *prefilter)
+{
 	IConsolePrintF(CC_WARNING, "All settings with their current value:");
 	for (auto &sd : _settings) {
 		if (!SlIsObjectCurrentlyValid(sd->save.version_from, sd->save.version_to)) continue;
-		if (prefilter != nullptr && strstr(sd->name, prefilter) == nullptr) continue;
+		if (prefilter != nullptr && sd->name.find(prefilter) == std::string::npos) continue;
 		char value[80];
 		sd->FormatValue(value, lastof(value), &GetGameSettings());
 		IConsolePrintF(CC_DEFAULT, "%s = %s", sd->name, value);
+		IConsolePrintF(CC_DEFAULT, "%s = %s", sd->name.c_str(), value);
+	}
 	IConsolePrintF(CC_WARNING, "Use 'setting' command to change a value");
+}
 /**

src/settings_internal.h

➞

Show inline comments

@@ @@ -66,17 +66,17 @@ enum SettingType { @@
 };
 struct IniItem;
 /** Properties of config file settings. */
 struct SettingDesc {
-	SettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup) :
+	SettingDesc(SaveLoad save, const std::string &name, SettingFlag flags, bool startup) :
 		name(name), flags(flags), startup(startup), save(save) {}
 	virtual ~SettingDesc() {}
-	const char *name;   ///< Name of the setting. Used in configuration file and for console.
+	std::string name;   ///< Name of the setting. Used in configuration file and for console.
 	SettingFlag flags;  ///< Handles how a setting would show up in the GUI (text/currency, etc.).
 	bool startup;       ///< Setting has to be loaded directly at startup?.
 	SaveLoad save;      ///< Internal structure (going to savegame, parts to config).
 	bool IsEditable(bool do_command = false) const;
 	SettingType GetType() const;
@@ @@ -137,13 +137,13 @@ struct IntSettingDesc : SettingDesc { @@
 	/**
 	 * A callback to denote that a setting has been changed.
 	 * @param The new value for the setting.
 	 */
 	typedef void PostChangeCallback(int32 value);
-	IntSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, int32 def,
+	IntSettingDesc(SaveLoad save, const std::string &name, SettingFlag flags, bool startup, int32 def,
 			int32 min, uint32 max, int32 interval, StringID str, StringID str_help, StringID str_val,
 			SettingCategory cat, PreChangeCheck pre_check, PostChangeCallback post_callback) :
 		SettingDesc(save, name, flags, startup), def(def), min(min), max(max), interval(interval),
 			str(str), str_help(str_help), str_val(str_val), cat(cat), pre_check(pre_check),
 			post_callback(post_callback) {}
 	virtual ~IntSettingDesc() {}
@@ @@ -179,13 +179,13 @@ private: @@
 	void MakeValueValid(int32 &value) const;
 	void Write(const void *object, int32 value) const;
 };
 /** Boolean setting. */
 struct BoolSettingDesc : IntSettingDesc {
-	BoolSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, bool def,
+	BoolSettingDesc(SaveLoad save, const std::string &name, SettingFlag flags, bool startup, bool def,
 			StringID str, StringID str_help, StringID str_val, SettingCategory cat,
 			PreChangeCheck pre_check, PostChangeCallback post_callback) :
 		IntSettingDesc(save, name, flags, startup, def, 0, 1, 0, str, str_help, str_val, cat,
 			pre_check, post_callback) {}
 	virtual ~BoolSettingDesc() {}
@@ @@ -195,13 +195,13 @@ struct BoolSettingDesc : IntSettingDesc @@
 };
 /** One of many setting. */
 struct OneOfManySettingDesc : IntSettingDesc {
 	typedef size_t OnConvert(const char *value); ///< callback prototype for conversion error
-	OneOfManySettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, int32 def,
+	OneOfManySettingDesc(SaveLoad save, const std::string &name, SettingFlag flags, bool startup, int32 def,
 			int32 max, StringID str, StringID str_help, StringID str_val, SettingCategory cat,
 			PreChangeCheck pre_check, PostChangeCallback post_callback,
 			std::initializer_list<const char *> many, OnConvert *many_cnvt) :
 		IntSettingDesc(save, name, flags, startup, def, 0, max, 0, str, str_help, str_val, cat,
 			pre_check, post_callback), many_cnvt(many_cnvt)
+	{
@@ @@ -219,13 +219,13 @@ struct OneOfManySettingDesc : IntSetting @@
 	size_t ParseValue(const char *str) const override;
 	void FormatValue(char *buf, const char *last, const void *object) const override;
 };
 /** Many of many setting. */
 struct ManyOfManySettingDesc : OneOfManySettingDesc {
-	ManyOfManySettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup,
+	ManyOfManySettingDesc(SaveLoad save, const std::string &name, SettingFlag flags, bool startup,
 		int32 def, StringID str, StringID str_help, StringID str_val, SettingCategory cat,
 		PreChangeCheck pre_check, PostChangeCallback post_callback,
 		std::initializer_list<const char *> many, OnConvert *many_cnvt) :
 		OneOfManySettingDesc(save, name, flags, startup, def, (1 << many.size()) - 1, str, str_help,
 			str_val, cat, pre_check, post_callback, many, many_cnvt) {}
 	virtual ~ManyOfManySettingDesc() {}
@@ @@ -248,13 +248,13 @@ struct StringSettingDesc : SettingDesc { @@
 	/**
 	 * A callback to denote that a setting has been changed.
 	 * @param The new value for the setting.
 	 */
 	typedef void PostChangeCallback(const std::string &value);
-	StringSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, const char *def,
+	StringSettingDesc(SaveLoad save, const std::string &name, SettingFlag flags, bool startup, const char *def,
 			uint32 max_length, PreChangeCheck pre_check, PostChangeCallback post_callback) :
 		SettingDesc(save, name, flags, startup), def(def == nullptr ? "" : def), max_length(max_length),
 			pre_check(pre_check), post_callback(post_callback) {}
 	virtual ~StringSettingDesc() {}
 	std::string def;                   ///< Default value given when none is present
@@ @@ -274,13 +274,13 @@ private: @@
 	void MakeValueValid(std::string &str) const;
 	void Write(const void *object, const std::string &str) const;
 };
 /** List/array settings. */
 struct ListSettingDesc : SettingDesc {
-	ListSettingDesc(SaveLoad save, const char *name, SettingFlag flags, bool startup, const char *def) :
+	ListSettingDesc(SaveLoad save, const std::string &name, SettingFlag flags, bool startup, const char *def) :
 		SettingDesc(save, name, flags, startup), def(def) {}
 	virtual ~ListSettingDesc() {}
 	const char *def;        ///< default value given when none is present
 	void FormatValue(char *buf, const char *last, const void *object) const override;
@@ @@ -288,13 +288,13 @@ struct ListSettingDesc : SettingDesc { @@
 	bool IsSameValue(const IniItem *item, void *object) const override;
 };
 /** Placeholder for settings that have been removed, but might still linger in the savegame. */
 struct NullSettingDesc : SettingDesc {
 	NullSettingDesc(SaveLoad save) :
-		SettingDesc(save, "", SF_NOT_IN_CONFIG, false) {}
+		SettingDesc(save, {}, SF_NOT_IN_CONFIG, false) {}
 	virtual ~NullSettingDesc() {}
 	void FormatValue(char *buf, const char *last, const void *object) const override { NOT_REACHED(); }
 	void ParseValue(const IniItem *item, void *object) const override { NOT_REACHED(); }
 	bool IsSameValue(const IniItem *item, void *object) const override { NOT_REACHED(); }
 };

src/table/settings/settings.ini

➞

Show inline comments

@@ @@ -999,50 +999,50 @@ str = STR_CONFIG_SETTING_MAX_SHIPS @@
 strhelp  = STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT
 strval   = STR_JUST_COMMA
 post_cb  = MaxVehiclesChanged
 cat      = SC_BASIC
 [SDTG_BOOL]
-name     = nullptr
+name     = {}
 flags    = SF_NO_NETWORK
 var      = _old_vds.servint_ispercent
 def      = false
 to       = SLV_120
 [SDTG_VAR]
-name     = nullptr
+name     = {}
 type     = SLE_UINT16
 flags    = SF_GUI_0_IS_SPECIAL
 var      = _old_vds.servint_trains
 def      = 150
 min      = 5
 max      = 800
 to       = SLV_120
 [SDTG_VAR]
-name     = nullptr
+name     = {}
 type     = SLE_UINT16
 flags    = SF_GUI_0_IS_SPECIAL
 var      = _old_vds.servint_roadveh
 def      = 150
 min      = 5
 max      = 800
 to       = SLV_120
 [SDTG_VAR]
-name     = nullptr
+name     = {}
 type     = SLE_UINT16
 flags    = SF_GUI_0_IS_SPECIAL
 var      = _old_vds.servint_ships
 def      = 360
 min      = 5
 max      = 800
 to       = SLV_120
 [SDTG_VAR]
-name     = nullptr
+name     = {}
 type     = SLE_UINT16
 flags    = SF_GUI_0_IS_SPECIAL
 var      = _old_vds.servint_aircraft
 def      = 150
 min      = 5
 max      = 800

0 comments (0 inline, 0 general)