summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-02 20:31:41 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-02 20:31:41 +0200
commitb095bc1b5a48f9923afada88a7f117e757716d00 (patch)
treecbe6caaa24a49fa6ba27e3361a12cf967de866a4 /src
parentMerge remote-tracking branch 'upstream/master' (diff)
parentFix number of unique jumps in stat menu (diff)
downloadre3-b095bc1b5a48f9923afada88a7f117e757716d00.tar
re3-b095bc1b5a48f9923afada88a7f117e757716d00.tar.gz
re3-b095bc1b5a48f9923afada88a7f117e757716d00.tar.bz2
re3-b095bc1b5a48f9923afada88a7f117e757716d00.tar.lz
re3-b095bc1b5a48f9923afada88a7f117e757716d00.tar.xz
re3-b095bc1b5a48f9923afada88a7f117e757716d00.tar.zst
re3-b095bc1b5a48f9923afada88a7f117e757716d00.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio/AudioManager.cpp60
-rw-r--r--src/core/Frontend.cpp8
-rw-r--r--src/core/config.h2
3 files changed, 28 insertions, 42 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index e3cfdc8e..28ddfeee 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -8865,8 +8865,8 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
CAutomobile *automobile;
cTransmission *transmission;
int32 emittingVol;
- float newSkidVal = 0.f;
- float skidVal = 0.f;
+ float newSkidVal = 0.0f;
+ float skidVal = 0.0f;
if (params->m_fDistance >= 1600.f)
return;
@@ -8875,47 +8875,36 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
return;
CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
for (int32 i = 0; i < ARRAY_SIZE(automobile->m_aWheelState); i++) {
- if (!automobile->m_aWheelState[i] || automobile->Damage.GetWheelStatus(i) == WHEEL_STATUS_MISSING)
+ if (automobile->m_aWheelState[i] == WHEEL_STATE_NORMAL || automobile->Damage.GetWheelStatus(i) == WHEEL_STATUS_MISSING)
continue;
transmission = params->m_pTransmission;
- if (transmission->nDriveType == '4') {
+ switch (transmission->nDriveType)
+ {
+ case '4':
newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
- if (newSkidVal > skidVal)
- skidVal = newSkidVal;
- continue;
- }
- if (transmission->nDriveType != 'F') {
- if (transmission->nDriveType != 'R') {
- if (newSkidVal > skidVal)
- skidVal = newSkidVal;
- continue;
- }
- if (i != 1 && i != 3) {
+ break;
+ case 'F':
+ if (i == CARWHEEL_FRONT_LEFT || i == CARWHEEL_FRONT_RIGHT)
+ newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
+ else
newSkidVal = GetVehicleNonDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
- if (newSkidVal > skidVal)
- skidVal = newSkidVal;
- continue;
- }
- newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
- if (newSkidVal > skidVal)
- skidVal = newSkidVal;
- continue;
- }
- if (i == 0 || i == 2) {
- newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
- if (newSkidVal > skidVal)
- skidVal = newSkidVal;
- continue;
+ break;
+ case 'R':
+ if (i == CARWHEEL_REAR_LEFT || i == CARWHEEL_REAR_RIGHT)
+ newSkidVal = GetVehicleDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
+ else
+ newSkidVal = GetVehicleNonDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
+ break;
+ default:
+ break;
}
- newSkidVal = GetVehicleNonDriveWheelSkidValue(i, automobile, transmission, params->m_fVelocityChange);
- if (newSkidVal > skidVal)
- skidVal = newSkidVal;
+ skidVal = Max(skidVal, newSkidVal);
}
if (skidVal > 0.0f) {
emittingVol = 50.f * skidVal;
m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, 40.f, m_sQueueSample.m_fDistance);
- if (m_sQueueSample.m_nVolume) {
+ if (m_sQueueSample.m_nVolume != 0) {
m_sQueueSample.m_nCounter = 3;
switch (params->m_pVehicle->m_nSurfaceTouched) {
case SURFACE_GRASS:
@@ -9242,10 +9231,7 @@ cAudioManager::Service()
void
cAudioManager::ServiceSoundEffects()
{
- if (m_FrameCounter++ % 5)
- m_bFifthFrameFlag = false;
- else
- m_bFifthFrameFlag = true;
+ m_bFifthFrameFlag = (m_FrameCounter++ % 5) == 0;
if (m_nUserPause && !m_nPreviousUserPause) {
for (int32 i = 0; i < allChannels; i++)
SampleManager.StopChannel(i);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index e078fe22..fc845a4c 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -5617,9 +5617,9 @@ CMenuManager::ConstructStatLine(int rowIdx)
STAT_LINE("PER_COM", &percentCompleted, false, nil);
STAT_LINE("NMISON", &CStats::MissionsGiven, false, nil);
- STAT_LINE("FEST_MP", &CStats::MissionsPassed, 0, &CStats::TotalNumberMissions);
+ STAT_LINE("FEST_MP", &CStats::MissionsPassed, false, &CStats::TotalNumberMissions);
if (CGame::nastyGame) {
- STAT_LINE("FEST_RP", &CStats::NumberKillFrenziesPassed, 0, &CStats::TotalNumberKillFrenzies);
+ STAT_LINE("FEST_RP", &CStats::NumberKillFrenziesPassed, false, &CStats::TotalNumberKillFrenzies);
}
CPlayerInfo &player = CWorld::Players[CWorld::PlayerInFocus];
@@ -5628,8 +5628,8 @@ CMenuManager::ConstructStatLine(int rowIdx)
packagesPercent = player.m_nCollectedPackages * 100.0f / player.m_nTotalPackages;
int nPackagesPercent = packagesPercent;
- STAT_LINE("PERPIC", &nPackagesPercent, 0, &(nTemp = 100));
- STAT_LINE("NOUNIF", &CStats::TotalNumberOfUniqueJumps, 0, &CStats::NumberOfUniqueJumpsFound);
+ STAT_LINE("PERPIC", &nPackagesPercent, false, &(nTemp = 100));
+ STAT_LINE("NOUNIF", &CStats::NumberOfUniqueJumpsFound, false, &CStats::TotalNumberOfUniqueJumps);
STAT_LINE("DAYSPS", &CStats::DaysPassed, false, nil);
if (CGame::nastyGame) {
STAT_LINE("PE_WAST", &CStats::PeopleKilledByPlayer, false, nil);
diff --git a/src/core/config.h b/src/core/config.h
index 0d57f55d..9a8144e7 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -241,7 +241,7 @@ enum Config {
#define CAMERA_PICKUP
// Peds
-#define PED_SKIN // support for skinned geometry on peds
+//#define PED_SKIN // support for skinned geometry on peds
#define ANIMATE_PED_COL_MODEL
#define VC_PED_PORTS // various ports from VC's CPed, mostly subtle
// #define NEW_WALK_AROUND_ALGORITHM // to make walking around vehicles/objects less awkward