diff --git a/polymer/eduke32/source/events_defs.h b/polymer/eduke32/source/events_defs.h index 197ba9d27..c0e12b934 100644 --- a/polymer/eduke32/source/events_defs.h +++ b/polymer/eduke32/source/events_defs.h @@ -105,6 +105,7 @@ enum GameEvent_t { EVENT_DISPLAYINACTIVEMENU, EVENT_DISPLAYINACTIVEMENUREST, EVENT_CUTSCENE, + EVENT_DISPLAYCURSOR, #ifdef LUNATIC EVENT_ANIMATEALLSPRITES, #endif diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 075c10ccc..d413c12d6 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -666,6 +666,7 @@ const char *EventNames[MAXEVENTS] = "EVENT_DISPLAYINACTIVEMENU", "EVENT_DISPLAYINACTIVEMENUREST", "EVENT_CUTSCENE", + "EVENT_DISPLAYCURSOR", #ifdef LUNATIC "EVENT_ANIMATEALLSPRITES", #endif diff --git a/polymer/eduke32/source/lunatic/con_lang.lua b/polymer/eduke32/source/lunatic/con_lang.lua index 838525561..ca3f8489a 100644 --- a/polymer/eduke32/source/lunatic/con_lang.lua +++ b/polymer/eduke32/source/lunatic/con_lang.lua @@ -176,11 +176,13 @@ EVENT = { EVENT_ACTIVATECHEAT = 96, EVENT_DISPLAYINACTIVEMENU = 97, EVENT_DISPLAYINACTIVEMENUREST = 98, + EVENT_CUTSCENE = 99, + EVENT_DISPLAYCURSOR = 100, -- EVENT_ANIMATEALLSPRITES = previous+1, -- internal -- KEEPINSYNC with MAXEVENTS below } -MAXEVENTS = 99 -- KEEPINSYNC with above EVENT_* list +MAXEVENTS = 101 -- KEEPINSYNC with above EVENT_* list -- NOTE: negated values are not exported to the ffi.C namespace or CON. -- See TWEAK_SFLAG below. diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c index f37aece1c..fbecb3383 100644 --- a/polymer/eduke32/source/menus.c +++ b/polymer/eduke32/source/menus.c @@ -5728,15 +5728,10 @@ void M_DisplayMenus(void) // Display the mouse cursor, except on touch devices. if (MOUSEACTIVECONDITION) { - int32_t a = VM_OnEventWithReturn(EVENT_DISPLAYCROSSHAIR, g_player[screenpeek].ps->i, screenpeek, CROSSHAIR); + int32_t a = VM_OnEventWithReturn(EVENT_DISPLAYCURSOR, g_player[screenpeek].ps->i, screenpeek, CROSSHAIR); if ((unsigned) a < MAXTILES) - { - if (a == 0) - a = CROSSHAIR; - rotatesprite_fs_alpha(m_mousepos.x, m_mousepos.y, 65536, 0, a, 0, CROSSHAIR_PAL, 2|1, MOUSEALPHA); - } } else mousepressstate = Mouse_Idle;