From 7d9e7d9bfcdf454f434a30b070a6715e89192ccd Mon Sep 17 00:00:00 2001 From: zicodxx <> Date: Wed, 19 Nov 2008 12:34:50 +0000 Subject: [PATCH] Actually demand ANY valid key to abort the Death sequence --- CHANGELOG.txt | 4 ++++ main/gamecntl.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0bd59f95e..7469cfdc3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D2X-Rebirth Changelog +20081119 +-------- +main/gamecntl.c: Actually demand ANY valid key to abort the Death sequence + 20081118 -------- main/console.c: When printing Gamelog, make sure canvas is NULL diff --git a/main/gamecntl.c b/main/gamecntl.c index fcdf1e8bc..6ccbd9775 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -629,7 +629,7 @@ void HandleDeathKey(int key) doesn't work in the DOS version anyway. -Samir */ - if (Player_exploded && !key_isfunc(key) && !key_ismod(key)) + if (Player_exploded && !key_isfunc(key) && !key_ismod(key) && key) Death_sequence_aborted = 1; //Any key but func or modifier aborts #ifdef MACINTOSH