shithub: choc

Download patch

ref: 43e82bdf93c0c3971767a63072db5b0080c2f6c6
parent: 07bb5a69ef9f1240bf887585aa7162d854368d03
author: Simon Howard <fraggle@gmail.com>
date: Sun Mar 6 18:43:29 EST 2011 

Fix up config file variables to match Vanilla.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2295


--- a/src/m_config.c
+++ b/src/m_config.c
@@ -142,6 +142,13 @@
     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 @@
 
     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.
     //
@@ -443,6 +443,16 @@
     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,7 +532,12 @@
 
     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 @@
     //
 
     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 = 
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -149,7 +149,15 @@
 
 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);
 void G_BuildTiccmd (ticcmd_t* cmd);
@@ -416,19 +424,26 @@
     // * 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