Mercurial > mm7
diff Game.cpp @ 2454:16f0278279a5
removed CShow.cpp/.h files
author | Ritor1 |
---|---|
date | Fri, 25 Jul 2014 15:47:11 +0600 |
parents | 2a8010d99cf8 |
children | 83174b7b3763 |
line wrap: on
line diff
--- a/Game.cpp Fri Jul 25 15:06:52 2014 +0600 +++ b/Game.cpp Fri Jul 25 15:47:11 2014 +0600 @@ -12,11 +12,12 @@ #include "ParticleEngine.h" #include "Mouse.h" #include "Keyboard.h" -#include "CShow.h" #include "GammaControl.h" #include "stru6.h" #include "stru9.h" #include "stru10.h" +#include "ErrorHandling.h" +#include "MediaPlayer.h" #include "Game.h" #include "Party.h" @@ -139,7 +140,8 @@ pIndoor->Draw(); else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor) pOutdoor->Draw(); - else Error("Invalid level type: %u", uCurrentlyLoadedLevelType); + else + Error("Invalid level type: %u", uCurrentlyLoadedLevelType); //if (pRenderer->pRenderD3D) { @@ -428,7 +430,7 @@ pNPCStats->pNewNPCData[i].uFlags &= 0xFFFFFF7Fu; } pMediaPlayer->bStopBeforeSchedule = 0; - PlayFullscreenMovie(MOVIE_Death, true); + pMediaPlayer->PlayFullscreenMovie(MOVIE_Death, true); if ( pMovie_Track ) pMediaPlayer->Unload(); SaveGame(0, 0); @@ -1075,7 +1077,8 @@ else face->uAttributes |= FACE_OUTLINED; } - else Error("Invalid level type", uCurrentlyLoadedLevelType); + else + Error("Invalid level type", uCurrentlyLoadedLevelType); } break;