teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace erroneous use of EVENT_DISPLAYCROSSHAIR with new event EVENT_DISPLAYCURSOR.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5003 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-02-11 07:08:27 +00:00
parent 16991aaef7
commit d88a938320
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/source/events_defs.h
View file

@ -105,6 +105,7 @@ enum GameEvent_t {
EVENT_DISPLAYINACTIVEMENU,
EVENT_DISPLAYINACTIVEMENUREST,
EVENT_CUTSCENE,
EVENT_DISPLAYCURSOR,
#ifdef LUNATIC
EVENT_ANIMATEALLSPRITES,
#endif

1
polymer/eduke32/source/gamedef.c
View file

@ -666,6 +666,7 @@ const char *EventNames[MAXEVENTS] =
"EVENT_DISPLAYINACTIVEMENU",
"EVENT_DISPLAYINACTIVEMENUREST",
"EVENT_CUTSCENE",
"EVENT_DISPLAYCURSOR",
#ifdef LUNATIC
"EVENT_ANIMATEALLSPRITES",
#endif

4
polymer/eduke32/source/lunatic/con_lang.lua
View file

@ -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.

7
polymer/eduke32/source/menus.c
View file

@ -5728,16 +5728,11 @@ 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;
#endif