File tree Expand file tree Collapse file tree 3 files changed +19
-4
lines changed Expand file tree Collapse file tree 3 files changed +19
-4
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -32,6 +32,19 @@ enum MainState
3232#endif
3333};
3434
35+ enum MenuState
36+ {
37+ LegalScreens,
38+ IntroMovie,
39+ PressStartScreen,
40+ MainMenuScreen,
41+ StartingNewGame,
42+ PlayExtrasMovie,
43+ StartingAttractMode,
44+ InAttractMode,
45+ PlayNewGameMovie
46+ };
47+
3548struct WipeInfo
3649{
3750 float wipeCur;
Original file line number Diff line number Diff line change @@ -191,18 +191,21 @@ void MainMenu::SwitchPlayerCharacter(char* name) noexcept
191191
192192void MainMenu::OnFrame ()
193193{
194- #ifndef TR8
195194 // Shows the watermark in the main menu
196195 auto mainState = *(int *)GET_ADDRESS (0x10E5868 , 0x838838 , 0xE7ED60 );
197196
198- if (mainState == MS_DISPLAY_MAIN_MENU && !m_noWatermark.GetValue ())
197+ if (mainState == MS_DISPLAY_MAIN_MENU && !m_noWatermark.GetValue ()
198+ #ifdef TR8
199+ // Menu state in TR8 so it doesn't show during the game intro
200+ && *(char *)0xFAE8DA == MainMenuScreen
201+ #endif
202+ )
199203 {
200204 auto font = Font::GetMainFont ();
201205
202206 font->SetCursor (5 .f , 430 .f );
203207 font->Print (" TRLAU-Menu-Hook" );
204208 }
205- #endif
206209}
207210
208211void MainMenu::OnLoop ()
You can’t perform that action at this time.
0 commit comments