summaryrefslogtreecommitdiff
path: root/src/hexen
diff options
context:
space:
mode:
authorSimon Howard2015-02-20 00:31:09 -0500
committerSimon Howard2015-02-20 00:33:12 -0500
commitb39121c6a682eb8ae5efd29a875bd7c098185f04 (patch)
treec6a8b42412682c49d73aff7c794e333e55c807bc /src/hexen
parent1f5ce047ad6cb709f746b794b4a2dea9e2f89fb6 (diff)
downloadchocolate-doom-b39121c6a682eb8ae5efd29a875bd7c098185f04.tar.gz
chocolate-doom-b39121c6a682eb8ae5efd29a875bd7c098185f04.tar.bz2
chocolate-doom-b39121c6a682eb8ae5efd29a875bd7c098185f04.zip
Refactor config file API.
The config file API previously relied on binding config variables using M_BindVariable() which took a void pointer. It occurred to me that if used on a boolean variable, this would be erroneous, but the void pointer would make it impossible to tell. Split this into separate M_Bind{Foo}Variable() functions based on type, which allows for proper type checking on the pointers that are passed. Vaguely related to #509.
Diffstat (limited to 'src/hexen')
-rw-r--r--src/hexen/h2_main.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index 23131e9b..9d92a65b 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -149,14 +149,15 @@ void D_BindVariables(void)
key_multi_msgplayer[6] = CT_KEY_PLAYER7;
key_multi_msgplayer[7] = CT_KEY_PLAYER8;
- M_BindVariable("graphical_startup", &graphical_startup);
- M_BindVariable("mouse_sensitivity", &mouseSensitivity);
- M_BindVariable("sfx_volume", &snd_MaxVolume);
- M_BindVariable("music_volume", &snd_MusicVolume);
- M_BindVariable("messageson", &messageson);
- M_BindVariable("screenblocks", &screenblocks);
- M_BindVariable("snd_channels", &snd_Channels);
- M_BindVariable("savedir", &SavePath);
+ M_BindIntVariable("graphical_startup", &graphical_startup);
+ M_BindIntVariable("mouse_sensitivity", &mouseSensitivity);
+ M_BindIntVariable("sfx_volume", &snd_MaxVolume);
+ M_BindIntVariable("music_volume", &snd_MusicVolume);
+ M_BindIntVariable("messageson", &messageson);
+ M_BindIntVariable("screenblocks", &screenblocks);
+ M_BindIntVariable("snd_channels", &snd_Channels);
+
+ M_BindStringVariable("savedir", &SavePath);
// Multiplayer chat macros
@@ -165,7 +166,7 @@ void D_BindVariables(void)
char buf[12];
M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
- M_BindVariable(buf, &chat_macros[i]);
+ M_BindStringVariable(buf, &chat_macros[i]);
}
}