commit 425b850cd5c7685ecccb588acf93dd47b30f91e1
Author: Thomas A. Birkel <capnclever@gmail.com>
AuthorDate: Thu Oct 20 10:51:46 2016 -0400
Commit: Thomas A. Birkel <capnclever@gmail.com>
CommitDate: Thu Oct 20 10:51:46 2016 -0400
Update branch with requested changes, second pass
Improve comments and parameter descriptions, use M_ParmExists()
instead of M_CheckParam().
---
src/heretic/d_main.c | 6 +++---
src/heretic/d_net.c | 4 ++--
src/heretic/g_game.c | 6 +++---
src/hexen/d_net.c | 4 ++--
src/hexen/g_game.c | 6 +++---
src/hexen/h2_main.c | 6 +++---
src/hexen/mn_menu.c | 2 ++
7 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 31e46842..75b47fbe 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -1034,7 +1034,7 @@ void D_DoomMain(void)
//!
// @category demo
//
- // Record a high turning resolution demo.
+ // Record or playback a demo with high resolution turning.
//
longtics = M_ParmExists("-longtics");
@@ -1042,8 +1042,8 @@ void D_DoomMain(void)
//!
// @category demo
//
- // Demo records and plays back without automatically quitting
- // after level exit.
+ // Record or playback a demo without automatically quitting
+ // after either level exit or player respawn.
//
demoextend = M_ParmExists("-demoextend");
diff --git a/src/heretic/d_net.c b/src/heretic/d_net.c
index 91e53a49..446f7bee 100644
--- a/src/heretic/d_net.c
+++ b/src/heretic/d_net.c
@@ -170,8 +170,8 @@ static void InitConnectData(net_connect_data_t *connect_data)
// Are we recording a demo? Possibly set lowres turn mode
- connect_data->lowres_turn = M_CheckParm("-record") > 0
- && M_CheckParm("-longtics") == 0;
+ connect_data->lowres_turn = M_ParmExists("-record")
+ && !M_ParmExists("-longtics");
// Read checksums of our WAD directory and dehacked information
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
index e27c458e..744d71ce 100644
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -112,7 +112,7 @@ char demoname[32];
boolean demorecording;
boolean longtics;
boolean lowres_turn;
-boolean shortticfix; // properly calculates lowres turns like in doom
+boolean shortticfix; // calculate lowres turning like doom
boolean demoplayback;
boolean demoextend;
byte *demobuffer, *demo_p, *demoend;
@@ -1746,9 +1746,9 @@ void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
//!
// @category demo
//
- // Smooths out low turning resolution when recording a demo.
+ // Smooth out low resolution turning when recording a demo.
//
- shortticfix = M_CheckParm("-shortticfix") != 0;
+ shortticfix = M_ParmExists("-shortticfix");
G_InitNew(skill, episode, map);
usergame = false;
diff --git a/src/hexen/d_net.c b/src/hexen/d_net.c
index 3810eab1..3e193ca9 100644
--- a/src/hexen/d_net.c
+++ b/src/hexen/d_net.c
@@ -181,8 +181,8 @@ static void InitConnectData(net_connect_data_t *connect_data)
// Are we recording a demo? Possibly set lowres turn mode
- connect_data->lowres_turn = M_CheckParm("-record") > 0
- && M_CheckParm("-longtics") == 0;
+ connect_data->lowres_turn = M_ParmExists("-record")
+ && !M_ParmExists("-longtics");
connect_data->drone = false;
connect_data->max_players = maxplayers;
diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c
index 434cea55..b1633205 100644
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -95,7 +95,7 @@ char demoname[32];
boolean demorecording;
boolean longtics;
boolean lowres_turn;
-boolean shortticfix; // properly calculates lowres turns like in doom
+boolean shortticfix; // calculate lowres turning like doom
boolean demoplayback;
boolean demoextend;
byte *demobuffer, *demo_p, *demoend;
@@ -1903,9 +1903,9 @@ void G_RecordDemo(skill_t skill, int numplayers, int episode, int map,
//!
// @category demo
//
- // Smooths out low turning resolution when recording a demo.
+ // Smooth out low resolution turning when recording a demo.
//
- shortticfix = M_CheckParm("-shortticfix") != 0;
+ shortticfix = M_ParmExists("-shortticfix");
lowres_turn = !longtics;
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index ae3230cb..cd7a25a5 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -679,7 +679,7 @@ static void HandleArgs(void)
//!
// @category demo
//
- // Record a high turning resolution demo.
+ // Record or playback a demo with high resolution turning.
//
longtics = M_ParmExists("-longtics");
@@ -687,8 +687,8 @@ static void HandleArgs(void)
//!
// @category demo
//
- // Demo records and plays back without automatically quitting
- // after level exit.
+ // Record or playback a demo without automatically quitting
+ // after either level exit or player respawn.
//
demoextend = M_ParmExists("-demoextend");
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index c6095492..3cb92742 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -898,6 +898,7 @@ static void SCLoadGame(int option)
{
if (demoplayback)
{
+ // deactivate playback, return control to player
demoextend = false;
}
if (!SlotStatus[option])
@@ -1010,6 +1011,7 @@ static void SCSkill(int option)
{
if (demoplayback)
{
+ // deactivate playback, return control to player
demoextend = false;
}