mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 18:50:47 +00:00
New events:
EVENT_DISPLAYBONUSSCREEN EVENT_DISPLAYMENU EVENT_DISPLAYMENUREST EVENT_DISPLAYLOADINGSCREEN git-svn-id: https://svn.eduke32.com/eduke32@762 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
c634a708aa
commit
0602988743
5 changed files with 18 additions and 1 deletions
|
@ -796,7 +796,11 @@ enum events {
|
|||
EVENT_FAKEDOMOVETHINGS,
|
||||
EVENT_DISPLAYROOMS,
|
||||
EVENT_KILLIT,
|
||||
EVENT_LOADACTOR
|
||||
EVENT_LOADACTOR,
|
||||
EVENT_DISPLAYBONUSSCREEN,
|
||||
EVENT_DISPLAYMENU,
|
||||
EVENT_DISPLAYMENUREST,
|
||||
EVENT_DISPLAYLOADINGSCREEN
|
||||
};
|
||||
|
||||
// store global game definitions
|
||||
|
|
|
@ -12709,6 +12709,7 @@ FRAGBONUS:
|
|||
}
|
||||
}
|
||||
else break;
|
||||
OnEvent(EVENT_DISPLAYBONUSSCREEN, g_player[screenpeek].ps->i, screenpeek, -1);
|
||||
nextpage();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1162,6 +1162,10 @@ static int CheckEventSync(int iEventID)
|
|||
case EVENT_CHEATGETFIRSTAID:
|
||||
case EVENT_DISPLAYCROSSHAIR:
|
||||
case EVENT_DISPLAYREST:
|
||||
case EVENT_DISPLAYBONUSSCREEN:
|
||||
case EVENT_DISPLAYMENU:
|
||||
case EVENT_DISPLAYMENUREST:
|
||||
case EVENT_DISPLAYLOADINGSCREEN:
|
||||
case EVENT_DISPLAYROOMS:
|
||||
case EVENT_DISPLAYSBAR:
|
||||
case EVENT_DISPLAYWEAPON:
|
||||
|
@ -4886,6 +4890,10 @@ static void AddDefaultDefinitions(void)
|
|||
AddDefinition("EVENT_CROUCH",EVENT_CROUCH,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYCROSSHAIR",EVENT_DISPLAYCROSSHAIR,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYREST",EVENT_DISPLAYREST,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYBONUSSCREEN",EVENT_DISPLAYBONUSSCREEN,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYMENU",EVENT_DISPLAYMENU,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYMENUREST",EVENT_DISPLAYMENUREST,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYLOADINGSCREEN",EVENT_DISPLAYLOADINGSCREEN,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYROOMS",EVENT_DISPLAYROOMS,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYSBAR",EVENT_DISPLAYSBAR,LABEL_DEFINE);
|
||||
AddDefinition("EVENT_DISPLAYWEAPON",EVENT_DISPLAYWEAPON,LABEL_DEFINE);
|
||||
|
|
|
@ -612,6 +612,7 @@ void menus(void)
|
|||
walock[TILE_LOADSHOT] = 1;
|
||||
return;
|
||||
}
|
||||
OnEvent(EVENT_DISPLAYMENU, g_player[screenpeek].ps->i, screenpeek, -1);
|
||||
|
||||
g_player[myconnectindex].ps->gm &= (0xff-MODE_TYPE);
|
||||
g_player[myconnectindex].ps->fta = 0;
|
||||
|
@ -5040,6 +5041,7 @@ VOLUME_ALL_40x:
|
|||
|
||||
break;
|
||||
}
|
||||
OnEvent(EVENT_DISPLAYMENUREST, g_player[screenpeek].ps->i, screenpeek, -1);
|
||||
|
||||
if ((g_player[myconnectindex].ps->gm&MODE_MENU) != MODE_MENU)
|
||||
{
|
||||
|
|
|
@ -361,6 +361,7 @@ static void dofrontscreens(char *statustext)
|
|||
|
||||
if (statustext) gametext(160,180,statustext,0,2+8+16);
|
||||
|
||||
OnEvent(EVENT_DISPLAYLOADINGSCREEN, g_player[screenpeek].ps->i, screenpeek, -1);
|
||||
nextpage();
|
||||
|
||||
if (!statustext)
|
||||
|
@ -391,6 +392,7 @@ static void dofrontscreens(char *statustext)
|
|||
}
|
||||
menutext(160,105,0,0,"LOADING...");
|
||||
if (statustext) gametext(160,180,statustext,0,2+8+16);
|
||||
OnEvent(EVENT_DISPLAYLOADINGSCREEN, g_player[screenpeek].ps->i, screenpeek, -1);
|
||||
nextpage();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue