From 282036a04857d85c9d79e9aabc4d24faeb6aa75a Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 17 May 2012 20:47:56 +0000 Subject: [PATCH] Fix EVENT_CHECKTOUCHDAMAGE (the change to how events handle RETURN broke it) git-svn-id: https://svn.eduke32.com/eduke32@2660 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 54acefd46..eb6e9283d 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -3523,7 +3523,7 @@ void P_CheckWeapon(DukePlayer_t *p) void P_CheckTouchDamage(DukePlayer_t *p,int32_t j) { - if (VM_OnEvent(EVENT_CHECKTOUCHDAMAGE, p->i, sprite[p->i].yvel, -1, j) == -1) + if ((j = VM_OnEvent(EVENT_CHECKTOUCHDAMAGE, p->i, sprite[p->i].yvel, -1, j)) == -1) return; if ((j&49152) == 49152)