summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/base_media_base.h35
-rw-r--r--src/base_media_func.h24
-rw-r--r--src/crashlog.cpp6
-rw-r--r--src/gfxinit.cpp6
-rw-r--r--src/music_gui.cpp13
-rw-r--r--src/newgrf_gui.cpp2
-rw-r--r--src/openttd.cpp46
-rw-r--r--src/screenshot.cpp2
-rw-r--r--src/settings.cpp33
-rw-r--r--src/settings_gui.cpp13
-rw-r--r--src/settings_internal.h3
-rw-r--r--src/table/misc_settings.ini7
-rw-r--r--src/table/settings.h.preamble3
-rw-r--r--src/widgets/dropdown.cpp2
-rw-r--r--src/widgets/dropdown_type.h4
15 files changed, 108 insertions, 91 deletions
diff --git a/src/base_media_base.h b/src/base_media_base.h
index 0b006efbe..881fdc3f3 100644
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -15,6 +15,7 @@
#include "gfx_type.h"
#include "textfile_type.h"
#include "textfile_gui.h"
+#include <unordered_map>
/* Forward declare these; can't do 'struct X' in functions as older GCCs barf on that */
struct IniFile;
@@ -46,7 +47,7 @@ struct MD5File {
*/
template <class T, size_t Tnum_files, bool Tsearch_in_tars>
struct BaseSet {
- typedef SmallMap<const char *, const char *> TranslatedStrings;
+ typedef std::unordered_map<std::string, std::string> TranslatedStrings;
/** Number of files in this set */
static const size_t NUM_FILES = Tnum_files;
@@ -57,7 +58,7 @@ struct BaseSet {
/** Internal names of the files in this set. */
static const char * const *file_names;
- const char *name; ///< The name of the base set
+ std::string name; ///< The name of the base set
TranslatedStrings description; ///< Description of the base set
uint32 shortname; ///< Four letter short variant of the name
uint32 version; ///< The version of this base set
@@ -72,13 +73,6 @@ struct BaseSet {
/** Free everything we allocated */
~BaseSet()
{
- free(this->name);
-
- for (auto &pair : this->description) {
- free(pair.first);
- free(pair.second);
- }
-
for (uint i = 0; i < NUM_FILES; i++) {
free(this->files[i].filename);
free(this->files[i].missing_warning);
@@ -116,20 +110,19 @@ struct BaseSet {
* @param isocode the isocode to search for
* @return the description
*/
- const char *GetDescription(const char *isocode = nullptr) const
+ const char *GetDescription(const std::string &isocode) const
{
- if (isocode != nullptr) {
+ if (!isocode.empty()) {
/* First the full ISO code */
- for (const auto &pair : this->description) {
- if (strcmp(pair.first, isocode) == 0) return pair.second;
- }
+ auto desc = this->description.find(isocode);
+ if (desc != this->description.end()) return desc->second.c_str();
+
/* Then the first two characters */
- for (const auto &pair : this->description) {
- if (strncmp(pair.first, isocode, 2) == 0) return pair.second;
- }
+ desc = this->description.find(isocode.substr(0, 2));
+ if (desc != this->description.end()) return desc->second.c_str();
}
/* Then fall back */
- return this->description.front().second;
+ return this->description.at(std::string{}).c_str();
}
/**
@@ -183,7 +176,7 @@ protected:
static const char *GetExtension();
public:
/** The set as saved in the config file. */
- static const char *ini_set;
+ static std::string ini_set;
/**
* Determine the graphics pack that has to be used.
@@ -203,7 +196,7 @@ public:
static Tbase_set *GetAvailableSets();
- static bool SetSet(const char *name);
+ static bool SetSet(const std::string &name);
static char *GetSetsList(char *p, const char *last);
static int GetNumSets();
static int GetIndexOfUsedSet();
@@ -219,7 +212,7 @@ public:
static bool HasSet(const ContentInfo *ci, bool md5sum);
};
-template <class Tbase_set> /* static */ const char *BaseMedia<Tbase_set>::ini_set;
+template <class Tbase_set> /* static */ std::string BaseMedia<Tbase_set>::ini_set;
template <class Tbase_set> /* static */ const Tbase_set *BaseMedia<Tbase_set>::used_set;
template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::available_sets;
template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::duplicate_sets;
diff --git a/src/base_media_func.h b/src/base_media_func.h
index 0ec644aaa..02c445c21 100644
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -42,16 +42,16 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
IniItem *item;
fetch_metadata("name");
- this->name = stredup(item->value->c_str());
+ this->name = *item->value;
fetch_metadata("description");
- this->description[stredup("")] = stredup(item->value->c_str());
+ this->description[std::string{}] = *item->value;
/* Add the translations of the descriptions too. */
for (const IniItem *item = metadata->item; item != nullptr; item = item->next) {
if (item->name.compare(0, 12, "description.") != 0) continue;
- this->description[stredup(item->name.c_str() + 12)] = stredup(item->value.value_or("").c_str());
+ this->description[item->name.substr(12)] = item->value.value_or("");
}
fetch_metadata("shortname");
@@ -179,7 +179,7 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length,
/* The more complete set takes precedence over the version number. */
if ((duplicate->valid_files == set->valid_files && duplicate->version >= set->version) ||
duplicate->valid_files > set->valid_files) {
- DEBUG(grf, 1, "Not adding %s (%i) as base " SET_TYPE " set (duplicate, %s)", set->name, set->version,
+ DEBUG(grf, 1, "Not adding %s (%i) as base " SET_TYPE " set (duplicate, %s)", set->name.c_str(), set->version,
duplicate->valid_files > set->valid_files ? "less valid files" : "lower version");
set->next = BaseMedia<Tbase_set>::duplicate_sets;
BaseMedia<Tbase_set>::duplicate_sets = set;
@@ -195,7 +195,7 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length,
* version number until a new game is started which isn't a big problem */
if (BaseMedia<Tbase_set>::used_set == duplicate) BaseMedia<Tbase_set>::used_set = set;
- DEBUG(grf, 1, "Removing %s (%i) as base " SET_TYPE " set (duplicate, %s)", duplicate->name, duplicate->version,
+ DEBUG(grf, 1, "Removing %s (%i) as base " SET_TYPE " set (duplicate, %s)", duplicate->name.c_str(), duplicate->version,
duplicate->valid_files < set->valid_files ? "less valid files" : "lower version");
duplicate->next = BaseMedia<Tbase_set>::duplicate_sets;
BaseMedia<Tbase_set>::duplicate_sets = duplicate;
@@ -209,7 +209,7 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length,
ret = true;
}
if (ret) {
- DEBUG(grf, 1, "Adding %s (%i) as base " SET_TYPE " set", set->name, set->version);
+ DEBUG(grf, 1, "Adding %s (%i) as base " SET_TYPE " set", set->name.c_str(), set->version);
}
} else {
delete set;
@@ -226,18 +226,18 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length,
* @return true if it could be loaded
*/
template <class Tbase_set>
-/* static */ bool BaseMedia<Tbase_set>::SetSet(const char *name)
+/* static */ bool BaseMedia<Tbase_set>::SetSet(const std::string &name)
{
extern void CheckExternalFiles();
- if (StrEmpty(name)) {
+ if (name.empty()) {
if (!BaseMedia<Tbase_set>::DetermineBestSet()) return false;
CheckExternalFiles();
return true;
}
for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
- if (strcmp(name, s->name) == 0) {
+ if (name == s->name) {
BaseMedia<Tbase_set>::used_set = s;
CheckExternalFiles();
return true;
@@ -257,7 +257,7 @@ template <class Tbase_set>
{
p += seprintf(p, last, "List of " SET_TYPE " sets:\n");
for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
- p += seprintf(p, last, "%18s: %s", s->name, s->GetDescription());
+ p += seprintf(p, last, "%18s: %s", s->name.c_str(), s->GetDescription({}));
int invalid = s->GetNumInvalid();
if (invalid != 0) {
int missing = s->GetNumMissing();
@@ -376,11 +376,11 @@ template <class Tbase_set>
* @param set_type the type of the BaseSet to instantiate
*/
#define INSTANTIATE_BASE_MEDIA_METHODS(repl_type, set_type) \
- template const char *repl_type::ini_set; \
+ template std::string repl_type::ini_set; \
template const char *repl_type::GetExtension(); \
template bool repl_type::AddFile(const char *filename, size_t pathlength, const char *tar_filename); \
template bool repl_type::HasSet(const struct ContentInfo *ci, bool md5sum); \
- template bool repl_type::SetSet(const char *name); \
+ template bool repl_type::SetSet(const std::string &name); \
template char *repl_type::GetSetsList(char *p, const char *last); \
template int repl_type::GetNumSets(); \
template int repl_type::GetIndexOfUsedSet(); \
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index c7cf48154..29e650b93 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -167,15 +167,15 @@ char *CrashLog::LogConfiguration(char *buffer, const char *last) const
" Sound set: %s (%u)\n"
" Video driver: %s\n\n",
BlitterFactory::GetCurrentBlitter() == nullptr ? "none" : BlitterFactory::GetCurrentBlitter()->GetName(),
- BaseGraphics::GetUsedSet() == nullptr ? "none" : BaseGraphics::GetUsedSet()->name,
+ BaseGraphics::GetUsedSet() == nullptr ? "none" : BaseGraphics::GetUsedSet()->name.c_str(),
BaseGraphics::GetUsedSet() == nullptr ? UINT32_MAX : BaseGraphics::GetUsedSet()->version,
_current_language == nullptr ? "none" : _current_language->file,
MusicDriver::GetInstance() == nullptr ? "none" : MusicDriver::GetInstance()->GetName(),
- BaseMusic::GetUsedSet() == nullptr ? "none" : BaseMusic::GetUsedSet()->name,
+ BaseMusic::GetUsedSet() == nullptr ? "none" : BaseMusic::GetUsedSet()->name.c_str(),
BaseMusic::GetUsedSet() == nullptr ? UINT32_MAX : BaseMusic::GetUsedSet()->version,
_networking ? (_network_server ? "server" : "client") : "no",
SoundDriver::GetInstance() == nullptr ? "none" : SoundDriver::GetInstance()->GetName(),
- BaseSounds::GetUsedSet() == nullptr ? "none" : BaseSounds::GetUsedSet()->name,
+ BaseSounds::GetUsedSet() == nullptr ? "none" : BaseSounds::GetUsedSet()->name.c_str(),
BaseSounds::GetUsedSet() == nullptr ? UINT32_MAX : BaseSounds::GetUsedSet()->version,
VideoDriver::GetInstance() == nullptr ? "none" : VideoDriver::GetInstance()->GetName()
);
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 5fe913fb9..ba8069025 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -122,7 +122,7 @@ void CheckExternalFiles()
const GraphicsSet *used_set = BaseGraphics::GetUsedSet();
- DEBUG(grf, 1, "Using the %s base graphics set", used_set->name);
+ DEBUG(grf, 1, "Using the %s base graphics set", used_set->name.c_str());
static const size_t ERROR_MESSAGE_LENGTH = 256;
static const size_t MISSING_FILE_MESSAGE_LENGTH = 128;
@@ -137,7 +137,7 @@ void CheckExternalFiles()
if (used_set->GetNumInvalid() != 0) {
/* Not all files were loaded successfully, see which ones */
- add_pos += seprintf(add_pos, last, "Trying to load graphics set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of README.md.\n\nThe following files are corrupted or missing:\n", used_set->name);
+ add_pos += seprintf(add_pos, last, "Trying to load graphics set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of README.md.\n\nThe following files are corrupted or missing:\n", used_set->name.c_str());
for (uint i = 0; i < GraphicsSet::NUM_FILES; i++) {
MD5File::ChecksumResult res = GraphicsSet::CheckMD5(&used_set->files[i], BASESET_DIR);
if (res != MD5File::CR_MATCH) add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", used_set->files[i].filename, res == MD5File::CR_MISMATCH ? "corrupt" : "missing", used_set->files[i].missing_warning);
@@ -147,7 +147,7 @@ void CheckExternalFiles()
const SoundsSet *sounds_set = BaseSounds::GetUsedSet();
if (sounds_set->GetNumInvalid() != 0) {
- add_pos += seprintf(add_pos, last, "Trying to load sound set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of README.md.\n\nThe following files are corrupted or missing:\n", sounds_set->name);
+ add_pos += seprintf(add_pos, last, "Trying to load sound set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of README.md.\n\nThe following files are corrupted or missing:\n", sounds_set->name.c_str());
assert_compile(SoundsSet::NUM_FILES == 1);
/* No need to loop each file, as long as there is only a single
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index d15025ea3..dad5c2ba7 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -65,7 +65,7 @@ struct MusicSystem {
void BuildPlaylists();
void ChangePlaylist(PlaylistChoices pl);
- void ChangeMusicSet(const char *set_name);
+ void ChangeMusicSet(const std::string &set_name);
void Shuffle();
void Unshuffle();
@@ -167,12 +167,10 @@ void MusicSystem::ChangePlaylist(PlaylistChoices pl)
* Change to named music set, and reset playback.
* @param set_name Name of music set to select
*/
-void MusicSystem::ChangeMusicSet(const char *set_name)
+void MusicSystem::ChangeMusicSet(const std::string &set_name)
{
BaseMusic::SetSet(set_name);
-
- free(BaseMusic::ini_set);
- BaseMusic::ini_set = stredup(set_name);
+ BaseMusic::ini_set = set_name;
this->BuildPlaylists();
this->ChangePlaylist(this->selected_playlist);
@@ -433,8 +431,7 @@ void MusicLoop()
void ChangeMusicSet(int index)
{
if (BaseMusic::GetIndexOfUsedSet() == index) return;
- const char *name = BaseMusic::GetSet(index)->name;
- _music.ChangeMusicSet(name);
+ _music.ChangeMusicSet(BaseMusic::GetSet(index)->name);
}
/**
@@ -464,7 +461,7 @@ struct MusicTrackSelectionWindow : public Window {
SetDParam(0, STR_MUSIC_PLAYLIST_ALL + _settings_client.music.playlist);
break;
case WID_MTS_CAPTION:
- SetDParamStr(0, BaseMusic::GetUsedSet()->name);
+ SetDParamStr(0, BaseMusic::GetUsedSet()->name.c_str());
break;
}
}
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 3f0a2ee7e..284e5737e 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -925,7 +925,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
list.emplace_back(new DropDownListStringItem(STR_NONE, -1, false));
for (uint i = 0; i < this->grf_presets.size(); i++) {
- list.emplace_back(new DropDownListCharStringItem(this->grf_presets[i].c_str(), i, false));
+ list.emplace_back(new DropDownListCharStringItem(this->grf_presets[i], i, false));
}
this->DeleteChildWindows(WC_QUERY_STRING); // Remove the parameter query window
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 7d9bd09a6..e5a6d1b05 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -537,9 +537,9 @@ int openttd_main(int argc, char *argv[])
char *sounddriver = nullptr;
char *videodriver = nullptr;
char *blitter = nullptr;
- char *graphics_set = nullptr;
- char *sounds_set = nullptr;
- char *music_set = nullptr;
+ std::string graphics_set;
+ std::string sounds_set;
+ std::string music_set;
Dimension resolution = {0, 0};
/* AfterNewGRFScan sets save_config to true after scanning completed. */
bool save_config = false;
@@ -563,9 +563,9 @@ int openttd_main(int argc, char *argv[])
int i;
while ((i = mgo.GetOpt()) != -1) {
switch (i) {
- case 'I': free(graphics_set); graphics_set = stredup(mgo.opt); break;
- case 'S': free(sounds_set); sounds_set = stredup(mgo.opt); break;
- case 'M': free(music_set); music_set = stredup(mgo.opt); break;
+ case 'I': graphics_set = mgo.opt; break;
+ case 'S': sounds_set = mgo.opt; break;
+ case 'M': music_set = mgo.opt; break;
case 'm': free(musicdriver); musicdriver = stredup(mgo.opt); break;
case 's': free(sounddriver); sounddriver = stredup(mgo.opt); break;
case 'v': free(videodriver); videodriver = stredup(mgo.opt); break;
@@ -731,17 +731,16 @@ int openttd_main(int argc, char *argv[])
InitWindowSystem();
BaseGraphics::FindSets();
- if (graphics_set == nullptr && BaseGraphics::ini_set != nullptr) graphics_set = stredup(BaseGraphics::ini_set);
+ if (graphics_set.empty() && !BaseGraphics::ini_set.empty()) graphics_set = BaseGraphics::ini_set;
if (!BaseGraphics::SetSet(graphics_set)) {
- if (!StrEmpty(graphics_set)) {
- BaseGraphics::SetSet(nullptr);
+ if (!graphics_set.empty()) {
+ BaseGraphics::SetSet({});
ErrorMessageData msg(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND);
- msg.SetDParamStr(0, graphics_set);
+ msg.SetDParamStr(0, graphics_set.c_str());
ScheduleErrorMessage(msg);
}
}
- free(graphics_set);
/* Initialize game palette */
GfxInitPalettes();
@@ -802,30 +801,28 @@ int openttd_main(int argc, char *argv[])
InitializeScreenshotFormats();
BaseSounds::FindSets();
- if (sounds_set == nullptr && BaseSounds::ini_set != nullptr) sounds_set = stredup(BaseSounds::ini_set);
+ if (sounds_set.empty() && !BaseSounds::ini_set.empty()) sounds_set = BaseSounds::ini_set;
if (!BaseSounds::SetSet(sounds_set)) {
- if (StrEmpty(sounds_set) || !BaseSounds::SetSet(nullptr)) {
+ if (sounds_set.empty() || !BaseSounds::SetSet({})) {
usererror("Failed to find a sounds set. Please acquire a sounds set for OpenTTD. See section 1.4 of README.md.");
} else {
ErrorMessageData msg(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND);
- msg.SetDParamStr(0, sounds_set);
+ msg.SetDParamStr(0, sounds_set.c_str());
ScheduleErrorMessage(msg);
}
}
- free(sounds_set);
BaseMusic::FindSets();
- if (music_set == nullptr && BaseMusic::ini_set != nullptr) music_set = stredup(BaseMusic::ini_set);
+ if (music_set.empty() && !BaseMusic::ini_set.empty()) music_set = BaseMusic::ini_set;
if (!BaseMusic::SetSet(music_set)) {
- if (StrEmpty(music_set) || !BaseMusic::SetSet(nullptr)) {
+ if (music_set.empty() || !BaseMusic::SetSet({})) {
usererror("Failed to find a music set. Please acquire a music set for OpenTTD. See section 1.4 of README.md.");
} else {
ErrorMessageData msg(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND);
- msg.SetDParamStr(0, music_set);
+ msg.SetDParamStr(0, music_set.c_str());
ScheduleErrorMessage(msg);
}
}
- free(music_set);
if (sounddriver == nullptr && _ini_sounddriver != nullptr) sounddriver = stredup(_ini_sounddriver);
DriverFactoryBase::SelectDriver(sounddriver, Driver::DT_SOUND);
@@ -875,22 +872,15 @@ int openttd_main(int argc, char *argv[])
exit_noshutdown:
/* These three are normally freed before bootstrap. */
- free(graphics_set);
free(videodriver);
free(blitter);
exit_bootstrap:
/* These are normally freed before exit, but after bootstrap. */
- free(sounds_set);
- free(music_set);
free(musicdriver);
free(sounddriver);
exit_normal:
- free(BaseGraphics::ini_set);
- free(BaseSounds::ini_set);
- free(BaseMusic::ini_set);
-
free(_ini_musicdriver);
free(_ini_sounddriver);
free(_ini_videodriver);
@@ -1142,9 +1132,9 @@ void SwitchToMode(SwitchMode new_mode)
case SM_MENU: // Switch to game intro menu
LoadIntroGame();
- if (BaseSounds::ini_set == nullptr && BaseSounds::GetUsedSet()->fallback) {
+ if (BaseSounds::ini_set.empty() && BaseSounds::GetUsedSet()->fallback) {
ShowErrorMessage(STR_WARNING_FALLBACK_SOUNDSET, INVALID_STRING_ID, WL_CRITICAL);
- BaseSounds::ini_set = stredup(BaseSounds::GetUsedSet()->name);
+ BaseSounds::ini_set = BaseSounds::GetUsedSet()->name;
}
break;
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index 07a8121fe..1db7cceae 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -310,7 +310,7 @@ static bool MakePNGImage(const char *name, ScreenshotCallback *callb, void *user
char buf[8192];
char *p = buf;
- p += seprintf(p, lastof(buf), "Graphics set: %s (%u)\n", BaseGraphics::GetUsedSet()->name, BaseGraphics::GetUsedSet()->version);
+ p += seprintf(p, lastof(buf), "Graphics set: %s (%u)\n", BaseGraphics::GetUsedSet()->name.c_str(), BaseGraphics::GetUsedSet()->version);
p = strecpy(p, "NewGRFs:\n", lastof(buf));
for (const GRFConfig *c = _game_mode == GM_MENU ? nullptr : _grfconfig; c != nullptr; c = c->next) {
p += seprintf(p, lastof(buf), "%08X ", BSWAP32(c->ident.grfid));
diff --git a/src/settings.cpp b/src/settings.cpp
index ef1aaa1b6..505638e94 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -414,6 +414,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str
return desc->def;
}
+ case SDT_STDSTRING:
case SDT_STRING: return orig_str;
case SDT_INTLIST: return str;
default: break;
@@ -565,6 +566,22 @@ static void IniLoadSettings(IniFile *ini, const SettingDesc *sd, const char *grp
}
break;
+ case SDT_STDSTRING:
+ switch (GetVarMemType(sld->conv)) {
+ case SLE_VAR_STR:
+ case SLE_VAR_STRQ:
+ if (p != nullptr) {
+ reinterpret_cast<std::string *>(ptr)->assign((const char *)p);
+ } else {
+ reinterpret_cast<std::string *>(ptr)->clear();
+ }
+ break;
+
+ default: NOT_REACHED();
+ }
+
+ break;
+
case SDT_INTLIST: {
if (!LoadIntList((const char*)p, ptr, sld->length, GetVarMemType(sld->conv))) {
ErrorMessageData msg(STR_CONFIG_ERROR, STR_CONFIG_ERROR_ARRAY);
@@ -701,6 +718,22 @@ static void IniSaveSettings(IniFile *ini, const SettingDesc *sd, const char *grp
}
break;
+ case SDT_STDSTRING:
+ switch (GetVarMemType(sld->conv)) {
+ case SLE_VAR_STR: strecpy(buf, reinterpret_cast<std::string *>(ptr)->c_str(), lastof(buf)); break;
+
+ case SLE_VAR_STRQ:
+ if (reinterpret_cast<std::string *>(ptr)->empty()) {
+ buf[0] = '\0';
+ } else {
+ seprintf(buf, lastof(buf), "\"%s\"", reinterpret_cast<std::string *>(ptr)->c_str());
+ }
+ break;
+
+ default: NOT_REACHED();
+ }
+ break;
+
case SDT_INTLIST:
MakeIntList(buf, lastof(buf), ptr, sld->length, sld->conv);
break;
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 968be54f6..a124d6989 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -152,7 +152,7 @@ struct BaseSetTextfileWindow : public TextfileWindow {
{
if (widget == WID_TF_CAPTION) {
SetDParam(0, content_type);
- SetDParamStr(1, this->baseset->name);
+ SetDParamStr(1, this->baseset->name.c_str());
}
}
};
@@ -335,10 +335,10 @@ struct GameOptionsWindow : Window {
case WID_GO_RESOLUTION_DROPDOWN: SetDParam(0, GetCurRes() == _resolutions.size() ? STR_GAME_OPTIONS_RESOLUTION_OTHER : SPECSTR_RESOLUTION_START + GetCurRes()); break;
case WID_GO_GUI_ZOOM_DROPDOWN: SetDParam(0, _gui_zoom_dropdown[ZOOM_LVL_OUT_4X - _gui_zoom]); break;
case WID_GO_FONT_ZOOM_DROPDOWN: SetDParam(0, _font_zoom_dropdown[ZOOM_LVL_OUT_4X - _font_zoom]); break;
- case WID_GO_BASE_GRF_DROPDOWN: SetDParamStr(0, BaseGraphics::GetUsedSet()->name); break;
+ case WID_GO_BASE_GRF_DROPDOWN: SetDParamStr(0, BaseGraphics::GetUsedSet()->name.c_str()); break;
case WID_GO_BASE_GRF_STATUS: SetDParam(0, BaseGraphics::GetUsedSet()->GetNumInvalid()); break;
- case WID_GO_BASE_SFX_DROPDOWN: SetDParamStr(0, BaseSounds::GetUsedSet()->name); break;
- case WID_GO_BASE_MUSIC_DROPDOWN: SetDParamStr(0, BaseMusic::GetUsedSet()->name); break;
+ case WID_GO_BASE_SFX_DROPDOWN: SetDParamStr(0, BaseSounds::GetUsedSet()->name.c_str()); break;
+ case WID_GO_BASE_MUSIC_DROPDOWN: SetDParamStr(0, BaseMusic::GetUsedSet()->name.c_str()); break;
case WID_GO_BASE_MUSIC_STATUS: SetDParam(0, BaseMusic::GetUsedSet()->GetNumInvalid()); break;
}
}
@@ -481,10 +481,9 @@ struct GameOptionsWindow : Window {
void SetMediaSet(int index)
{
if (_game_mode == GM_MENU) {
- const char *name = T::GetSet(index)->name;
+ auto name = T::GetSet(index)->name;
- free(T::ini_set);
- T::ini_set = stredup(name);
+ T::ini_set = name;
T::SetSet(name);
this->reload = true;
diff --git a/src/settings_internal.h b/src/settings_internal.h
index 3d9764dc6..fcad02c3c 100644
--- a/src/settings_internal.h
+++ b/src/settings_internal.h
@@ -27,8 +27,9 @@ enum SettingDescType : byte {
SDT_MANYOFMANY = 3, ///< bitmasked number where MULTIPLE bits may be set
SDT_INTLIST = 4, ///< list of integers separated by a comma ','
SDT_STRING = 5, ///< string with a pre-allocated buffer
+ SDT_STDSTRING = 6, ///< \c std::string
SDT_END,
- /* 10 more possible primitives */
+ /* 9 more possible primitives */
};
diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini
index c9441459f..c97663605 100644
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -17,6 +17,7 @@ SDTG_LIST = SDTG_LIST($name, $type, $length, $flags, $guiflags, $var, $def,
SDTG_MMANY = SDTG_MMANY($name, $type, $flags, $guiflags, $var, $def, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_OMANY = SDTG_OMANY($name, $type, $flags, $guiflags, $var, $def, $max, $full, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_STR = SDTG_STR($name, $type, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
+SDTG_SSTR = SDTG_SSTR($name, $type, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_BOOL = SDTG_BOOL($name, $flags, $guiflags, $var, $def, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_VAR = SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat),
SDTG_END = SDTG_END()
@@ -58,21 +59,21 @@ max = 2
full = _support8bppmodes
cat = SC_BASIC
-[SDTG_STR]
+[SDTG_SSTR]
name = ""graphicsset""
type = SLE_STRQ
var = BaseGraphics::ini_set
def = nullptr
cat = SC_BASIC
-[SDTG_STR]
+[SDTG_SSTR]
name = ""soundsset""
type = SLE_STRQ
var = BaseSounds::ini_set
def = nullptr
cat = SC_BASIC
-[SDTG_STR]
+[SDTG_SSTR]
name = ""musicset""
type = SLE_STRQ
var = BaseMusic::ini_set
diff --git a/src/table/settings.h.preamble b/src/table/settings.h.preamble
index 2be8239a6..ddb9d2abf 100644
--- a/src/table/settings.h.preamble
+++ b/src/table/settings.h.preamble
@@ -74,6 +74,9 @@ static size_t ConvertLandscape(const char *value);
#define SDTG_STR(name, type, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_STRING, SL_STR, type, flags, guiflags, var, sizeof(var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
+#define SDTG_SSTR(name, type, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
+ SDTG_GENERAL(name, SDT_STDSTRING, SL_STDSTR, type, flags, guiflags, var, sizeof(var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
+
#define SDTG_OMANY(name, type, flags, guiflags, var, def, max, full, str, strhelp, strval, proc, from, to, cat)\
SDTG_GENERAL(name, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat)
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index 3412a98bd..c450dc7b8 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -65,7 +65,7 @@ StringID DropDownListParamStringItem::String() const
StringID DropDownListCharStringItem::String() const
{
- SetDParamStr(0, this->raw_string);
+ SetDParamStr(0, this->raw_string.c_str());
return this->string;
}
diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h
index c7d3251d6..5617027e3 100644
--- a/src/widgets/dropdown_type.h
+++ b/src/widgets/dropdown_type.h
@@ -68,9 +68,9 @@ public:
*/
class DropDownListCharStringItem : public DropDownListStringItem {
public:
- const char *raw_string;
+ std::string raw_string;
- DropDownListCharStringItem(const char *raw_string, int result, bool masked) : DropDownListStringItem(STR_JUST_RAW_STRING, result, masked), raw_string(raw_string) {}
+ DropDownListCharStringItem(const std::string &raw_string, int result, bool masked) : DropDownListStringItem(STR_JUST_RAW_STRING, result, masked), raw_string(raw_string) {}
StringID String() const override;
};
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-23 03:40:11 +0000