commit e33e44276d9fc605d0c5096d4ec85e423e8eec8a
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Aug 10 23:27:52 2013 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Aug 10 23:27:52 2013 +0000
Fix Strife documentation comments. Remove -episode which does not exist
in Vanilla Strife.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2613
---
src/m_config.c | 8 ++++----
src/strife/d_main.c | 50 +++++++++++++++++++++++++++++---------------------
src/strife/p_spec.c | 2 +-
3 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/src/m_config.c b/src/m_config.c
index 8f1a2aa4..cce90579 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -1672,8 +1672,8 @@ void M_LoadDefaults (void)
// @arg <file>
// @vanilla
//
- // Load configuration from the specified file. The default
- // configuration file (for Doom) is named default.cfg.
+ // Load main configuration from the specified file, instead of the
+ // default.
//
i = M_CheckParmWithArgs("-config", 1);
@@ -1695,8 +1695,8 @@ void M_LoadDefaults (void)
//!
// @arg <file>
//
- // Load extra configuration from the specified file. The default
- // configuration file for Doom is named chocolate-doom.cfg.
+ // Load additional configuration from the specified file, instead of
+ // the default.
//
i = M_CheckParmWithArgs("-extraconfig", 1);
diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 9e27a47d..cabd0505 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -977,11 +977,11 @@ static void InitGameVersion(void)
// final revision. The differences between the two are barely worth
// mentioning aside from that main one.
- //!
+ //!
// @arg <version>
// @category compat
//
- // Emulate a specific version of Doom. Valid values are "1.2" and "1.31".
+ // Emulate a specific version of Strife. Valid values are "1.2" and "1.31".
//
p = M_CheckParmWithArgs("-gameversion", 1);
@@ -1296,11 +1296,10 @@ void D_DoomMain (void)
// haleyjd 20110206: Moved up -devparm for max visibility
- //!
+ //!
// @vanilla
//
- // Developer mode. F1 saves a screenshot in the current working
- // directory.
+ // Developer mode. Implies -nograph.
//
devparm = M_CheckParm ("-devparm");
@@ -1461,7 +1460,7 @@ void D_DoomMain (void)
// @platform windows
// @vanilla
//
- // Save configuration data and savegames in c:\doomdata,
+ // Save configuration data and savegames in c:\strife.cd,
// allowing play from CD.
//
@@ -1690,21 +1689,22 @@ void D_DoomMain (void)
autostart = true;
}
- //!
- // @arg <n>
- // @vanilla
- //
- // Start playing on episode n (1-4)
+ // [STRIFE] no such thing in Strife
//
+ // // @arg <n>
+ // // @vanilla
+ // //
+ // // Start playing on episode n (1-4)
+ // //
- p = M_CheckParmWithArgs("-episode", 1);
+ // p = M_CheckParmWithArgs("-episode", 1);
- if (p)
- {
- startepisode = myargv[p+1][0]-'0';
- startmap = 1;
- autostart = true;
- }
+ // if (p)
+ // {
+ // startepisode = myargv[p+1][0]-'0';
+ // startmap = 1;
+ // autostart = true;
+ // }
timelimit = 0;
@@ -1739,11 +1739,10 @@ void D_DoomMain (void)
}
//!
- // @arg [<x> <y> | <xy>]
+ // @arg x
// @vanilla
//
- // Start a game immediately, warping to ExMy (Doom 1) or MAPxy
- // (Doom 2)
+ // Start a game immediately, warping to level x.
//
p = M_CheckParmWithArgs("-warp", 1);
@@ -1843,10 +1842,19 @@ void D_DoomMain (void)
// haleyjd 20110220: This stuff was done in I_StartupSound in vanilla, but
// we'll do it here instead so we don't have to modify the low-level shared
// code with Strife-specific stuff.
+
+ //!
+ // @vanilla
+ //
+ // Disable voice dialog and show dialog as text instead,
+ // even if voices.wad can be found.
+ //
+
if(disable_voices || M_CheckParm("-novoice"))
{
dialogshowtext = disable_voices = 1;
}
+
if(devparm)
DEH_printf(" Play voices = %d\n", disable_voices == 0);
diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c
index 10a778bb..cd33ae9d 100644
--- a/src/strife/p_spec.c
+++ b/src/strife/p_spec.c
@@ -1708,7 +1708,7 @@ static void DonutOverrun(fixed_t *s3_floorheight, short *s3_floorpic,
//
// Use the specified magic values when emulating behavior caused
// by memory overruns from improperly constructed donuts.
- // In Vanilla Doom this can differ depending on the operating
+ // In Vanilla Strife this can differ depending on the operating
// system. The default (if this option is not specified) is to
// emulate the behavior when running under Windows 98.