- switched over to the scripted intermission screens.
This commit is contained in:
parent
9ef88ea327
commit
622b4a6457
15 changed files with 225 additions and 1639 deletions
|
|
@ -971,6 +971,7 @@ void D_ErrorCleanup ()
|
|||
{
|
||||
menuactive = MENU_Off;
|
||||
}
|
||||
if (gamestate == GS_INTERMISSION) gamestate = GS_DEMOSCREEN;
|
||||
insave = false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@ DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, mStatscreenEnteringFont)
|
|||
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, mStatscreenFinishedFont)
|
||||
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, gibfactor)
|
||||
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, intermissioncounter)
|
||||
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, statusscreen_single)
|
||||
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, statusscreen_coop)
|
||||
DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, statusscreen_dm)
|
||||
|
||||
|
||||
const char *GameNames[17] =
|
||||
|
|
@ -393,6 +396,9 @@ void FMapInfoParser::ParseGameInfo()
|
|||
GAMEINFOKEY_BOOL(norandomplayerclass, "norandomplayerclass")
|
||||
GAMEINFOKEY_BOOL(forcekillscripts, "forcekillscripts") // [JM] Force kill scripts on thing death. (MF7_NOKILLSCRIPTS overrides.)
|
||||
GAMEINFOKEY_STRING(Dialogue, "dialogue")
|
||||
GAMEINFOKEY_STRING(statusscreen_single, "statscreen_single")
|
||||
GAMEINFOKEY_STRING(statusscreen_coop, "statscreen_coop")
|
||||
GAMEINFOKEY_STRING(statusscreen_dm, "statscreen_dm")
|
||||
|
||||
else
|
||||
{
|
||||
|
|
|
|||
3
src/gi.h
3
src/gi.h
|
|
@ -181,6 +181,9 @@ struct gameinfo_t
|
|||
FGIFont mStatscreenEnteringFont;
|
||||
bool norandomplayerclass;
|
||||
bool forcekillscripts;
|
||||
FName statusscreen_single;
|
||||
FName statusscreen_coop;
|
||||
FName statusscreen_dm;
|
||||
|
||||
const char *GetFinalePage(unsigned int num) const;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -645,6 +645,9 @@ xx(ceilingglowheight)
|
|||
xx(fogdensity)
|
||||
xx(Static)
|
||||
xx(Staticconst)
|
||||
xx(DeathmatchStatusScreen)
|
||||
xx(CoopStatusScreen)
|
||||
xx(RavenStatusScreen)
|
||||
|
||||
// USDF keywords
|
||||
xx(Amount)
|
||||
|
|
|
|||
|
|
@ -2577,7 +2577,7 @@ EColorRange V_FindFontColor (FName name)
|
|||
|
||||
DEFINE_ACTION_FUNCTION(FFont, FindFontColor)
|
||||
{
|
||||
PARAM_SELF_STRUCT_PROLOGUE(FFont);
|
||||
PARAM_PROLOGUE;
|
||||
PARAM_NAME(code);
|
||||
ACTION_RETURN_INT((int)V_FindFontColor(code));
|
||||
}
|
||||
|
|
|
|||
1655
src/wi_stuff.cpp
1655
src/wi_stuff.cpp
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue