Fixes for Serge's review
This commit is contained in:
parent
7c425ac4ac
commit
8f01eab5ab
@ -183,8 +183,8 @@ RpAnimBlendClumpGetMainAssociation(RpClump *clump, CAnimBlendAssociation **assoc
|
|||||||
|
|
||||||
CAnimBlendAssociation *mainAssoc = nil;
|
CAnimBlendAssociation *mainAssoc = nil;
|
||||||
CAnimBlendAssociation *secondAssoc = nil;
|
CAnimBlendAssociation *secondAssoc = nil;
|
||||||
float mainBlend = 0.0;
|
float mainBlend = 0.0f;
|
||||||
float secondBlend = 0.0;
|
float secondBlend = 0.0f;
|
||||||
for(CAnimBlendLink *link = clumpData->link.next; link; link = link->next){
|
for(CAnimBlendLink *link = clumpData->link.next; link; link = link->next){
|
||||||
CAnimBlendAssociation *assoc = CAnimBlendAssociation::FromLink(link);
|
CAnimBlendAssociation *assoc = CAnimBlendAssociation::FromLink(link);
|
||||||
|
|
||||||
@ -215,7 +215,7 @@ RpAnimBlendClumpGetMainPartialAssociation(RpClump *clump)
|
|||||||
if(clumpData == nil) return nil;
|
if(clumpData == nil) return nil;
|
||||||
|
|
||||||
CAnimBlendAssociation *mainAssoc = nil;
|
CAnimBlendAssociation *mainAssoc = nil;
|
||||||
float mainBlend = 0.0;
|
float mainBlend = 0.0f;
|
||||||
for(CAnimBlendLink *link = clumpData->link.next; link; link = link->next){
|
for(CAnimBlendLink *link = clumpData->link.next; link; link = link->next){
|
||||||
CAnimBlendAssociation *assoc = CAnimBlendAssociation::FromLink(link);
|
CAnimBlendAssociation *assoc = CAnimBlendAssociation::FromLink(link);
|
||||||
|
|
||||||
|
@ -2394,7 +2394,7 @@ cAudioManager::GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automo
|
|||||||
if(automobile->m_aWheelState[wheel] == 2) {
|
if(automobile->m_aWheelState[wheel] == 2) {
|
||||||
relativeVelChange = min(1.0f, Abs(velocityChange) / transmission->fMaxVelocity);
|
relativeVelChange = min(1.0f, Abs(velocityChange) / transmission->fMaxVelocity);
|
||||||
} else {
|
} else {
|
||||||
relativeVelChange = 0.0;
|
relativeVelChange = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
return max(relativeVelChange, min(1.0f, Abs(automobile->m_vecTurnSpeed.z) * 20.0f));
|
return max(relativeVelChange, min(1.0f, Abs(automobile->m_vecTurnSpeed.z) * 20.0f));
|
||||||
@ -2505,7 +2505,7 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
|
|||||||
if(entity.m_bIsUsed) {
|
if(entity.m_bIsUsed) {
|
||||||
if(sound < SOUND_TOTAL_SOUNDS) {
|
if(sound < SOUND_TOTAL_SOUNDS) {
|
||||||
if(entity.m_nType == AUDIOTYPE_SCRIPTOBJECT) {
|
if(entity.m_nType == AUDIOTYPE_SCRIPTOBJECT) {
|
||||||
if(m_nScriptObjectEntityTotal < 40) {
|
if(m_nScriptObjectEntityTotal < ARRAY_SIZE(m_anScriptObjectEntityIndices)) {
|
||||||
entity.m_awAudioEvent[0] = sound;
|
entity.m_awAudioEvent[0] = sound;
|
||||||
entity.m_AudioEvents = 1;
|
entity.m_AudioEvents = 1;
|
||||||
m_anScriptObjectEntityIndices[m_nScriptObjectEntityTotal++] =
|
m_anScriptObjectEntityIndices[m_nScriptObjectEntityTotal++] =
|
||||||
@ -2515,7 +2515,7 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
|
|||||||
int32 i = 0;
|
int32 i = 0;
|
||||||
while(true) {
|
while(true) {
|
||||||
if(i >= entity.m_AudioEvents) {
|
if(i >= entity.m_AudioEvents) {
|
||||||
if(entity.m_AudioEvents < 4) {
|
if(entity.m_AudioEvents < ARRAY_SIZE(entity.m_awAudioEvent)) {
|
||||||
entity.m_awAudioEvent[i] = sound;
|
entity.m_awAudioEvent[i] = sound;
|
||||||
entity.m_afVolume[i] = vol;
|
entity.m_afVolume[i] = vol;
|
||||||
++entity.m_AudioEvents;
|
++entity.m_AudioEvents;
|
||||||
@ -2535,7 +2535,7 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
|
|||||||
}
|
}
|
||||||
entity.m_awAudioEvent[i] = sound;
|
entity.m_awAudioEvent[i] = sound;
|
||||||
entity.m_afVolume[i] = vol;
|
entity.m_afVolume[i] = vol;
|
||||||
if(entity.m_AudioEvents < 4) ++entity.m_AudioEvents;
|
if(entity.m_AudioEvents < ARRAY_SIZE(entity.m_awAudioEvent)) ++entity.m_AudioEvents;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3199,8 +3199,8 @@ cAudioManager::ProcessCesna(cVehicleParams *params)
|
|||||||
if(m_sQueueSample.m_bVolume) {
|
if(m_sQueueSample.m_bVolume) {
|
||||||
m_sQueueSample.m_counter = 52;
|
m_sQueueSample.m_counter = 52;
|
||||||
m_sQueueSample.m_nSampleIndex = SFX_CESNA_IDLE;
|
m_sQueueSample.m_nSampleIndex = SFX_CESNA_IDLE;
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
m_sQueueSample.m_bIsDistant = false;
|
||||||
m_sQueueSample.field_16 = 0;
|
m_sQueueSample.field_16 = 0;
|
||||||
m_sQueueSample.m_nFrequency = 12500;
|
m_sQueueSample.m_nFrequency = 12500;
|
||||||
m_sQueueSample.m_nLoopCount = 0;
|
m_sQueueSample.m_nLoopCount = 0;
|
||||||
@ -3209,11 +3209,11 @@ cAudioManager::ProcessCesna(cVehicleParams *params)
|
|||||||
m_sQueueSample.m_nLoopStart =
|
m_sQueueSample.m_nLoopStart =
|
||||||
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 8.0;
|
m_sQueueSample.field_48 = 8.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 200.0f;
|
m_sQueueSample.m_fSoundIntensity = 200.0f;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 0;
|
m_sQueueSample.m_bRequireReflection = false;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
}
|
}
|
||||||
if(params->m_fDistance < 8100.f) {
|
if(params->m_fDistance < 8100.f) {
|
||||||
@ -3221,8 +3221,8 @@ cAudioManager::ProcessCesna(cVehicleParams *params)
|
|||||||
if(m_sQueueSample.m_bVolume) {
|
if(m_sQueueSample.m_bVolume) {
|
||||||
m_sQueueSample.m_counter = 2;
|
m_sQueueSample.m_counter = 2;
|
||||||
m_sQueueSample.m_nSampleIndex = SFX_CESNA_REV;
|
m_sQueueSample.m_nSampleIndex = SFX_CESNA_REV;
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
m_sQueueSample.m_bIsDistant = false;
|
||||||
m_sQueueSample.field_16 = 0;
|
m_sQueueSample.field_16 = 0;
|
||||||
m_sQueueSample.m_nFrequency = 25000;
|
m_sQueueSample.m_nFrequency = 25000;
|
||||||
m_sQueueSample.m_nLoopCount = 0;
|
m_sQueueSample.m_nLoopCount = 0;
|
||||||
@ -3232,11 +3232,11 @@ cAudioManager::ProcessCesna(cVehicleParams *params)
|
|||||||
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd =
|
m_sQueueSample.m_nLoopEnd =
|
||||||
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 8.0;
|
m_sQueueSample.field_48 = 8.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 90.0f;
|
m_sQueueSample.m_fSoundIntensity = 90.0f;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 0;
|
m_sQueueSample.m_bRequireReflection = false;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3313,8 +3313,8 @@ cAudioManager::ProcessCrane()
|
|||||||
if(m_sQueueSample.m_bVolume) {
|
if(m_sQueueSample.m_bVolume) {
|
||||||
m_sQueueSample.m_counter = 0;
|
m_sQueueSample.m_counter = 0;
|
||||||
m_sQueueSample.m_nSampleIndex = SFX_CRANE_MAGNET;
|
m_sQueueSample.m_nSampleIndex = SFX_CRANE_MAGNET;
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
m_sQueueSample.m_bIsDistant = false;
|
||||||
m_sQueueSample.field_16 = 2;
|
m_sQueueSample.field_16 = 2;
|
||||||
m_sQueueSample.m_nFrequency = 6000;
|
m_sQueueSample.m_nFrequency = 6000;
|
||||||
m_sQueueSample.m_nLoopCount = 0;
|
m_sQueueSample.m_nLoopCount = 0;
|
||||||
@ -3327,8 +3327,8 @@ cAudioManager::ProcessCrane()
|
|||||||
m_sQueueSample.m_fSoundIntensity = 80.0f;
|
m_sQueueSample.m_fSoundIntensity = 80.0f;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.field_76 = 3;
|
m_sQueueSample.field_76 = 3;
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 0;
|
m_sQueueSample.m_bRequireReflection = false;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
}
|
}
|
||||||
if(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents) {
|
if(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents) {
|
||||||
@ -3338,7 +3338,7 @@ cAudioManager::ProcessCrane()
|
|||||||
SampleManager.GetSampleBaseFrequency(SFX_COL_CAR_2);
|
SampleManager.GetSampleBaseFrequency(SFX_COL_CAR_2);
|
||||||
m_sQueueSample.m_nLoopCount = 1;
|
m_sQueueSample.m_nLoopCount = 1;
|
||||||
m_sQueueSample.field_56 = 1;
|
m_sQueueSample.field_56 = 1;
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 1;
|
m_sQueueSample.m_bRequireReflection = 1;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
}
|
}
|
||||||
@ -3680,7 +3680,7 @@ void cAudioManager::ProcessFires(int32)
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
maxDist = 2500.f;
|
maxDist = 2500.f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 50.0;
|
m_sQueueSample.m_fSoundIntensity = 50.0f;
|
||||||
m_sQueueSample.m_nSampleIndex = SFX_CAR_ON_FIRE;
|
m_sQueueSample.m_nSampleIndex = SFX_CAR_ON_FIRE;
|
||||||
m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CAR_ON_FIRE);
|
m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CAR_ON_FIRE);
|
||||||
m_sQueueSample.m_nFrequency += i * ((uint32)m_sQueueSample.m_nFrequency >> 6);
|
m_sQueueSample.m_nFrequency += i * ((uint32)m_sQueueSample.m_nFrequency >> 6);
|
||||||
@ -3695,10 +3695,10 @@ void cAudioManager::ProcessFires(int32)
|
|||||||
m_sQueueSample.m_fDistance);
|
m_sQueueSample.m_fDistance);
|
||||||
if(m_sQueueSample.m_bVolume) {
|
if(m_sQueueSample.m_bVolume) {
|
||||||
m_sQueueSample.m_counter = i;
|
m_sQueueSample.m_counter = i;
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.field_48 = 2.0;
|
m_sQueueSample.field_48 = 2.0f;
|
||||||
m_sQueueSample.field_76 = 10;
|
m_sQueueSample.field_76 = 10;
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
m_sQueueSample.m_bIsDistant = false;
|
||||||
m_sQueueSample.m_nLoopCount = 0;
|
m_sQueueSample.m_nLoopCount = 0;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.m_bEmittingVolume = emittingVol;
|
m_sQueueSample.m_bEmittingVolume = emittingVol;
|
||||||
@ -3706,8 +3706,8 @@ void cAudioManager::ProcessFires(int32)
|
|||||||
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd =
|
m_sQueueSample.m_nLoopEnd =
|
||||||
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 0;
|
m_sQueueSample.m_bRequireReflection = false;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3886,6 +3886,50 @@ cAudioManager::ProcessGarages()
|
|||||||
|
|
||||||
static uint8 iSound = 32;
|
static uint8 iSound = 32;
|
||||||
|
|
||||||
|
#define LOOP_HELPER \
|
||||||
|
for(j = 0; j < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents; ++j) { \
|
||||||
|
switch(m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[j]) { \
|
||||||
|
case SOUND_GARAGE_DOOR_CLOSED: \
|
||||||
|
case SOUND_GARAGE_DOOR_OPENED: \
|
||||||
|
if(distSquared < 6400.f) { \
|
||||||
|
CalculateDistance(distCalculated, distSquared); \
|
||||||
|
m_sQueueSample.m_bVolume = ComputeVolume(60, 80.f, m_sQueueSample.m_fDistance); \
|
||||||
|
if(m_sQueueSample.m_bVolume) { \
|
||||||
|
if(CGarages::Garages[i].m_eGarageType == GARAGE_CRUSHER) { \
|
||||||
|
m_sQueueSample.m_nSampleIndex = SFX_COL_CAR_PANEL_2; \
|
||||||
|
m_sQueueSample.m_nFrequency = 6735; \
|
||||||
|
} else if(m_asAudioEntities[m_sQueueSample.m_nEntityIndex] \
|
||||||
|
.m_awAudioEvent[j] == 69) { \
|
||||||
|
m_sQueueSample.m_nSampleIndex = SFX_COL_CAR_PANEL_2; \
|
||||||
|
m_sQueueSample.m_nFrequency = 22000; \
|
||||||
|
} else { \
|
||||||
|
m_sQueueSample.m_nSampleIndex = SFX_COL_GARAGE_DOOR_1; \
|
||||||
|
m_sQueueSample.m_nFrequency = 18000; \
|
||||||
|
} \
|
||||||
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN; \
|
||||||
|
m_sQueueSample.field_16 = 4; \
|
||||||
|
m_sQueueSample.m_bEmittingVolume = 60; \
|
||||||
|
m_sQueueSample.field_48 = 0.0f; \
|
||||||
|
m_sQueueSample.m_fSoundIntensity = 80.0f; \
|
||||||
|
m_sQueueSample.field_16 = 4; \
|
||||||
|
m_sQueueSample.m_bReverbFlag = true; \
|
||||||
|
/*m_sQueueSample.m_bReverbFlag = true;*/ \
|
||||||
|
m_sQueueSample.m_bIsDistant = false; \
|
||||||
|
m_sQueueSample.field_56 = 1; \
|
||||||
|
m_sQueueSample.m_nLoopCount = 1; \
|
||||||
|
m_sQueueSample.m_nLoopStart = 0; \
|
||||||
|
m_sQueueSample.m_nLoopEnd = -1; \
|
||||||
|
m_sQueueSample.m_counter = iSound++; \
|
||||||
|
if(iSound < 32) iSound = 32; \
|
||||||
|
m_sQueueSample.m_bRequireReflection = 1; \
|
||||||
|
AddSampleToRequestedQueue(); \
|
||||||
|
} \
|
||||||
|
} \
|
||||||
|
break; \
|
||||||
|
default: continue; \
|
||||||
|
} \
|
||||||
|
}
|
||||||
|
|
||||||
for(uint32 i = 0; i < CGarages::NumGarages; ++i) {
|
for(uint32 i = 0; i < CGarages::NumGarages; ++i) {
|
||||||
if(CGarages::Garages[i].m_eGarageType == GARAGE_NONE) continue;
|
if(CGarages::Garages[i].m_eGarageType == GARAGE_NONE) continue;
|
||||||
entity = CGarages::Garages[i].m_pDoor1;
|
entity = CGarages::Garages[i].m_pDoor1;
|
||||||
@ -3902,104 +3946,14 @@ cAudioManager::ProcessGarages()
|
|||||||
if(CGarages::Garages[i].m_eGarageType == GARAGE_CRUSHER) {
|
if(CGarages::Garages[i].m_eGarageType == GARAGE_CRUSHER) {
|
||||||
if(CGarages::Garages[i].m_eGarageState == GS_AFTERDROPOFF) {
|
if(CGarages::Garages[i].m_eGarageState == GS_AFTERDROPOFF) {
|
||||||
if(!(m_FrameCounter & 1)) {
|
if(!(m_FrameCounter & 1)) {
|
||||||
for(j = 0;
|
LOOP_HELPER
|
||||||
j < m_asAudioEntities[m_sQueueSample.m_nEntityIndex]
|
|
||||||
.m_AudioEvents;
|
|
||||||
++j) {
|
|
||||||
switch(m_asAudioEntities[m_sQueueSample
|
|
||||||
.m_nEntityIndex]
|
|
||||||
.m_awAudioEvent[j]) {
|
|
||||||
case SOUND_GARAGE_DOOR_CLOSED:
|
|
||||||
case SOUND_GARAGE_DOOR_OPENED:
|
|
||||||
if(distSquared < 6400.f) {
|
|
||||||
CalculateDistance(
|
|
||||||
distCalculated,
|
|
||||||
distSquared);
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bVolume = ComputeVolume(
|
|
||||||
60, 80.f,
|
|
||||||
m_sQueueSample.m_fDistance);
|
|
||||||
if(m_sQueueSample.m_bVolume) {
|
|
||||||
if(CGarages::Garages[i]
|
|
||||||
.m_eGarageType ==
|
|
||||||
GARAGE_CRUSHER) {
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nSampleIndex =
|
|
||||||
SFX_COL_CAR_PANEL_2;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nFrequency =
|
|
||||||
6735;
|
|
||||||
} else if(
|
|
||||||
m_asAudioEntities
|
|
||||||
[m_sQueueSample
|
|
||||||
.m_nEntityIndex]
|
|
||||||
.m_awAudioEvent
|
|
||||||
[j] ==
|
|
||||||
69) {
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nSampleIndex =
|
|
||||||
SFX_COL_CAR_PANEL_2;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nFrequency =
|
|
||||||
22000;
|
|
||||||
} else {
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nSampleIndex =
|
|
||||||
SFX_COL_GARAGE_DOOR_1;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nFrequency =
|
|
||||||
18000;
|
|
||||||
}
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bBankIndex = 0;
|
|
||||||
m_sQueueSample
|
|
||||||
.field_16 = 4;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bEmittingVolume =
|
|
||||||
60;
|
|
||||||
m_sQueueSample
|
|
||||||
.field_48 = 0.0;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_fSoundIntensity =
|
|
||||||
80.0f;
|
|
||||||
m_sQueueSample
|
|
||||||
.field_16 = 4;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bReverbFlag = 1;
|
|
||||||
//m_sQueueSample
|
|
||||||
// .m_bReverbFlag = 1;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bIsDistant = 0;
|
|
||||||
m_sQueueSample
|
|
||||||
.field_56 = 1;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nLoopCount = 1;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nLoopStart = 0;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nLoopEnd = -1;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_counter =
|
|
||||||
iSound++;
|
|
||||||
if(iSound < 32)
|
|
||||||
iSound = 32;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bRequireReflection =
|
|
||||||
1;
|
|
||||||
AddSampleToRequestedQueue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default: continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(m_anRandomTable[1] & 1) {
|
if(m_anRandomTable[1] & 1) {
|
||||||
sampleIndex = m_anRandomTable[2] % 5u + SFX_COL_CAR_1;
|
sampleIndex = m_anRandomTable[2] % 5 + SFX_COL_CAR_1;
|
||||||
} else {
|
} else {
|
||||||
sampleIndex =
|
sampleIndex =
|
||||||
m_anRandomTable[2] % 6u + SFX_COL_CAR_PANEL_1;
|
m_anRandomTable[2] % 6 + SFX_COL_CAR_PANEL_1;
|
||||||
}
|
}
|
||||||
m_sQueueSample.m_nSampleIndex = sampleIndex;
|
m_sQueueSample.m_nSampleIndex = sampleIndex;
|
||||||
m_sQueueSample.m_nFrequency =
|
m_sQueueSample.m_nFrequency =
|
||||||
@ -4012,8 +3966,8 @@ cAudioManager::ProcessGarages()
|
|||||||
m_sQueueSample.field_56 = 1;
|
m_sQueueSample.field_56 = 1;
|
||||||
m_sQueueSample.m_counter = iSound++;
|
m_sQueueSample.m_counter = iSound++;
|
||||||
if(iSound < 32u) iSound = 32;
|
if(iSound < 32u) iSound = 32;
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
m_sQueueSample.m_bIsDistant = false;
|
||||||
m_sQueueSample.field_16 = 3;
|
m_sQueueSample.field_16 = 3;
|
||||||
m_sQueueSample.m_bEmittingVolume = 90;
|
m_sQueueSample.m_bEmittingVolume = 90;
|
||||||
m_sQueueSample.m_nLoopStart =
|
m_sQueueSample.m_nLoopStart =
|
||||||
@ -4022,84 +3976,12 @@ cAudioManager::ProcessGarages()
|
|||||||
m_sQueueSample.m_nLoopEnd =
|
m_sQueueSample.m_nLoopEnd =
|
||||||
SampleManager.GetSampleLoopEndOffset(
|
SampleManager.GetSampleLoopEndOffset(
|
||||||
m_sQueueSample.m_nSampleIndex);
|
m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 2.0;
|
m_sQueueSample.field_48 = 2.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 80.0f;
|
m_sQueueSample.m_fSoundIntensity = 80.0f;
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 0;
|
m_sQueueSample.m_bRequireReflection = false;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
for(j = 0; j < m_asAudioEntities[m_sQueueSample.m_nEntityIndex]
|
LOOP_HELPER
|
||||||
.m_AudioEvents;
|
|
||||||
++j) {
|
|
||||||
switch(m_asAudioEntities[m_sQueueSample.m_nEntityIndex]
|
|
||||||
.m_awAudioEvent[j]) {
|
|
||||||
case SOUND_GARAGE_DOOR_CLOSED:
|
|
||||||
case SOUND_GARAGE_DOOR_OPENED:
|
|
||||||
if(distSquared < 6400.f) {
|
|
||||||
CalculateDistance(distCalculated,
|
|
||||||
distSquared);
|
|
||||||
m_sQueueSample.m_bVolume =
|
|
||||||
ComputeVolume(
|
|
||||||
60, 80.f,
|
|
||||||
m_sQueueSample.m_fDistance);
|
|
||||||
if(m_sQueueSample.m_bVolume) {
|
|
||||||
if(CGarages::Garages[i]
|
|
||||||
.m_eGarageType ==
|
|
||||||
GARAGE_CRUSHER) {
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nSampleIndex =
|
|
||||||
SFX_COL_CAR_PANEL_2;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nFrequency =
|
|
||||||
6735;
|
|
||||||
} else if(
|
|
||||||
m_asAudioEntities
|
|
||||||
[m_sQueueSample
|
|
||||||
.m_nEntityIndex]
|
|
||||||
.m_awAudioEvent
|
|
||||||
[j] == 69) {
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nSampleIndex =
|
|
||||||
SFX_COL_CAR_PANEL_2;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nFrequency =
|
|
||||||
22000;
|
|
||||||
} else {
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nSampleIndex =
|
|
||||||
SFX_COL_GARAGE_DOOR_1;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_nFrequency =
|
|
||||||
18000;
|
|
||||||
}
|
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
|
||||||
m_sQueueSample.field_16 = 4;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bEmittingVolume = 60;
|
|
||||||
m_sQueueSample.field_48 = 0.0;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_fSoundIntensity = 80.0f;
|
|
||||||
m_sQueueSample.field_16 = 4;
|
|
||||||
m_sQueueSample.m_bReverbFlag =
|
|
||||||
1;
|
|
||||||
//m_sQueueSample.m_bReverbFlag =
|
|
||||||
// 1;
|
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
|
||||||
m_sQueueSample.field_56 = 1;
|
|
||||||
m_sQueueSample.m_nLoopCount = 1;
|
|
||||||
m_sQueueSample.m_nLoopStart = 0;
|
|
||||||
m_sQueueSample.m_nLoopEnd = -1;
|
|
||||||
m_sQueueSample.m_counter =
|
|
||||||
iSound++;
|
|
||||||
if(iSound < 32) iSound = 32;
|
|
||||||
m_sQueueSample
|
|
||||||
.m_bRequireReflection = 1;
|
|
||||||
AddSampleToRequestedQueue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default: continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
|
m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
|
||||||
@ -4112,73 +3994,25 @@ cAudioManager::ProcessGarages()
|
|||||||
m_sQueueSample.m_nLoopCount = 0;
|
m_sQueueSample.m_nLoopCount = 0;
|
||||||
m_sQueueSample.field_76 = 3;
|
m_sQueueSample.field_76 = 3;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
m_sQueueSample.m_bIsDistant = false;
|
||||||
m_sQueueSample.field_16 = 3;
|
m_sQueueSample.field_16 = 3;
|
||||||
m_sQueueSample.m_bEmittingVolume = 90;
|
m_sQueueSample.m_bEmittingVolume = 90;
|
||||||
m_sQueueSample.m_nLoopStart =
|
m_sQueueSample.m_nLoopStart =
|
||||||
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd =
|
m_sQueueSample.m_nLoopEnd =
|
||||||
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 2.0;
|
m_sQueueSample.field_48 = 2.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 80.0f;
|
m_sQueueSample.m_fSoundIntensity = 80.0f;
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 0;
|
m_sQueueSample.m_bRequireReflection = false;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
for(j = 0; j < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents;
|
LOOP_HELPER
|
||||||
++j) {
|
|
||||||
switch(m_asAudioEntities[m_sQueueSample.m_nEntityIndex]
|
|
||||||
.m_awAudioEvent[j]) {
|
|
||||||
case SOUND_GARAGE_DOOR_CLOSED:
|
|
||||||
case SOUND_GARAGE_DOOR_OPENED:
|
|
||||||
if(distSquared < 6400.f) {
|
|
||||||
CalculateDistance(distCalculated, distSquared);
|
|
||||||
m_sQueueSample.m_bVolume =
|
|
||||||
ComputeVolume(60, 80.f, m_sQueueSample.m_fDistance);
|
|
||||||
if(m_sQueueSample.m_bVolume) {
|
|
||||||
if(CGarages::Garages[i].m_eGarageType ==
|
|
||||||
GARAGE_CRUSHER) {
|
|
||||||
m_sQueueSample.m_nSampleIndex =
|
|
||||||
SFX_COL_CAR_PANEL_2;
|
|
||||||
m_sQueueSample.m_nFrequency = 6735;
|
|
||||||
} else if(m_asAudioEntities[m_sQueueSample
|
|
||||||
.m_nEntityIndex]
|
|
||||||
.m_awAudioEvent[j] == 69) {
|
|
||||||
m_sQueueSample.m_nSampleIndex =
|
|
||||||
SFX_COL_CAR_PANEL_2;
|
|
||||||
m_sQueueSample.m_nFrequency = 22000;
|
|
||||||
} else {
|
|
||||||
m_sQueueSample.m_nSampleIndex =
|
|
||||||
SFX_COL_GARAGE_DOOR_1;
|
|
||||||
m_sQueueSample.m_nFrequency = 18000;
|
|
||||||
}
|
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
|
||||||
m_sQueueSample.field_16 = 4;
|
|
||||||
m_sQueueSample.m_bEmittingVolume = 60;
|
|
||||||
m_sQueueSample.field_48 = 0.0;
|
|
||||||
m_sQueueSample.m_fSoundIntensity = 80.0f;
|
|
||||||
m_sQueueSample.field_16 = 4;
|
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
|
||||||
//m_sQueueSample.m_bReverbFlag = 1;
|
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
|
||||||
m_sQueueSample.field_56 = 1;
|
|
||||||
m_sQueueSample.m_nLoopCount = 1;
|
|
||||||
m_sQueueSample.m_nLoopStart = 0;
|
|
||||||
m_sQueueSample.m_nLoopEnd = -1;
|
|
||||||
m_sQueueSample.m_counter = iSound++;
|
|
||||||
if(iSound < 32) iSound = 32;
|
|
||||||
m_sQueueSample.m_bRequireReflection = 1;
|
|
||||||
AddSampleToRequestedQueue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default: continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#undef LOOP_HELPER
|
||||||
}
|
}
|
||||||
|
|
||||||
struct tHelicopterSampleData {
|
struct tHelicopterSampleData {
|
||||||
@ -5120,7 +4954,7 @@ cAudioManager::ProcessMissionAudio()
|
|||||||
static uint8 nFramesForPretendPlaying = 0;
|
static uint8 nFramesForPretendPlaying = 0;
|
||||||
|
|
||||||
if(m_bIsInitialised) {
|
if(m_bIsInitialised) {
|
||||||
if(m_sMissionAudio.m_nSampleIndex != 3033) {
|
if(m_sMissionAudio.m_nSampleIndex != NO_SAMPLE) {
|
||||||
switch(m_sMissionAudio.m_bLoadingStatus) {
|
switch(m_sMissionAudio.m_bLoadingStatus) {
|
||||||
case 0:
|
case 0:
|
||||||
SampleManager.PreloadStreamedFile(m_sMissionAudio.m_nSampleIndex, 1);
|
SampleManager.PreloadStreamedFile(m_sMissionAudio.m_nSampleIndex, 1);
|
||||||
@ -5141,7 +4975,7 @@ cAudioManager::ProcessMissionAudio()
|
|||||||
m_sMissionAudio.m_bPlayStatus = 1;
|
m_sMissionAudio.m_bPlayStatus = 1;
|
||||||
} else {
|
} else {
|
||||||
m_sMissionAudio.m_bPlayStatus = 2;
|
m_sMissionAudio.m_bPlayStatus = 2;
|
||||||
m_sMissionAudio.m_nSampleIndex = 3033;
|
m_sMissionAudio.m_nSampleIndex = NO_SAMPLE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -5161,7 +4995,7 @@ cAudioManager::ProcessMissionAudio()
|
|||||||
2 ||
|
2 ||
|
||||||
m_sMissionAudio.field_24-- == 0) {
|
m_sMissionAudio.field_24-- == 0) {
|
||||||
m_sMissionAudio.m_bPlayStatus = 2;
|
m_sMissionAudio.m_bPlayStatus = 2;
|
||||||
m_sMissionAudio.m_nSampleIndex = 3033;
|
m_sMissionAudio.m_nSampleIndex = NO_SAMPLE;
|
||||||
SampleManager.StopStreamedFile(1);
|
SampleManager.StopStreamedFile(1);
|
||||||
m_sMissionAudio.field_24 = 0;
|
m_sMissionAudio.field_24 = 0;
|
||||||
}
|
}
|
||||||
@ -5175,7 +5009,7 @@ cAudioManager::ProcessMissionAudio()
|
|||||||
SampleManager.PauseStream(0, 1);
|
SampleManager.PauseStream(0, 1);
|
||||||
} else {
|
} else {
|
||||||
m_sMissionAudio.m_bPlayStatus = 2;
|
m_sMissionAudio.m_bPlayStatus = 2;
|
||||||
m_sMissionAudio.m_nSampleIndex = 3033;
|
m_sMissionAudio.m_nSampleIndex = NO_SAMPLE;
|
||||||
SampleManager.StopStreamedFile(1);
|
SampleManager.StopStreamedFile(1);
|
||||||
m_sMissionAudio.field_24 = 0;
|
m_sMissionAudio.field_24 = 0;
|
||||||
}
|
}
|
||||||
@ -6978,7 +6812,7 @@ cAudioManager::ProcessProjectiles()
|
|||||||
case WEAPONTYPE_ROCKETLAUNCHER:
|
case WEAPONTYPE_ROCKETLAUNCHER:
|
||||||
emittingVol = maxVolume;
|
emittingVol = maxVolume;
|
||||||
maxDist = 8100.f;
|
maxDist = 8100.f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 90.0;
|
m_sQueueSample.m_fSoundIntensity = 90.0f;
|
||||||
m_sQueueSample.m_nSampleIndex = 81;
|
m_sQueueSample.m_nSampleIndex = 81;
|
||||||
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_nFrequency =
|
m_sQueueSample.m_nFrequency =
|
||||||
@ -6988,7 +6822,7 @@ cAudioManager::ProcessProjectiles()
|
|||||||
case WEAPONTYPE_MOLOTOV:
|
case WEAPONTYPE_MOLOTOV:
|
||||||
emittingVol = 50;
|
emittingVol = 50;
|
||||||
maxDist = 900.f;
|
maxDist = 900.f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 30.0;
|
m_sQueueSample.m_fSoundIntensity = 30.0f;
|
||||||
m_sQueueSample.m_nSampleIndex = SFX_PED_ON_FIRE;
|
m_sQueueSample.m_nSampleIndex = SFX_PED_ON_FIRE;
|
||||||
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_nFrequency =
|
m_sQueueSample.m_nFrequency =
|
||||||
@ -6997,7 +6831,7 @@ cAudioManager::ProcessProjectiles()
|
|||||||
break;
|
break;
|
||||||
default: return;
|
default: return;
|
||||||
}
|
}
|
||||||
m_sQueueSample.field_48 = 4.0;
|
m_sQueueSample.field_48 = 4.0f;
|
||||||
m_sQueueSample.field_76 = 3;
|
m_sQueueSample.field_76 = 3;
|
||||||
m_sQueueSample.m_vecPos = CProjectileInfo::ms_apProjectile[i]->GetPosition();
|
m_sQueueSample.m_vecPos = CProjectileInfo::ms_apProjectile[i]->GetPosition();
|
||||||
float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
|
float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos);
|
||||||
@ -7373,7 +7207,7 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
|
|||||||
params.m_pVehicle = veh;
|
params.m_pVehicle = veh;
|
||||||
params.m_pTransmission = nil;
|
params.m_pTransmission = nil;
|
||||||
params.m_nIndex = 0;
|
params.m_nIndex = 0;
|
||||||
params.m_fVelocityChange = 0.0;
|
params.m_fVelocityChange = 0.0f;
|
||||||
|
|
||||||
if(handling) params.m_pTransmission = &handling->Transmission;
|
if(handling) params.m_pTransmission = &handling->Transmission;
|
||||||
|
|
||||||
@ -7534,8 +7368,8 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
|
|||||||
m_sQueueSample.m_nSampleIndex);
|
m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd =
|
m_sQueueSample.m_nLoopEnd =
|
||||||
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 5.0;
|
m_sQueueSample.field_48 = 5.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 40.0;
|
m_sQueueSample.m_fSoundIntensity = 40.0f;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.field_76 = 3;
|
m_sQueueSample.field_76 = 3;
|
||||||
m_sQueueSample.m_bReverbFlag = true;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
@ -7547,7 +7381,7 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
|
|||||||
if(automobile->m_nCarHornTimer > 44) automobile->m_nCarHornTimer = 44;
|
if(automobile->m_nCarHornTimer > 44) automobile->m_nCarHornTimer = 44;
|
||||||
if(automobile->m_nCarHornTimer == 44)
|
if(automobile->m_nCarHornTimer == 44)
|
||||||
automobile->field_22D =
|
automobile->field_22D =
|
||||||
(LOBYTE(m_FrameCounter) + LOBYTE(m_sQueueSample.m_nEntityIndex)) & 7;
|
(uint8(m_FrameCounter) + uint8(m_sQueueSample.m_nEntityIndex)) & 7;
|
||||||
if(hornPatternsArray[automobile->field_22D][44 - automobile->m_nCarHornTimer]) {
|
if(hornPatternsArray[automobile->field_22D][44 - automobile->m_nCarHornTimer]) {
|
||||||
CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
|
CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
|
||||||
m_sQueueSample.m_bVolume = ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
|
m_sQueueSample.m_bVolume = ComputeVolume(80, 40.f, m_sQueueSample.m_fDistance);
|
||||||
@ -7566,8 +7400,8 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams *params)
|
|||||||
m_sQueueSample.m_nSampleIndex);
|
m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd =
|
m_sQueueSample.m_nLoopEnd =
|
||||||
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 5.0;
|
m_sQueueSample.field_48 = 5.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 40.0;
|
m_sQueueSample.m_fSoundIntensity = 40.0f;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.field_76 = 3;
|
m_sQueueSample.field_76 = 3;
|
||||||
m_sQueueSample.m_bReverbFlag = true;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
@ -7812,8 +7646,8 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params)
|
|||||||
m_sQueueSample.m_nLoopStart =
|
m_sQueueSample.m_nLoopStart =
|
||||||
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 3.0;
|
m_sQueueSample.field_48 = 3.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 40.0;
|
m_sQueueSample.m_fSoundIntensity = 40.0f;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.field_76 = 3;
|
m_sQueueSample.field_76 = 3;
|
||||||
m_sQueueSample.m_bReverbFlag = true;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
@ -8225,27 +8059,27 @@ cAudioManager::SetSpeakerConfig(int32 conf) const
|
|||||||
bool
|
bool
|
||||||
cAudioManager::SetupJumboEngineSound(uint8 vol, int32 freq)
|
cAudioManager::SetupJumboEngineSound(uint8 vol, int32 freq)
|
||||||
{
|
{
|
||||||
if(m_sQueueSample.m_fDistance >= 180.f) return 0;
|
if(m_sQueueSample.m_fDistance >= 180.f) return false;
|
||||||
|
|
||||||
uint8 emittingVol = vol - gJumboVolOffsetPercentage / 100;
|
uint8 emittingVol = vol - gJumboVolOffsetPercentage / 100;
|
||||||
m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 180.f, m_sQueueSample.m_fDistance);
|
m_sQueueSample.m_bVolume = ComputeVolume(emittingVol, 180.f, m_sQueueSample.m_fDistance);
|
||||||
if(m_sQueueSample.m_bVolume) {
|
if(m_sQueueSample.m_bVolume) {
|
||||||
m_sQueueSample.m_counter = 3;
|
m_sQueueSample.m_counter = 3;
|
||||||
m_sQueueSample.m_nSampleIndex = SFX_JUMBO_ENGINE;
|
m_sQueueSample.m_nSampleIndex = SFX_JUMBO_ENGINE;
|
||||||
m_sQueueSample.m_bBankIndex = 0;
|
m_sQueueSample.m_bBankIndex = SAMPLEBANK_MAIN;
|
||||||
m_sQueueSample.m_bIsDistant = 0;
|
m_sQueueSample.m_bIsDistant = false;
|
||||||
m_sQueueSample.field_16 = 1;
|
m_sQueueSample.field_16 = 1;
|
||||||
m_sQueueSample.m_nFrequency = freq;
|
m_sQueueSample.m_nFrequency = freq;
|
||||||
m_sQueueSample.m_nLoopCount = 0;
|
m_sQueueSample.m_nLoopCount = 0;
|
||||||
m_sQueueSample.m_bEmittingVolume = emittingVol;
|
m_sQueueSample.m_bEmittingVolume = emittingVol;
|
||||||
m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
|
||||||
m_sQueueSample.field_48 = 4.0;
|
m_sQueueSample.field_48 = 4.0f;
|
||||||
m_sQueueSample.m_fSoundIntensity = 180.0f;
|
m_sQueueSample.m_fSoundIntensity = 180.0f;
|
||||||
m_sQueueSample.field_56 = 0;
|
m_sQueueSample.field_56 = 0;
|
||||||
m_sQueueSample.field_76 = 4;
|
m_sQueueSample.field_76 = 4;
|
||||||
m_sQueueSample.m_bReverbFlag = 1;
|
m_sQueueSample.m_bReverbFlag = true;
|
||||||
m_sQueueSample.m_bRequireReflection = 0;
|
m_sQueueSample.m_bRequireReflection = false;
|
||||||
AddSampleToRequestedQueue();
|
AddSampleToRequestedQueue();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -24,7 +24,7 @@ uint32& CBridge::TimeOfBridgeBecomingOperational = *(uint32*)0x8F2BC0;
|
|||||||
void CBridge::Init()
|
void CBridge::Init()
|
||||||
{
|
{
|
||||||
FindBridgeEntities();
|
FindBridgeEntities();
|
||||||
OldLift = -1.0;
|
OldLift = -1.0f;
|
||||||
if (pLiftPart && pWeight)
|
if (pLiftPart && pWeight)
|
||||||
{
|
{
|
||||||
DefaultZLiftPart = pLiftPart->GetPosition().z;
|
DefaultZLiftPart = pLiftPart->GetPosition().z;
|
||||||
@ -60,32 +60,32 @@ void CBridge::Update()
|
|||||||
if (timeElapsed < 10000)
|
if (timeElapsed < 10000)
|
||||||
{
|
{
|
||||||
State = STATE_LIFT_PART_MOVING_DOWN;
|
State = STATE_LIFT_PART_MOVING_DOWN;
|
||||||
liftHeight = 25.0 - timeElapsed / 10000.0 * 25.0;
|
liftHeight = 25.0 - timeElapsed / 10000.0 * 25.0f;
|
||||||
}
|
}
|
||||||
else if (timeElapsed < 40000)
|
else if (timeElapsed < 40000)
|
||||||
{
|
{
|
||||||
liftHeight = 0.0;
|
liftHeight = 0.0f;
|
||||||
State = STATE_LIFT_PART_IS_DOWN;
|
State = STATE_LIFT_PART_IS_DOWN;
|
||||||
}
|
}
|
||||||
else if (timeElapsed < 50000)
|
else if (timeElapsed < 50000)
|
||||||
{
|
{
|
||||||
liftHeight = 0.0;
|
liftHeight = 0.0f;
|
||||||
State = STATE_LIFT_PART_ABOUT_TO_MOVE_UP;
|
State = STATE_LIFT_PART_ABOUT_TO_MOVE_UP;
|
||||||
}
|
}
|
||||||
else if (timeElapsed < 60000)
|
else if (timeElapsed < 60000)
|
||||||
{
|
{
|
||||||
State = STATE_LIFT_PART_MOVING_UP;
|
State = STATE_LIFT_PART_MOVING_UP;
|
||||||
liftHeight = (timeElapsed - 50000) / 10000.0 * 25.0;
|
liftHeight = (timeElapsed - 50000) / 10000.0 * 25.0f;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
liftHeight = 25.0;
|
liftHeight = 25.0f;
|
||||||
State = STATE_LIFT_PART_IS_UP;
|
State = STATE_LIFT_PART_IS_UP;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
liftHeight = 25.0;
|
liftHeight = 25.0f;
|
||||||
TimeOfBridgeBecomingOperational = 0;
|
TimeOfBridgeBecomingOperational = 0;
|
||||||
State = STATE_BRIDGE_LOCKED;
|
State = STATE_BRIDGE_LOCKED;
|
||||||
}
|
}
|
||||||
|
@ -991,7 +991,7 @@ float
|
|||||||
CPathFind::FindNodeOrientationForCarPlacement(int32 nodeId)
|
CPathFind::FindNodeOrientationForCarPlacement(int32 nodeId)
|
||||||
{
|
{
|
||||||
if(m_pathNodes[nodeId].numLinks == 0)
|
if(m_pathNodes[nodeId].numLinks == 0)
|
||||||
return 0.0;
|
return 0.0f;
|
||||||
CVector dir = m_pathNodes[m_connections[m_pathNodes[nodeId].firstLink]].pos - m_pathNodes[nodeId].pos;
|
CVector dir = m_pathNodes[m_connections[m_pathNodes[nodeId].firstLink]].pos - m_pathNodes[nodeId].pos;
|
||||||
dir.z = 0.0f;
|
dir.z = 0.0f;
|
||||||
dir.Normalise();
|
dir.Normalise();
|
||||||
@ -1008,7 +1008,7 @@ CPathFind::FindNodeOrientationForCarPlacementFacingDestination(int32 nodeId, flo
|
|||||||
CVector dir;
|
CVector dir;
|
||||||
|
|
||||||
if(m_pathNodes[nodeId].numLinks == 0)
|
if(m_pathNodes[nodeId].numLinks == 0)
|
||||||
return 0.0;
|
return 0.0f;
|
||||||
|
|
||||||
int bestNode = m_connections[m_pathNodes[nodeId].firstLink];
|
int bestNode = m_connections[m_pathNodes[nodeId].firstLink];
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
|
@ -704,7 +704,7 @@ CPickups::DoPickUpEffects(CEntity *entity)
|
|||||||
aWeaponReds[colorId] * colorModifier, aWeaponGreens[colorId] * colorModifier, aWeaponBlues[colorId] * colorModifier,
|
aWeaponReds[colorId] * colorModifier, aWeaponGreens[colorId] * colorModifier, aWeaponBlues[colorId] * colorModifier,
|
||||||
4.0f, 1.0f, 40.0f, false, 0.0f);
|
4.0f, 1.0f, 40.0f, false, 0.0f);
|
||||||
|
|
||||||
float radius = (double)(rand() & 0xF) * 0.1 + 3.0;
|
float radius = (double)(rand() & 0xF) * 0.1 + 3.0f;
|
||||||
CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f), radius, aWeaponReds[colorId] * modifiedSin / 256.0f, aWeaponGreens[colorId] * modifiedSin / 256.0f, aWeaponBlues[colorId] * modifiedSin / 256.0f, CPointLights::FOG_NONE, true);
|
CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f), radius, aWeaponReds[colorId] * modifiedSin / 256.0f, aWeaponGreens[colorId] * modifiedSin / 256.0f, aWeaponBlues[colorId] * modifiedSin / 256.0f, CPointLights::FOG_NONE, true);
|
||||||
float size = (double)(rand() & 0xF) * 0.0005 + 0.6;
|
float size = (double)(rand() & 0xF) * 0.0005 + 0.6;
|
||||||
CCoronas::RegisterCorona( (uintptr)entity,
|
CCoronas::RegisterCorona( (uintptr)entity,
|
||||||
|
@ -174,7 +174,7 @@ void CMissionCleanup::Process()
|
|||||||
{
|
{
|
||||||
CPopulation::m_AllRandomPedsThisType = -1;
|
CPopulation::m_AllRandomPedsThisType = -1;
|
||||||
CPopulation::PedDensityMultiplier = 1.0f;
|
CPopulation::PedDensityMultiplier = 1.0f;
|
||||||
CCarCtrl::CarDensityMultiplier = 1.0;
|
CCarCtrl::CarDensityMultiplier = 1.0f;
|
||||||
FindPlayerPed()->m_pWanted->m_fCrimeSensitivity = 1.0f;
|
FindPlayerPed()->m_pWanted->m_fCrimeSensitivity = 1.0f;
|
||||||
TheCamera.Restore();
|
TheCamera.Restore();
|
||||||
TheCamera.SetWideScreenOff();
|
TheCamera.SetWideScreenOff();
|
||||||
|
@ -416,17 +416,17 @@ CCam::Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, fl
|
|||||||
// BUG? is this ever used?
|
// BUG? is this ever used?
|
||||||
// The values seem to be roughly m_fPedZoomValueSmooth + 1.85
|
// The values seem to be roughly m_fPedZoomValueSmooth + 1.85
|
||||||
if(ResetStatics){
|
if(ResetStatics){
|
||||||
if(TheCamera.PedZoomIndicator == 1.0) m_fRealGroundDist = 2.090556f;
|
if(TheCamera.PedZoomIndicator == 1.0f) m_fRealGroundDist = 2.090556f;
|
||||||
if(TheCamera.PedZoomIndicator == 2.0) m_fRealGroundDist = 3.34973f;
|
if(TheCamera.PedZoomIndicator == 2.0f) m_fRealGroundDist = 3.34973f;
|
||||||
if(TheCamera.PedZoomIndicator == 3.0) m_fRealGroundDist = 4.704914f;
|
if(TheCamera.PedZoomIndicator == 3.0f) m_fRealGroundDist = 4.704914f;
|
||||||
if(TheCamera.PedZoomIndicator == 4.0) m_fRealGroundDist = 2.090556f;
|
if(TheCamera.PedZoomIndicator == 4.0f) m_fRealGroundDist = 2.090556f;
|
||||||
}
|
}
|
||||||
// And what is this? It's only used for collision and rotation it seems
|
// And what is this? It's only used for collision and rotation it seems
|
||||||
float RealGroundDist;
|
float RealGroundDist;
|
||||||
if(TheCamera.PedZoomIndicator == 1.0) RealGroundDist = 2.090556f;
|
if(TheCamera.PedZoomIndicator == 1.0f) RealGroundDist = 2.090556f;
|
||||||
if(TheCamera.PedZoomIndicator == 2.0) RealGroundDist = 3.34973f;
|
if(TheCamera.PedZoomIndicator == 2.0f) RealGroundDist = 3.34973f;
|
||||||
if(TheCamera.PedZoomIndicator == 3.0) RealGroundDist = 4.704914f;
|
if(TheCamera.PedZoomIndicator == 3.0f) RealGroundDist = 4.704914f;
|
||||||
if(TheCamera.PedZoomIndicator == 4.0) RealGroundDist = 2.090556f;
|
if(TheCamera.PedZoomIndicator == 4.0f) RealGroundDist = 2.090556f;
|
||||||
if(m_fCloseInPedHeightOffset > 0.00001f)
|
if(m_fCloseInPedHeightOffset > 0.00001f)
|
||||||
RealGroundDist = 1.7016;
|
RealGroundDist = 1.7016;
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ void CTimer::Update(void)
|
|||||||
{
|
{
|
||||||
m_snTimeInMilliseconds = m_snTimeInMilliseconds + upd;
|
m_snTimeInMilliseconds = m_snTimeInMilliseconds + upd;
|
||||||
m_snTimeInMillisecondsNonClipped = m_snTimeInMillisecondsNonClipped + upd;
|
m_snTimeInMillisecondsNonClipped = m_snTimeInMillisecondsNonClipped + upd;
|
||||||
ms_fTimeStep = updInCyclesScaled / (double)_nCyclesPerMS / 20.0;
|
ms_fTimeStep = updInCyclesScaled / (double)_nCyclesPerMS / 20.0f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#define _USE_MATH_DEFINES
|
#define _USE_MATH_DEFINES
|
||||||
#pragma warning(disable: 4244) // int to float
|
#pragma warning(disable: 4244) // int to float
|
||||||
#pragma warning(disable: 4800) // int to bool
|
#pragma warning(disable: 4800) // int to bool
|
||||||
#pragma warning(disable: 4305) // double to float
|
|
||||||
#pragma warning(disable: 4838) // narrowing conversion
|
#pragma warning(disable: 4838) // narrowing conversion
|
||||||
#pragma warning(disable: 4996) // POSIX names
|
#pragma warning(disable: 4996) // POSIX names
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ Idle(void *arg)
|
|||||||
RenderEffects();
|
RenderEffects();
|
||||||
|
|
||||||
if((TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL) &&
|
if((TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL) &&
|
||||||
TheCamera.m_ScreenReductionPercentage > 0.0)
|
TheCamera.m_ScreenReductionPercentage > 0.0f)
|
||||||
TheCamera.SetMotionBlurAlpha(150);
|
TheCamera.SetMotionBlurAlpha(150);
|
||||||
TheCamera.RenderMotionBlur();
|
TheCamera.RenderMotionBlur();
|
||||||
|
|
||||||
|
@ -1831,7 +1831,7 @@ CPhysical::ProcessCollision(void)
|
|||||||
|
|
||||||
if(IsPed() && (distSq >= sq(0.2f) || ped->IsPlayer())){
|
if(IsPed() && (distSq >= sq(0.2f) || ped->IsPlayer())){
|
||||||
if(ped->IsPlayer())
|
if(ped->IsPlayer())
|
||||||
n = max(NUMSTEPS(0.2f), 2.0);
|
n = max(NUMSTEPS(0.2f), 2.0f);
|
||||||
else
|
else
|
||||||
n = NUMSTEPS(0.3f);
|
n = NUMSTEPS(0.3f);
|
||||||
step = savedTimeStep / n;
|
step = savedTimeStep / n;
|
||||||
|
@ -90,7 +90,7 @@ CObjectData::SetObjectData(int32 modelId, CObject &object)
|
|||||||
object.m_nCollisionDamageEffect = objinfo->m_nCollisionDamageEffect;
|
object.m_nCollisionDamageEffect = objinfo->m_nCollisionDamageEffect;
|
||||||
object.m_nSpecialCollisionResponseCases = objinfo->m_nSpecialCollisionResponseCases;
|
object.m_nSpecialCollisionResponseCases = objinfo->m_nSpecialCollisionResponseCases;
|
||||||
object.m_bCameraToAvoidThisObject = objinfo->m_bCameraToAvoidThisObject;
|
object.m_bCameraToAvoidThisObject = objinfo->m_bCameraToAvoidThisObject;
|
||||||
if(object.m_fMass >= 99998.0){
|
if(object.m_fMass >= 99998.0f){
|
||||||
object.bInfiniteMass = true;
|
object.bInfiniteMass = true;
|
||||||
object.bAffectedByGravity = false;
|
object.bAffectedByGravity = false;
|
||||||
object.bExplosionProof = true;
|
object.bExplosionProof = true;
|
||||||
|
@ -7642,21 +7642,21 @@ CPed::Flee(void)
|
|||||||
else if (PI + angleToFleeEntity < angleToFleeDamagingThing)
|
else if (PI + angleToFleeEntity < angleToFleeDamagingThing)
|
||||||
angleToFleeDamagingThing -= TWOPI;
|
angleToFleeDamagingThing -= TWOPI;
|
||||||
|
|
||||||
if (damagingThingPriorityMult <= 1.0) {
|
if (damagingThingPriorityMult <= 1.0f) {
|
||||||
// Range [0.0, 1.0]
|
// Range [0.0, 1.0]
|
||||||
|
|
||||||
double angleToFleeBoth = (angleToFleeDamagingThing + angleToFleeEntity) * 0.5;
|
float angleToFleeBoth = (angleToFleeDamagingThing + angleToFleeEntity) * 0.5f;
|
||||||
|
|
||||||
if (m_fRotationDest - PI > angleToFleeBoth)
|
if (m_fRotationDest - PI > angleToFleeBoth)
|
||||||
angleToFleeBoth += TWOPI;
|
angleToFleeBoth += TWOPI;
|
||||||
else if (PI + m_fRotationDest < angleToFleeBoth)
|
else if (PI + m_fRotationDest < angleToFleeBoth)
|
||||||
angleToFleeBoth -= TWOPI;
|
angleToFleeBoth -= TWOPI;
|
||||||
|
|
||||||
m_fRotationDest = (1.0 - damagingThingPriorityMult) * m_fRotationDest + damagingThingPriorityMult * angleToFleeBoth;
|
m_fRotationDest = (1.0f - damagingThingPriorityMult) * m_fRotationDest + damagingThingPriorityMult * angleToFleeBoth;
|
||||||
} else {
|
} else {
|
||||||
// Range (1.0, 1.5]
|
// Range (1.0, 1.5]
|
||||||
|
|
||||||
double adjustedMult = (damagingThingPriorityMult - 1.0) * 2.0;
|
double adjustedMult = (damagingThingPriorityMult - 1.0f) * 2.0f;
|
||||||
m_fRotationDest = angleToFleeEntity * (1.0 - adjustedMult) + adjustedMult * angleToFleeDamagingThing;
|
m_fRotationDest = angleToFleeEntity * (1.0 - adjustedMult) + adjustedMult * angleToFleeDamagingThing;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -457,7 +457,7 @@ CCoronas::RenderReflections(void)
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Don't draw if reflection is too high
|
// Don't draw if reflection is too high
|
||||||
if(aCoronas[i].heightAboveRoad < 20.0){
|
if(aCoronas[i].heightAboveRoad < 20.0f){
|
||||||
// don't draw if camera is below road
|
// don't draw if camera is below road
|
||||||
if(CCoronas::aCoronas[i].coors.z - aCoronas[i].heightAboveRoad > TheCamera.GetPosition().z)
|
if(CCoronas::aCoronas[i].coors.z - aCoronas[i].heightAboveRoad > TheCamera.GetPosition().z)
|
||||||
continue;
|
continue;
|
||||||
|
@ -84,7 +84,7 @@ CFont::Initialise(void)
|
|||||||
Sprite[2].SetTexture("font1", "font1_mask");
|
Sprite[2].SetTexture("font1", "font1_mask");
|
||||||
SetScale(1.0f, 1.0f);
|
SetScale(1.0f, 1.0f);
|
||||||
SetSlantRefPoint(SCREEN_WIDTH, 0.0f);
|
SetSlantRefPoint(SCREEN_WIDTH, 0.0f);
|
||||||
SetSlant(0.0);
|
SetSlant(0.0f);
|
||||||
SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0));
|
SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0));
|
||||||
SetJustifyOff();
|
SetJustifyOff();
|
||||||
SetCentreOff();
|
SetCentreOff();
|
||||||
@ -95,7 +95,7 @@ CFont::Initialise(void)
|
|||||||
SetBackGroundOnlyTextOff();
|
SetBackGroundOnlyTextOff();
|
||||||
SetPropOn();
|
SetPropOn();
|
||||||
SetFontStyle(0);
|
SetFontStyle(0);
|
||||||
SetRightJustifyWrap(0.0);
|
SetRightJustifyWrap(0.0f);
|
||||||
SetAlphaFade(255.0f);
|
SetAlphaFade(255.0f);
|
||||||
SetDropShadowPosition(0);
|
SetDropShadowPosition(0);
|
||||||
CTxdStore::PopCurrentTxd();
|
CTxdStore::PopCurrentTxd();
|
||||||
|
@ -619,7 +619,7 @@ void CHud::Draw()
|
|||||||
CFont::SetPropOff();
|
CFont::SetPropOff();
|
||||||
CFont::SetFontStyle(FONT_HEADING);
|
CFont::SetFontStyle(FONT_HEADING);
|
||||||
CFont::SetRightJustifyOn();
|
CFont::SetRightJustifyOn();
|
||||||
CFont::SetRightJustifyWrap(0.0);
|
CFont::SetRightJustifyWrap(0.0f);
|
||||||
|
|
||||||
sprintf(sTemp, "%02d:%02d", CClock::GetHours(), CClock::GetMinutes());
|
sprintf(sTemp, "%02d:%02d", CClock::GetHours(), CClock::GetMinutes());
|
||||||
AsciiToUnicode(sTemp, sPrint);
|
AsciiToUnicode(sTemp, sPrint);
|
||||||
@ -773,7 +773,7 @@ void CHud::Draw()
|
|||||||
fStep = 2.0f;
|
fStep = 2.0f;
|
||||||
PagerXOffset += fStep * CTimer::GetTimeStep();
|
PagerXOffset += fStep * CTimer::GetTimeStep();
|
||||||
if (PagerXOffset > 150.0f) {
|
if (PagerXOffset > 150.0f) {
|
||||||
PagerXOffset = 150.0;
|
PagerXOffset = 150.0f;
|
||||||
PagerOn = 0;
|
PagerOn = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -934,13 +934,13 @@ void CHud::Draw()
|
|||||||
BigMessageInUse[0] += CTimer::GetTimeStep();
|
BigMessageInUse[0] += CTimer::GetTimeStep();
|
||||||
|
|
||||||
if (BigMessageInUse[0] >= 120.0f) {
|
if (BigMessageInUse[0] >= 120.0f) {
|
||||||
BigMessageInUse[0] = 120.0;
|
BigMessageInUse[0] = 120.0f;
|
||||||
BigMessageAlpha[0] -= (CTimer::GetTimeStepInMilliseconds() * 0.3f);
|
BigMessageAlpha[0] -= (CTimer::GetTimeStepInMilliseconds() * 0.3f);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (BigMessageAlpha[0] <= 0.0f) {
|
if (BigMessageAlpha[0] <= 0.0f) {
|
||||||
m_BigMessage[0][0] = 0;
|
m_BigMessage[0][0] = 0;
|
||||||
BigMessageAlpha[0] = 0.0;
|
BigMessageAlpha[0] = 0.0f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -977,7 +977,7 @@ void CHud::Draw()
|
|||||||
BigMessageAlpha[2] += (CTimer::GetTimeStepInSeconds() * 255.0f);
|
BigMessageAlpha[2] += (CTimer::GetTimeStepInSeconds() * 255.0f);
|
||||||
|
|
||||||
if (BigMessageAlpha[2] > 255.0f)
|
if (BigMessageAlpha[2] > 255.0f)
|
||||||
BigMessageAlpha[2] = 255.0;
|
BigMessageAlpha[2] = 255.0f;
|
||||||
|
|
||||||
CFont::SetBackgroundOff();
|
CFont::SetBackgroundOff();
|
||||||
|
|
||||||
@ -997,12 +997,12 @@ void CHud::Draw()
|
|||||||
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(82.0f), m_BigMessage[2]);
|
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(82.0f), m_BigMessage[2]);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
BigMessageAlpha[2] = 0.0;
|
BigMessageAlpha[2] = 0.0f;
|
||||||
BigMessageInUse[2] = 1.0;
|
BigMessageInUse[2] = 1.0f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
BigMessageInUse[2] = 0.0;
|
BigMessageInUse[2] = 0.0f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1231,12 +1231,12 @@ void CHud::DrawAfterFade()
|
|||||||
BigMessageInUse[1] += CTimer::GetTimeStep();
|
BigMessageInUse[1] += CTimer::GetTimeStep();
|
||||||
|
|
||||||
if (BigMessageInUse[1] >= 120.0f) {
|
if (BigMessageInUse[1] >= 120.0f) {
|
||||||
BigMessageInUse[1] = 120.0;
|
BigMessageInUse[1] = 120.0f;
|
||||||
BigMessageAlpha[1] -= (CTimer::GetTimeStepInMilliseconds() * 0.3f);
|
BigMessageAlpha[1] -= (CTimer::GetTimeStepInMilliseconds() * 0.3f);
|
||||||
}
|
}
|
||||||
if (BigMessageAlpha[1] <= 0) {
|
if (BigMessageAlpha[1] <= 0) {
|
||||||
m_BigMessage[1][0] = 0;
|
m_BigMessage[1][0] = 0;
|
||||||
BigMessageAlpha[1] = 0.0;
|
BigMessageAlpha[1] = 0.0f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -584,7 +584,7 @@ void _psPrintCpuInfo()
|
|||||||
RwBool
|
RwBool
|
||||||
psInitialise(void)
|
psInitialise(void)
|
||||||
{
|
{
|
||||||
PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0;
|
PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
|
||||||
|
|
||||||
RsGlobal.ps = &PsGlobal;
|
RsGlobal.ps = &PsGlobal;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user