mirrors/re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #467 from Nick007J/master

Browse Source 
bug fixes
This commit is contained in:
Nikolay Korolev 2020-04-18 13:57:11 +03:00 committed by GitHub
commit f3937b2971
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio/MusicManager.cpp
View File

@ -51,6 +51,12 @@ cMusicManager::PlayerInCar()
if(State == PED_DRAG_FROM_CAR || State == PED_EXIT_CAR || State == PED_ARRESTED)
return false;
if (!FindPlayerVehicle())
return true;
if (FindPlayerVehicle()->m_status == STATUS_WRECKED)
return false;
switch(FindPlayerVehicle()->m_modelIndex) {
case MI_FIRETRUCK:
case MI_AMBULAN:

3
src/core/Frontend.cpp
View File

@ -5470,7 +5470,8 @@ CMenuManager::ConstructStatLine(int rowIdx)
if (player.m_nTotalPackages != 0)
packagesPercent = player.m_nCollectedPackages * 100.0f / player.m_nTotalPackages;
STAT_LINE("PERPIC", &packagesPercent, 0, &(nTemp = 100));
int nPackagesPercent = packagesPercent;
STAT_LINE("PERPIC", &nPackagesPercent, 0, &(nTemp = 100));
STAT_LINE("NOUNIF", &CStats::TotalNumberOfUniqueJumps, 0, &CStats::NumberOfUniqueJumpsFound);
STAT_LINE("DAYSPS", &CStats::DaysPassed, false, nil);
if (CGame::nastyGame) {