commit 69a8ad95840704e1061dca31b2427599291a6add
Author: Thomas A. Birkel <capnclever@gmail.com>
AuthorDate: Thu Oct 20 17:26:08 2016 -0400
Commit: Thomas A. Birkel <capnclever@gmail.com>
CommitDate: Thu Oct 20 17:26:08 2016 -0400
Update branch with requested changes, third pass
Improve comments and alignment.
---
src/heretic/d_net.c | 4 ++--
src/heretic/doomdef.h | 8 +++++---
src/heretic/g_game.c | 2 --
src/hexen/d_net.c | 4 ++--
src/hexen/g_game.c | 2 --
src/hexen/h2def.h | 8 +++++---
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/heretic/d_net.c b/src/heretic/d_net.c
index 446f7bee..85f8bfa1 100644
--- a/src/heretic/d_net.c
+++ b/src/heretic/d_net.c
@@ -151,7 +151,7 @@ static void SaveGameSettings(net_gamesettings_t *settings)
settings->timelimit = 0;
settings->lowres_turn = M_ParmExists("-record")
- && !M_ParmExists("-longtics");
+ && !M_ParmExists("-longtics");
}
static void InitConnectData(net_connect_data_t *connect_data)
@@ -171,7 +171,7 @@ static void InitConnectData(net_connect_data_t *connect_data)
// Are we recording a demo? Possibly set lowres turn mode
connect_data->lowres_turn = M_ParmExists("-record")
- && !M_ParmExists("-longtics");
+ && !M_ParmExists("-longtics");
// Read checksums of our WAD directory and dehacked information
diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h
index 2619452e..334a3229 100644
--- a/src/heretic/doomdef.h
+++ b/src/heretic/doomdef.h
@@ -527,13 +527,15 @@ extern boolean DebugSound; // debug flag for displaying sound info
extern int GetWeaponAmmo[NUMWEAPONS];
extern boolean demorecording;
-extern boolean lowres_turn; // Truncate angleturn in ticcmds to nearest 256.
- // Used when recording Vanilla demos in netgames.
-extern boolean longtics; // specifies 16-bit angleturn resolution in demos
+extern boolean longtics; // specify high resolution turning in demos
extern boolean demoplayback;
extern boolean demoextend; // allow demos to persist through exit/respawn
extern int skytexture;
+// Truncate angleturn in ticcmds to nearest 256.
+// Used when recording Vanilla demos in netgames.
+extern boolean lowres_turn;
+
extern gamestate_t gamestate;
extern skill_t gameskill;
extern boolean respawnmonsters;
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
index 744d71ce..6d676607 100644
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -626,8 +626,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
BT_SPECIAL | BTS_SAVEGAME | (savegameslot << BTS_SAVESHIFT);
}
- // low-res turning
-
if (lowres_turn)
{
if (shortticfix)
diff --git a/src/hexen/d_net.c b/src/hexen/d_net.c
index 3e193ca9..cfaa5897 100644
--- a/src/hexen/d_net.c
+++ b/src/hexen/d_net.c
@@ -163,7 +163,7 @@ static void SaveGameSettings(net_gamesettings_t *settings)
settings->timelimit = 0;
settings->lowres_turn = M_ParmExists("-record")
- && !M_ParmExists("-longtics");
+ && !M_ParmExists("-longtics");
}
static void InitConnectData(net_connect_data_t *connect_data)
@@ -182,7 +182,7 @@ static void InitConnectData(net_connect_data_t *connect_data)
// Are we recording a demo? Possibly set lowres turn mode
connect_data->lowres_turn = M_ParmExists("-record")
- && !M_ParmExists("-longtics");
+ && !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 b1633205..575e9a13 100644
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -627,8 +627,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
BT_SPECIAL | BTS_SAVEGAME | (savegameslot << BTS_SAVESHIFT);
}
- // low-res turning
-
if (lowres_turn)
{
if (shortticfix)
diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index 71128f91..91f5285c 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -632,13 +632,15 @@ extern player_t players[MAXPLAYERS];
extern boolean DebugSound; // debug flag for displaying sound info
-extern boolean lowres_turn; // Truncate angleturn in ticcmds to nearest 256.
- // Used when recording Vanilla demos in netgames.
-extern boolean longtics; // specifies 16-bit angleturn resolution in demos
+extern boolean longtics; // specify high resolution turning in demos
extern boolean demoplayback;
extern boolean demoextend; // allow demos to persist through exit/respawn
extern int maxzone; // Maximum chunk allocated for zone heap
+// Truncate angleturn in ticcmds to nearest 256.
+// Used when recording Vanilla demos in netgames.
+extern boolean lowres_turn;
+
extern int Sky1Texture;
extern int Sky2Texture;