commit 43e82bdf93c0c3971767a63072db5b0080c2f6c6
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Mar 6 23:43:29 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Mar 6 23:43:29 2011 +0000
Fix up config file variables to match Vanilla.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2295
---
src/m_config.c | 36 +++++++++++++++++++++++++++++-------
src/strife/d_main.c | 23 +++++++++++++++++++----
2 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/src/m_config.c b/src/m_config.c
index 0772893a..b934d9d4 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -141,6 +141,13 @@ static default_t doom_defaults_list[] =
CONFIG_VARIABLE_INT(music_volume),
+ //!
+ // If non-zero, dialogue text is displayed over characters' pictures
+ // when engaging actors who have voices. (Strife only)
+ //
+
+ CONFIG_VARIABLE_INT(show_talk),
+
//!
// Volume of voice sound effects, range 0-15. (Strife only)
//
@@ -155,13 +162,6 @@ static default_t doom_defaults_list[] =
CONFIG_VARIABLE_INT(show_messages),
- //!
- // If non-zero, dialogue text is displayed over characters' pictures
- // when engaging actors who have voices. (Strife only)
- //
-
- CONFIG_VARIABLE_INT(show_text),
-
//!
// Keyboard key to turn right.
//
@@ -442,6 +442,16 @@ static default_t doom_defaults_list[] =
CONFIG_VARIABLE_INT(screenblocks),
+ //!
+ // Screen size, range 3-11.
+ //
+ // A value of 11 gives a full-screen view with the status bar not
+ // displayed. A value of 10 gives a full-screen view with the
+ // status bar displayed. (Strife only)
+ //
+
+ CONFIG_VARIABLE_INT(screensize),
+
//!
// Screen detail. Zero gives normal "high detail" mode, while
// a non-zero value gives "low detail" mode.
@@ -522,6 +532,11 @@ static default_t doom_defaults_list[] =
CONFIG_VARIABLE_STRING(back_flat),
+ //!
+ // Multiplayer nickname (?). (Strife only)
+ //
+
+ CONFIG_VARIABLE_STRING(nickname),
//!
// Multiplayer chat macro: message to send when alt+0 is pressed.
@@ -582,6 +597,13 @@ static default_t doom_defaults_list[] =
//
CONFIG_VARIABLE_STRING(chatmacro9),
+
+ //!
+ // Serial port number to use for SERSETUP.EXE (unused).
+ // (Strife only)
+ //
+
+ CONFIG_VARIABLE_INT(comport),
};
static default_collection_t doom_defaults =
diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 663d2028..635711e4 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -149,6 +149,14 @@ char mapdir[1024]; // directory of development maps
int show_endoom = 1;
+// fraggle 06/03/11 [STRIFE]: Unused config variable, preserved
+// for compatibility:
+
+static int comport = 0;
+
+// fraggle 06/03/11 [STRIFE]: Multiplayer nickname?
+
+static char *nickname = NULL;
void D_CheckNetGame (void);
void D_ProcessEvents (void);
@@ -416,20 +424,27 @@ void D_BindVariables(void)
// * Added voice volume
// * Added back flat
// * Removed show_messages
- // * Added show_text
+ // * Added show_talk
+ // fraggle 03/06/10: [STRIFE]
+ // * Removed detailLevel
+ // * screenblocks -> screensize
+ // * Added nickname, comport
+
M_BindVariable("mouse_sensitivity", &mouseSensitivity);
M_BindVariable("sfx_volume", &sfxVolume);
M_BindVariable("music_volume", &musicVolume);
M_BindVariable("voice_volume", &voiceVolume);
- M_BindVariable("show_text", &dialogshowtext);
- M_BindVariable("screenblocks", &screenblocks);
- M_BindVariable("detaillevel", &detailLevel);
+ M_BindVariable("show_talk", &dialogshowtext);
+ M_BindVariable("screensize", &screenblocks);
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_BindVariable("back_flat", &back_flat);
+ M_BindVariable("nickname", &nickname);
+ M_BindVariable("comport", &comport);
+
// Multiplayer chat macros
for (i=0; i<10; ++i)