zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- allow setting a global dialogue lump through gameinfo.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-26 17:22:02 +01:00
parent f31ddbc57c
commit 3f5ef48dac
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gi.cpp
View file

@ -374,6 +374,7 @@ void FMapInfoParser::ParseGameInfo()
GAMEINFOKEY_PATCH(mStatscreenEnteringFont, "statscreen_enteringpatch") GAMEINFOKEY_PATCH(mStatscreenEnteringFont, "statscreen_enteringpatch")
GAMEINFOKEY_BOOL(norandomplayerclass, "norandomplayerclass") GAMEINFOKEY_BOOL(norandomplayerclass, "norandomplayerclass")
GAMEINFOKEY_BOOL(forcekillscripts, "forcekillscripts") // [JM] Force kill scripts on thing death. (MF7_NOKILLSCRIPTS overrides.) GAMEINFOKEY_BOOL(forcekillscripts, "forcekillscripts") // [JM] Force kill scripts on thing death. (MF7_NOKILLSCRIPTS overrides.)
GAMEINFOKEY_STRING(Dialogue, "dialogue")
else else
{ {

1
src/gi.h
View file

@ -176,6 +176,7 @@ struct gameinfo_t
FName DefaultEndSequence; FName DefaultEndSequence;
FString mMapArrow, mCheatMapArrow; FString mMapArrow, mCheatMapArrow;
FString mEasyKey, mCheatKey; FString mEasyKey, mCheatKey;
FString Dialogue;
FGIFont mStatscreenMapNameFont; FGIFont mStatscreenMapNameFont;
FGIFont mStatscreenFinishedFont; FGIFont mStatscreenFinishedFont;
FGIFont mStatscreenEnteringFont; FGIFont mStatscreenEnteringFont;

5
src/p_conversation.cpp
View file

@ -205,6 +205,11 @@ void P_LoadStrifeConversations (MapData *map, const char *mapname)
{ {
if (!LoadScriptFile (scriptname_b, false, 1)) if (!LoadScriptFile (scriptname_b, false, 1))
{ {
if (gameinfo.Dialogue.IsNotEmpty())
{
if (LoadScriptFile(gameinfo.Dialogue, false, 0)) return;
}
LoadScriptFile ("SCRIPT00", false, 1); LoadScriptFile ("SCRIPT00", false, 1);
} }
} }