From acbfa9ad05c3e6f41ee6c5b1a3f7db8624bcf361 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 5 Jul 2012 17:55:15 +0000 Subject: [PATCH] Fix disabling EVENT_DISPLAYCROSSHAIR by setting RETURN to 1. SECTOREFFECTOR is not a useful crosshair. git-svn-id: https://svn.eduke32.com/eduke32@2803 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 41a02f721..00dbb34ba 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -2839,10 +2839,14 @@ void G_DisplayRest(int32_t smoothratio) if (g_player[myconnectindex].ps->newowner == -1 && ud.overhead_on == 0 && ud.crosshair && ud.camerasprite == -1) { - a = VM_OnEvent(EVENT_DISPLAYCROSSHAIR, g_player[screenpeek].ps->i, screenpeek, -1, CROSSHAIR); - if (a >= 0) + a = VM_OnEvent(EVENT_DISPLAYCROSSHAIR, g_player[screenpeek].ps->i, screenpeek, -1, 0); + if (a == 0 || a > 1) { int32_t x, y; + + if (a == 0) + a = CROSSHAIR; + #ifdef GEKKO readmouseabsxy(&x, &y); if (x || y)