CON: Add EVENT_DISPLAYCAMERAOSD. Set RETURN to -1 to disable it.

From this event, if "getactor[THISACTOR].htg_t 0" is zero, then the camera is functional. Nonzero values indicate the camera has been destroyed, which is only possible when the CAMERASDESTRUCTABLE parameter of gamestartup has been enabled.

git-svn-id: https://svn.eduke32.com/eduke32@5046 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-03-08 07:58:06 +00:00
parent 35bee70ee6
commit ef28cac919
4 changed files with 7 additions and 1 deletions

View file

@ -107,6 +107,7 @@ enum GameEvent_t {
EVENT_CUTSCENE, EVENT_CUTSCENE,
EVENT_DISPLAYCURSOR, EVENT_DISPLAYCURSOR,
EVENT_DISPLAYLEVELSTATS, EVENT_DISPLAYLEVELSTATS,
EVENT_DISPLAYCAMERAOSD,
#ifdef LUNATIC #ifdef LUNATIC
EVENT_ANIMATEALLSPRITES, EVENT_ANIMATEALLSPRITES,
#endif #endif

View file

@ -12944,6 +12944,9 @@ void G_BonusScreen(int32_t bonusonly)
static void G_DrawCameraText(int16_t i) static void G_DrawCameraText(int16_t i)
{ {
if (VM_OnEvent(EVENT_DISPLAYCAMERAOSD, i, screenpeek) != 0)
return;
if (!T1) if (!T1)
{ {
rotatesprite_win(24<<16,33<<16,65536L,0,CAMCORNER,0,0,2); rotatesprite_win(24<<16,33<<16,65536L,0,CAMCORNER,0,0,2);

View file

@ -672,6 +672,7 @@ const char *EventNames[MAXEVENTS] =
"EVENT_CUTSCENE", "EVENT_CUTSCENE",
"EVENT_DISPLAYCURSOR", "EVENT_DISPLAYCURSOR",
"EVENT_DISPLAYLEVELSTATS", "EVENT_DISPLAYLEVELSTATS",
"EVENT_DISPLAYCAMERAOSD",
#ifdef LUNATIC #ifdef LUNATIC
"EVENT_ANIMATEALLSPRITES", "EVENT_ANIMATEALLSPRITES",
#endif #endif

View file

@ -179,11 +179,12 @@ EVENT = {
EVENT_CUTSCENE = 99, EVENT_CUTSCENE = 99,
EVENT_DISPLAYCURSOR = 100, EVENT_DISPLAYCURSOR = 100,
EVENT_DISPLAYLEVELSTATS = 101, EVENT_DISPLAYLEVELSTATS = 101,
EVENT_DISPLAYCAMERAOSD = 102,
-- EVENT_ANIMATEALLSPRITES = previous+1, -- internal -- EVENT_ANIMATEALLSPRITES = previous+1, -- internal
-- KEEPINSYNC with MAXEVENTS below -- KEEPINSYNC with MAXEVENTS below
} }
MAXEVENTS = 102 -- KEEPINSYNC with above EVENT_* list MAXEVENTS = 103 -- KEEPINSYNC with above EVENT_* list
-- NOTE: negated values are not exported to the ffi.C namespace or CON. -- NOTE: negated values are not exported to the ffi.C namespace or CON.
-- See TWEAK_SFLAG below. -- See TWEAK_SFLAG below.