diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2020-05-27 20:51:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 20:51:40 +0200 |
| commit | e4649b41e1acf07d7cdcae867acdc7b3eb25c82b (patch) | |
| tree | 9914753482fb7cd3d0eb0efad6a058e54850db0f /src/control | |
| parent | VC Water (diff) | |
| parent | librw update (diff) | |
| download | re3-e4649b41e1acf07d7cdcae867acdc7b3eb25c82b.tar re3-e4649b41e1acf07d7cdcae867acdc7b3eb25c82b.tar.gz re3-e4649b41e1acf07d7cdcae867acdc7b3eb25c82b.tar.bz2 re3-e4649b41e1acf07d7cdcae867acdc7b3eb25c82b.tar.lz re3-e4649b41e1acf07d7cdcae867acdc7b3eb25c82b.tar.xz re3-e4649b41e1acf07d7cdcae867acdc7b3eb25c82b.tar.zst re3-e4649b41e1acf07d7cdcae867acdc7b3eb25c82b.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Pickups.cpp | 3 | ||||
| -rw-r--r-- | src/control/Script.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 1d2d06f7..3ac1bb4a 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -840,6 +840,7 @@ CPickups::RenderPickUpText() if (aMessages[i].m_weaponType == WEAPONTYPE_TOTALWEAPONS) { // unreachable code? // what is this?? sprintf(gString, "%d/%d", CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages, 2903); + strToPrint = nil; } else { if (aMessages[i].m_bOutOfStock) strToPrint = TheText.Get("STOCK"); @@ -971,6 +972,8 @@ CPickups::RenderPickUpText() break; } } + if (strToPrint == nil) + continue; CFont::SetPropOn(); CFont::SetBackgroundOff(); diff --git a/src/control/Script.cpp b/src/control/Script.cpp index d7abbfb2..b9ce5073 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -9571,7 +9571,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) case COMMAND_LOAD_END_OF_GAME_TUNE: DMAudio.ChangeMusicMode(MUSICMODE_CUTSCENE); printf("Start preload end of game audio\n"); - DMAudio.PreloadCutSceneMusic(STREAMED_SOUND_GAME_COMPLETED); + DMAudio.PreloadCutSceneMusic(STREAMED_SOUND_CUTSCENE_FINALE); printf("End preload end of game audio\n"); return 0; /* |