Merge pull request #467 from Nick007J/master

bug fixes
GTAmodding · Apr 18, 2020 · f3937b29719ed882f0037b2d1fc57c5736e92352 · f3937b2
2 parents d6314f9 + 8968884
commit f3937b29719ed882f0037b2d1fc57c5736e92352
Unified Split

Showing with 8 additions and 1 deletion.

+6 −0 src/audio/MusicManager.cpp

+2 −1 src/core/Frontend.cpp
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
@@ -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:

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
@@ -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) {