summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2005-09-23 23:23:01 +0000
committerDarkvater <darkvater@openttd.org>2005-09-23 23:23:01 +0000
commit5dad0588df1a802eb3280126f23608d9094ff7ef (patch)
tree01614753098f7ca3110dc9b73c4bedc953e11417
parent1b16f210c21b85a9ac0e5f0db977f783a1e3d3fc (diff)
downloadopenttd-5dad0588df1a802eb3280126f23608d9094ff7ef.tar.xz
(svn r2980) - Add some comments to some setting enums, and fix a 'const' warning.
- Add settings.h to VS.NET project.
-rw-r--r--openttd.vcproj7
-rw-r--r--settings_gui.c11
2 files changed, 10 insertions, 8 deletions
diff --git a/openttd.vcproj b/openttd.vcproj
index 8a33a58ec..96f40d01d 100644
--- a/openttd.vcproj
+++ b/openttd.vcproj
@@ -535,6 +535,9 @@
RelativePath=".\video\sdl_v.h">
</File>
<File
+ RelativePath=".\settings.h">
+ </File>
+ <File
RelativePath=".\signs.h">
</File>
<File
@@ -844,10 +847,10 @@
</Filter>
</Filter>
<File
- RelativePath=".\openttd.ico">
+ RelativePath=".\mainicon.ico">
</File>
<File
- RelativePath=".\mainicon.ico">
+ RelativePath=".\openttd.ico">
</File>
<File
RelativePath=".\ReadMe.txt">
diff --git a/settings_gui.c b/settings_gui.c
index d1eff6054..228c54a75 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -657,10 +657,10 @@ enum {
PE_INT32 = 4,
PE_CURRENCY = 5,
// selector flags
- PF_0ISDIS = 1 << 0,
- PF_NOCOMMA = 1 << 1,
- PF_MULTISTRING = 1 << 2,
- PF_PLAYERBASED = 1 << 3, // This has to match the entries that are in settings.c, patch_player_settings
+ PF_0ISDIS = 1 << 0, // a value of zero means the feature is disabled
+ PF_NOCOMMA = 1 << 1, // number without any thousand seperators
+ PF_MULTISTRING = 1 << 2, // string but only a limited number of options, so don't open editobx
+ PF_PLAYERBASED = 1 << 3, // This has to match the entries that are in settings.c, patch_player_settings
PF_NETWORK_ONLY = 1 << 4, // this setting only applies to network games
};
@@ -1082,7 +1082,7 @@ static const PatchEntry *IConsoleGetPatch(const char *name, uint *page, uint *en
/* Those 2 functions need to be here, else we have to make some stuff non-static
and besides, it is also better to keep stuff like this at the same place */
-void IConsoleSetPatchSetting(char *name, const char *value)
+void IConsoleSetPatchSetting(const char *name, const char *value)
{
const PatchEntry *pe;
uint page, entry;
@@ -1524,4 +1524,3 @@ void ShowCustCurrency(void)
DeleteWindowById(WC_CUSTOM_CURRENCY, 0);
w = AllocateWindowDesc(&_cust_currency_desc);
}
-