Mercurial > mm7
changeset 2469:8516bb27d7f0
use_MMT
| author | Ritor1 |
|---|---|
| date | Mon, 18 Aug 2014 13:11:39 +0600 |
| parents | 48cc5e0d8fc9 |
| children | 94cf712fc780 |
| files | GUIWindow.cpp Game.cpp MMT.cpp MMT.h |
| diffstat | 4 files changed, 33 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/GUIWindow.cpp Mon Aug 18 11:26:34 2014 +0600 +++ b/GUIWindow.cpp Mon Aug 18 13:11:39 2014 +0600 @@ -2126,7 +2126,7 @@ { GUIWindow Dst; // [sp+8h] [bp-54h]@1 - memset(&Dst, 0, 0x54u); + memset(&Dst, 0, sizeof(Dst)); Dst.uFrameWidth = 624; Dst.uFrameHeight = 256; Dst.uFrameX = 8;
--- a/Game.cpp Mon Aug 18 11:26:34 2014 +0600 +++ b/Game.cpp Mon Aug 18 13:11:39 2014 +0600 @@ -5378,7 +5378,7 @@ bool new_sky = false; //new sky(need texture) int max_flight_height = 4000; //maximum altitude - +bool use_MMT = false; //----- (00462C94) -------------------------------------------------------- bool MM_Main(const wchar_t *pCmdLine) @@ -5442,6 +5442,7 @@ pEventTimer->Pause(); SetUserInterface(PartyAlignment_Neutral, false); + ShowLogoVideo(); //ShowIntroVideo_and_LoadingScreen(); WriteWindowsRegistryInt("Ran once", 1); @@ -5452,7 +5453,6 @@ FinalInitialization(); //Ritor1: include - bool use_MMT = false; if (use_MMT) MMT_MainMenu_Loop();
--- a/MMT.cpp Mon Aug 18 11:26:34 2014 +0600 +++ b/MMT.cpp Mon Aug 18 13:11:39 2014 +0600 @@ -15,17 +15,18 @@ #include "GUIFont.h" #include "lib/libpng/png.h" #include "ErrorHandling.h" - +#include "Bink_Smacker.h" #include "Game.h" void ShowLogoVideo() { RGBTexture tex; // [sp+Ch] [bp-30h]@1 - //unsigned int uTrackStartMS; // [sp+34h] [bp-8h]@8 - //unsigned int uTrackEndMS; // [sp+38h] [bp-4h]@8 + unsigned int uTrackStartMS; // [sp+34h] [bp-8h]@8 + unsigned int uTrackEndMS; // [sp+38h] [bp-4h]@8 pMediaPlayer->bStopBeforeSchedule = false; + // pMediaPlayer->pResetflag = 0; bGameoverLoop = 1; if (!bNoVideo) @@ -36,20 +37,32 @@ { pMediaPlayer->PlayFullscreenMovie(MOVIE_NWCLogo, true); if ( !pMediaPlayer->bStopBeforeSchedule ) - pMediaPlayer->PlayFullscreenMovie(MOVIE_JVC, true); + //pMediaPlayer->PlayFullscreenMovie(MOVIE_JVC, true);//Ritor1: crash + //if ( !pMediaPlayer->bStopBeforeSchedule ) + if (!use_MMT) + pMediaPlayer->PlayFullscreenMovie(MOVIE_Intro, true); } } char pContainerName[64]; - sprintf(pContainerName, "data\\New_Icons/%s", "MMTTITLE.pcx"); - tex.LoadPCXFile(pContainerName, 0); + if (use_MMT) + { + sprintf(pContainerName, "data\\New_Icons/%s", "MMTTITLE.pcx"); + tex.LoadPCXFile(pContainerName, 0); + } + else + tex.Load("mm6title.pcx", 2); pRenderer->BeginScene(); pRenderer->DrawTextureRGB(0, 0, &tex); free(tex.pPixels); tex.pPixels = 0; MainMenuUI_LoadFontsAndSomeStuff(); - DrawMMTCopyrightWindow();//Text message in ÌÌÒ menu + + if (use_MMT) + DrawMMTCopyrightWindow();//Text message in ÌÌÒ menu + else + DrawMM7CopyrightWindow(); pRenderer->EndScene(); pRenderer->Present(); @@ -57,14 +70,16 @@ #ifndef _DEBUG Sleep(1500); // let the copyright window stay for a while #endif - - /*if (!bNoSound && pAudioPlayer->hAILRedbook ) + if (!use_MMT) { - pAudioPlayer->SetMusicVolume((signed __int64)(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0)); - AIL_redbook_stop(pAudioPlayer->hAILRedbook); - AIL_redbook_track_info(pAudioPlayer->hAILRedbook, 14, &uTrackStartMS, &uTrackEndMS); - AIL_redbook_play(pAudioPlayer->hAILRedbook, uTrackStartMS + 1, uTrackEndMS); - } */ + if (!bNoSound && pAudioPlayer->hAILRedbook ) + { + pAudioPlayer->SetMusicVolume((signed __int64)(pSoundVolumeLevels[uMusicVolimeMultiplier] * 64.0)); + AIL_redbook_stop(pAudioPlayer->hAILRedbook); + AIL_redbook_track_info(pAudioPlayer->hAILRedbook, 14, &uTrackStartMS, &uTrackEndMS); + AIL_redbook_play(pAudioPlayer->hAILRedbook, uTrackStartMS + 1, uTrackEndMS); + } + } bGameoverLoop = 0; }