summaryrefslogtreecommitdiff
path: root/src/heretic
diff options
context:
space:
mode:
authorSimon Howard2015-08-15 13:59:19 -0400
committerMike Swanson2015-08-24 14:37:33 -0700
commit2da2ddd3777ee5ab35b197786677eb3e0df27030 (patch)
tree381bc90f93e9995561656ff92f65f1a15496db85 /src/heretic
parent1325cde4859ca54eed3e1da2c1d226ae96b62c00 (diff)
downloadchocolate-doom-2da2ddd3777ee5ab35b197786677eb3e0df27030.tar.gz
chocolate-doom-2da2ddd3777ee5ab35b197786677eb3e0df27030.tar.bz2
chocolate-doom-2da2ddd3777ee5ab35b197786677eb3e0df27030.zip
Remove duplicate variable definitions.
gametic and singletics are defined in d_loop.c, but there were still some duplicate definitions of these variables left over from before the game code was factored out. This fixed #561 (thanks edward-san).
Diffstat (limited to 'src/heretic')
-rw-r--r--src/heretic/d_main.c1
-rw-r--r--src/heretic/g_game.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index beb876ca..6521aff3 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -62,7 +62,6 @@ boolean respawnparm; // checkparm of -respawn
boolean debugmode; // checkparm of -debug
boolean ravpic; // checkparm of -ravpic
boolean cdrom; // true if cd-rom mode active
-boolean singletics; // debug flag to cancel adaptiveness
boolean noartiskip; // whether shift-enter skips an artifact
skill_t startskill;
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
index 1154925a..6ad38609 100644
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -102,7 +102,6 @@ player_t players[MAXPLAYERS];
int consoleplayer; // player taking events and displaying
int displayplayer; // view being displayed
-int gametic;
int levelstarttic; // gametic at level start
int totalkills, totalitems, totalsecret; // for intermission