zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- implemented help and credits menu for Blood.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-01 21:44:50 +01:00
parent 1cfe5be130
commit eb668180c8
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/blood/src/d_menu.cpp
View file

@ -181,7 +181,7 @@ protected:
void PostDraw() void PostDraw()
{ {
itemBloodQAV->Draw(); //itemBloodQAV->Draw();
} }
}; };

1
source/common/menu/imagescroller.cpp
View file

@ -102,6 +102,7 @@ bool DImageScrollerMenu::MenuEvent(int mkey, bool fromcontroller)
if (pageTransition.current) pageTransition.current->origin = { 0,0 }; if (pageTransition.current) pageTransition.current->origin = { 0,0 };
return DMenu::MenuEvent(mkey, fromcontroller); return DMenu::MenuEvent(mkey, fromcontroller);
case MKEY_Left: case MKEY_Left:
if (pageTransition.previous == nullptr) if (pageTransition.previous == nullptr)
{ {

1
source/common/menu/menudef.cpp
View file

@ -644,6 +644,7 @@ static void ParseImageScroller(FScanner &sc)
FImageScrollerDescriptor *desc = new FImageScrollerDescriptor; FImageScrollerDescriptor *desc = new FImageScrollerDescriptor;
desc->mType = MDESC_ImageScroller; desc->mType = MDESC_ImageScroller;
desc->mMenuName = sc.String; desc->mMenuName = sc.String;
desc->mClass = NAME_None;
ParseImageScrollerBody(sc, desc); ParseImageScrollerBody(sc, desc);
bool scratch = ReplaceMenu(sc, desc); bool scratch = ReplaceMenu(sc, desc);

2
source/common/utility/stringtable.h
View file

@ -126,7 +126,7 @@ public:
const char* localize(const char* str) const char* localize(const char* str)
{ {
return *str == '$' ? GetString(str + 1, nullptr) : str; return *str == '$' ? operator()(str + 1) : str;
} }
}; };

5
wadsrc/static/demolition/menudef.txt
View file

@ -116,11 +116,12 @@ LISTMENU "IngameMenu"
centermenu centermenu
Linespacing 17 Linespacing 17
NativeTextItem "$MNU_NEWGAME", "n", "EpisodeMenu" NativeTextItem "$MNU_NEWGAME", "n", "EpisodeMenu"
NativeTextItem "$MNU_MULTIPLAYER", "m", "MultiMenu"
NativeTextItem "$MNU_OPTIONS", "o", "OptionsMenu" NativeTextItem "$MNU_OPTIONS", "o", "OptionsMenu"
NativeTextItem "$MNU_SAVEGAME", "s", "SaveGameMenu"
NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu" NativeTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
NativeTextItem "$MNU_HELP", "h", "HelpMenu" NativeTextItem "$MNU_HELP", "h", "HelpMenu"
NativeTextItem "$MNU_CREDITS", "c", "CreditsMenu" NativeTextItem "$MNU_CREDITS", "c", "CreditsMenu"
NativeTextItem "$MNU_ENDGAME", "e", "QuitToMenu"
NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu" NativeTextItem "$MNU_QUITGAME", "q", "QuitMenu"
} }
ifgame(ShadowWarrior) ifgame(ShadowWarrior)
@ -419,6 +420,7 @@ ImageScroller "HelpMenu"
} }
ifgame(blood) ifgame(blood)
{ {
class "Blood.ImageScrollerMenu"
// The duplication here is to integrate the alternating versions of HELP3 // The duplication here is to integrate the alternating versions of HELP3
QAVAnimationItem "Help4.qav" QAVAnimationItem "Help4.qav"
QAVAnimationItem "Help5.qav" QAVAnimationItem "Help5.qav"
@ -530,6 +532,7 @@ ImageScroller "CreditsMenu"
} }
ifgame(blood) ifgame(blood)
{ {
class "Blood.ImageScrollerMenu"
QAVAnimationItem "Credits.qav" QAVAnimationItem "Credits.qav"
} }
ifgame(ShadowWarrior) ifgame(ShadowWarrior)