zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-22 03:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Doom2's cast call's Responder handled all events, not just KeyDown.

Browse source 
SVN r2909 (finale)
This commit is contained in:
Christoph Oelckers 2010-10-06 07:42:02 +00:00
parent cbbd0fd0b7
commit db51039607
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/intermission/intermission.cpp
View file

@ -427,6 +427,8 @@ void DIntermissionScreenCast::Init(FIntermissionAction *desc, bool first)
int DIntermissionScreenCast::Responder (event_t *ev) int DIntermissionScreenCast::Responder (event_t *ev)
{ {
if (ev->type != EV_KeyDown) return 0;
if (castdeath) if (castdeath)
return 1; // already in dying frames return 1; // already in dying frames
@ -705,7 +707,7 @@ bool DIntermissionController::Responder (event_t *ev)
{ {
if (mScreen != NULL) if (mScreen != NULL)
{ {
if (!mScreen->mPaletteChanged) if (!mScreen->mPaletteChanged && ev->type == EV_KeyDown)
{ {
const char *cmd = Bindings.GetBind (ev->data1); const char *cmd = Bindings.GetBind (ev->data1);

5
src/menu/menu.cpp
View file

@ -475,6 +475,11 @@ void M_SetMenu(FName menu, int param)
bool M_Responder (event_t *ev) bool M_Responder (event_t *ev)
{ {
if (ev->type == EV_KeyDown && menuactive != MENU_Off)
{
__asm nop
}
int ch = 0; int ch = 0;
bool keyup = false; bool keyup = false;
int mkey = NUM_MKEYS; int mkey = NUM_MKEYS;