summaryrefslogtreecommitdiff
path: root/src/doom/d_main.c
diff options
context:
space:
mode:
authorFabian Greffrath2015-03-26 16:31:57 +0100
committerFabian Greffrath2015-03-26 16:31:57 +0100
commit27b5915111ffbdae97ce0c415157e104ee6f3493 (patch)
tree850fc62208b642b07047e0a9ea968c365d4dfd1f /src/doom/d_main.c
parent350ac122030d198b187255b19b2519ef8267364a (diff)
parentad027ef6dbfeebabe0e6701eec968e9d474e497f (diff)
downloadchocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.gz
chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.bz2
chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.zip
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
Diffstat (limited to 'src/doom/d_main.c')
-rw-r--r--src/doom/d_main.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index 1e9e950e..ca722dc6 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -359,16 +359,16 @@ void D_BindVariables(void)
NET_BindVariables();
#endif
- M_BindVariable("mouse_sensitivity", &mouseSensitivity);
- M_BindVariable("sfx_volume", &sfxVolume);
- M_BindVariable("music_volume", &musicVolume);
- M_BindVariable("show_messages", &showMessages);
- M_BindVariable("screenblocks", &screenblocks);
- M_BindVariable("detaillevel", &detailLevel);
- M_BindVariable("snd_channels", &snd_channels);
- M_BindVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
- M_BindVariable("vanilla_demo_limit", &vanilla_demo_limit);
- M_BindVariable("show_endoom", &show_endoom);
+ M_BindIntVariable("mouse_sensitivity", &mouseSensitivity);
+ M_BindIntVariable("sfx_volume", &sfxVolume);
+ M_BindIntVariable("music_volume", &musicVolume);
+ M_BindIntVariable("show_messages", &showMessages);
+ M_BindIntVariable("screenblocks", &screenblocks);
+ M_BindIntVariable("detaillevel", &detailLevel);
+ M_BindIntVariable("snd_channels", &snd_channels);
+ M_BindIntVariable("vanilla_savegame_limit", &vanilla_savegame_limit);
+ M_BindIntVariable("vanilla_demo_limit", &vanilla_demo_limit);
+ M_BindIntVariable("show_endoom", &show_endoom);
// Multiplayer chat macros
@@ -377,7 +377,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]);
}
}