summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2007-02-07 13:04:46 +0000
committerSimon Howard2007-02-07 13:04:46 +0000
commita653fb6e0cfab8b5bbe71ae7652e1a9af810b065 (patch)
tree96c9684b867cf682a390c409bc395cb1f1124de0
parent16447cf340d51ef54d6780a28ebe6192cf2d1537 (diff)
downloadchocolate-doom-a653fb6e0cfab8b5bbe71ae7652e1a9af810b065.tar.gz
chocolate-doom-a653fb6e0cfab8b5bbe71ae7652e1a9af810b065.tar.bz2
chocolate-doom-a653fb6e0cfab8b5bbe71ae7652e1a9af810b065.zip
Revert previous change: throwing away the key state seems to be the Doom
1.9 behavior. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 832
-rw-r--r--NEWS3
-rw-r--r--src/g_game.c10
2 files changed, 1 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 3ba80173..f89e1f57 100644
--- a/NEWS
+++ b/NEWS
@@ -107,9 +107,6 @@
is possible to disable sound, as with Vanilla.
* Repeat key presses when the key is held down (this is the Vanilla
behavior) - thanks to Mad_Mac for pointing this out.
- * Don't throw away key press state when starting a new level - allows
- shift to be held down for run when moving between levels (thanks
- to Zack Friedrich <zack18@comcast.net>.
* Don't print a list of all arguments read from response files - Vanilla
doesn't do this.
* Autorun only when joyb_speed >= 10, not >= 4. Thanks to Janizdreg
diff --git a/src/g_game.c b/src/g_game.c
index 87aae640..3a4cba02 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -203,7 +203,6 @@ fixed_t angleturn[3] = {640, 1280, 320}; // + slow turn
#define NUMKEYS 256
-static boolean gamekeydown_initialised = false;
static boolean gamekeydown[NUMKEYS];
static int turnheld; // for accelerative turning
@@ -645,14 +644,7 @@ void G_DoLoadLevel (void)
// clear cmd building stuff
- // Initialise gamekeydown when the first level is loaded
-
- if (!gamekeydown_initialised)
- {
- memset (gamekeydown, 0, sizeof(gamekeydown));
- gamekeydown_initialised = true;
- }
-
+ memset (gamekeydown, 0, sizeof(gamekeydown));
joyxmove = joyymove = 0;
mousex = mousey = 0;
sendpause = sendsave = paused = false;