mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-24 02:20:01 +00:00
Merge remote-tracking branch 'upstream/miami' into miami
This commit is contained in:
commit
4c582b19eb
|
@ -14,7 +14,7 @@ such that we have a working game at all times.
|
||||||
|
|
||||||
## How can I try it?
|
## How can I try it?
|
||||||
|
|
||||||
- re3 requires game assets to work, so you **must** own a copy of GTA III.
|
- re3 requires game assets to work, so you **must** own [a copy of GTA III](https://store.steampowered.com/app/12100/Grand_Theft_Auto_III/).
|
||||||
- Build re3 or download it from one of the above links (Debug or Release).
|
- Build re3 or download it from one of the above links (Debug or Release).
|
||||||
- (Optional) If you want to use optional features like Russian language or menu map, copy the files in /gamefiles folder to your game root folder.
|
- (Optional) If you want to use optional features like Russian language or menu map, copy the files in /gamefiles folder to your game root folder.
|
||||||
- Move re3.exe to GTA 3 directory and run it.
|
- Move re3.exe to GTA 3 directory and run it.
|
||||||
|
|
|
@ -47,6 +47,8 @@ function getarch(a)
|
||||||
return 'amd64'
|
return 'amd64'
|
||||||
elseif a == 'ARM' then
|
elseif a == 'ARM' then
|
||||||
return 'arm'
|
return 'arm'
|
||||||
|
elseif a == 'ARM64' then
|
||||||
|
return 'arm64'
|
||||||
end
|
end
|
||||||
return a
|
return a
|
||||||
end
|
end
|
||||||
|
@ -75,6 +77,7 @@ workspace "reVC"
|
||||||
"linux-x86-librw_gl3_glfw-oal",
|
"linux-x86-librw_gl3_glfw-oal",
|
||||||
"linux-amd64-librw_gl3_glfw-oal",
|
"linux-amd64-librw_gl3_glfw-oal",
|
||||||
"linux-arm-librw_gl3_glfw-oal",
|
"linux-arm-librw_gl3_glfw-oal",
|
||||||
|
"linux-arm64-librw_gl3_glfw-oal",
|
||||||
}
|
}
|
||||||
|
|
||||||
filter { "system:bsd" }
|
filter { "system:bsd" }
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -811,7 +811,11 @@ cAudioManager::ProcessActiveQueues()
|
||||||
if (sample.m_nFrequency != m_asActiveSamples[j].m_nFrequency) {
|
if (sample.m_nFrequency != m_asActiveSamples[j].m_nFrequency) {
|
||||||
int32 freq;
|
int32 freq;
|
||||||
if (sample.m_nFrequency <= m_asActiveSamples[j].m_nFrequency) {
|
if (sample.m_nFrequency <= m_asActiveSamples[j].m_nFrequency) {
|
||||||
freq = Max(sample.m_nFrequency, m_asActiveSamples[j].m_nFrequency - 6000);
|
#ifdef FIX_BUGS
|
||||||
|
freq = Max((int32)sample.m_nFrequency, (int32)m_asActiveSamples[j].m_nFrequency - 6000);
|
||||||
|
#else
|
||||||
|
freq = Max((int32)sample.m_nFrequency, int32(m_asActiveSamples[j].m_nFrequency - 6000));
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
freq = Min(sample.m_nFrequency, m_asActiveSamples[j].m_nFrequency + 6000);
|
freq = Min(sample.m_nFrequency, m_asActiveSamples[j].m_nFrequency + 6000);
|
||||||
}
|
}
|
||||||
|
|
|
@ -241,13 +241,13 @@ public:
|
||||||
// "Should" be in alphabetic order, except "getXTalkSfx"
|
// "Should" be in alphabetic order, except "getXTalkSfx"
|
||||||
void AddDetailsToRequestedOrderList(uint8 sample);
|
void AddDetailsToRequestedOrderList(uint8 sample);
|
||||||
void AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 bank,
|
void AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 bank,
|
||||||
uint8 counter, bool notLooping);
|
uint8 counter, bool notLooping); //done
|
||||||
void AddReflectionsToRequestedQueue();
|
void AddReflectionsToRequestedQueue();
|
||||||
void AddReleasingSounds();
|
void AddReleasingSounds();
|
||||||
void AddSampleToRequestedQueue();
|
void AddSampleToRequestedQueue();
|
||||||
void AgeCrimes();
|
void AgeCrimes();
|
||||||
|
|
||||||
void CalculateDistance(bool &condition, float dist);
|
void CalculateDistance(bool &condition, float dist); //done
|
||||||
bool CheckForAnAudioFileOnCD() const;
|
bool CheckForAnAudioFileOnCD() const;
|
||||||
void ClearActiveSamples();
|
void ClearActiveSamples();
|
||||||
void ClearMissionAudio(uint8 slot);
|
void ClearMissionAudio(uint8 slot);
|
||||||
|
@ -275,7 +275,7 @@ public:
|
||||||
float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // not used
|
float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // not used
|
||||||
float GetCollisionOneShotRatio(int32 a, float b) const;
|
float GetCollisionOneShotRatio(int32 a, float b) const;
|
||||||
float GetCollisionRatio(float a, float b, float c, float d) const;
|
float GetCollisionRatio(float a, float b, float c, float d) const;
|
||||||
float GetDistanceSquared(const CVector &v) const;
|
float GetDistanceSquared(const CVector &v) const; //done
|
||||||
int32 GetJumboTaxiFreq() const;
|
int32 GetJumboTaxiFreq() const;
|
||||||
uint8 GetMissionAudioLoadingStatus(uint8 slot) const;
|
uint8 GetMissionAudioLoadingStatus(uint8 slot) const;
|
||||||
int8 GetMissionScriptPoliceAudioPlayingStatus() const;
|
int8 GetMissionScriptPoliceAudioPlayingStatus() const;
|
||||||
|
@ -287,7 +287,7 @@ public:
|
||||||
float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
|
float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile,
|
||||||
cTransmission *transmission, float velocityChange);
|
cTransmission *transmission, float velocityChange);
|
||||||
|
|
||||||
bool HasAirBrakes(int32 model) const;
|
bool HasAirBrakes(int32 model) const; //done
|
||||||
|
|
||||||
void Initialise();
|
void Initialise();
|
||||||
void InitialisePoliceRadio();
|
void InitialisePoliceRadio();
|
||||||
|
@ -302,13 +302,13 @@ public:
|
||||||
void PlayLoadedMissionAudio(uint8 slot);
|
void PlayLoadedMissionAudio(uint8 slot);
|
||||||
void PlayOneShot(int32 index, int16 sound, float vol);
|
void PlayOneShot(int32 index, int16 sound, float vol);
|
||||||
void PlaySuspectLastSeen(float x, float y, float z);
|
void PlaySuspectLastSeen(float x, float y, float z);
|
||||||
void PlayerJustGotInCar() const;
|
void PlayerJustGotInCar() const; //done
|
||||||
void PlayerJustLeftCar() const;
|
void PlayerJustLeftCar() const; //done
|
||||||
void PostInitialiseGameSpecificSetup();
|
void PostInitialiseGameSpecificSetup();
|
||||||
void PostTerminateGameSpecificShutdown();
|
void PostTerminateGameSpecificShutdown(); //done
|
||||||
void PreInitialiseGameSpecificSetup() const;
|
void PreInitialiseGameSpecificSetup() const; //done
|
||||||
void PreloadMissionAudio(uint8 slot, Const char *name);
|
void PreloadMissionAudio(uint8 slot, Const char *name);
|
||||||
void PreTerminateGameSpecificShutdown();
|
void PreTerminateGameSpecificShutdown(); //done
|
||||||
/// processX - main logic of adding new sounds
|
/// processX - main logic of adding new sounds
|
||||||
void ProcessActiveQueues();
|
void ProcessActiveQueues();
|
||||||
bool ProcessAirBrakes(cVehicleParams *params);
|
bool ProcessAirBrakes(cVehicleParams *params);
|
||||||
|
@ -320,17 +320,18 @@ public:
|
||||||
void ProcessBridgeOneShots();
|
void ProcessBridgeOneShots();
|
||||||
void ProcessBridgeWarning();
|
void ProcessBridgeWarning();
|
||||||
#endif
|
#endif
|
||||||
bool ProcessCarBombTick(cVehicleParams *params);
|
bool ProcessCarBombTick(cVehicleParams *params); //done
|
||||||
void ProcessCesna(cVehicleParams *params);
|
void ProcessCesna(cVehicleParams *params);
|
||||||
//void ProcessCrane();
|
//void ProcessCrane();
|
||||||
bool ProcessEngineDamage(cVehicleParams *params);
|
bool ProcessEngineDamage(cVehicleParams *params); //done
|
||||||
void ProcessEntity(int32 sound);
|
void ProcessEntity(int32 sound); //done
|
||||||
void ProcessExplosions(int32 explosion);
|
void ProcessExplosions(int32 explosion);
|
||||||
void ProcessFireHydrant();
|
void ProcessFireHydrant();
|
||||||
void ProcessFires(int32 entity);
|
void ProcessFires(int32 entity);
|
||||||
void ProcessFrontEnd();
|
void ProcessFrontEnd();
|
||||||
void ProcessGarages();
|
void ProcessGarages();
|
||||||
bool ProcessHelicopter(cVehicleParams *params);
|
void ProcessCarHeli(cVehicleParams* params); //done
|
||||||
|
void ProcessVehicleFlatTyre(cVehicleParams* params); //done
|
||||||
void ProcessJumbo(cVehicleParams *);
|
void ProcessJumbo(cVehicleParams *);
|
||||||
void ProcessJumboAccel(CPlane *plane);
|
void ProcessJumboAccel(CPlane *plane);
|
||||||
void ProcessJumboDecel(CPlane *plane);
|
void ProcessJumboDecel(CPlane *plane);
|
||||||
|
@ -345,22 +346,22 @@ public:
|
||||||
void ProcessOneShotScriptObject(uint8 sound);
|
void ProcessOneShotScriptObject(uint8 sound);
|
||||||
void ProcessPed(CPhysical *ped);
|
void ProcessPed(CPhysical *ped);
|
||||||
void ProcessPedOneShots(cPedParams *params);
|
void ProcessPedOneShots(cPedParams *params);
|
||||||
void ProcessPhysical(int32 id);
|
void ProcessPhysical(int32 id); //done
|
||||||
void ProcessPlane(cVehicleParams *params);
|
void ProcessPlane(cVehicleParams *params); //done
|
||||||
void ProcessPlayersVehicleEngine(cVehicleParams *params, CVehicle* veh);
|
void ProcessPlayersVehicleEngine(cVehicleParams *params, CVehicle* veh); //done
|
||||||
void ProcessProjectiles();
|
void ProcessProjectiles();
|
||||||
void ProcessRainOnVehicle(cVehicleParams *params);
|
void ProcessRainOnVehicle(cVehicleParams *params);
|
||||||
void ProcessReverb() const;
|
void ProcessReverb() const;
|
||||||
bool ProcessReverseGear(cVehicleParams *params);
|
bool ProcessReverseGear(cVehicleParams *params); //done
|
||||||
void ProcessScriptObject(int32 id);
|
void ProcessScriptObject(int32 id); //done
|
||||||
void ProcessSpecial();
|
void ProcessSpecial();
|
||||||
#ifdef GTA_TRAIN
|
#ifdef GTA_TRAIN
|
||||||
bool ProcessTrainNoise(cVehicleParams *params);
|
bool ProcessTrainNoise(cVehicleParams *params);
|
||||||
#endif
|
#endif
|
||||||
void ProcessVehicle(CVehicle *vehicle);
|
void ProcessVehicle(CVehicle *vehicle); //done, but need add model functions
|
||||||
bool ProcessVehicleDoors(cVehicleParams *params);
|
bool ProcessVehicleDoors(cVehicleParams *params); //done
|
||||||
void ProcessVehicleEngine(cVehicleParams *params);
|
void ProcessVehicleEngine(cVehicleParams *params); //done
|
||||||
void UpdateGasPedalAudio(CVehicle* veh, int vehType);
|
void UpdateGasPedalAudio(CVehicle* veh, int vehType); //done
|
||||||
void ProcessVehicleHorn(cVehicleParams *params);
|
void ProcessVehicleHorn(cVehicleParams *params);
|
||||||
void ProcessVehicleOneShots(cVehicleParams *params);
|
void ProcessVehicleOneShots(cVehicleParams *params);
|
||||||
bool ProcessVehicleReverseWarning(cVehicleParams *params);
|
bool ProcessVehicleReverseWarning(cVehicleParams *params);
|
||||||
|
@ -368,8 +369,10 @@ public:
|
||||||
bool ProcessVehicleSirenOrAlarm(cVehicleParams *params);
|
bool ProcessVehicleSirenOrAlarm(cVehicleParams *params);
|
||||||
bool ProcessVehicleSkidding(cVehicleParams *params);
|
bool ProcessVehicleSkidding(cVehicleParams *params);
|
||||||
void ProcessWaterCannon(int32);
|
void ProcessWaterCannon(int32);
|
||||||
void ProcessWeather(int32 id);
|
void ProcessWeather(int32 id); //done
|
||||||
bool ProcessWetRoadNoise(cVehicleParams *params);
|
bool ProcessWetRoadNoise(cVehicleParams *params);
|
||||||
|
void ProcessEscalators(); //done
|
||||||
|
void ProcessExtraSounds(); //done
|
||||||
|
|
||||||
int32 RandomDisplacement(uint32 seed) const;
|
int32 RandomDisplacement(uint32 seed) const;
|
||||||
void ReacquireDigitalHandle() const;
|
void ReacquireDigitalHandle() const;
|
||||||
|
@ -402,11 +405,11 @@ public:
|
||||||
void SetUpLoopingCollisionSound(const cAudioCollision &col, uint8 counter);
|
void SetUpLoopingCollisionSound(const cAudioCollision &col, uint8 counter);
|
||||||
void SetUpOneShotCollisionSound(const cAudioCollision &col);
|
void SetUpOneShotCollisionSound(const cAudioCollision &col);
|
||||||
bool SetupCrimeReport();
|
bool SetupCrimeReport();
|
||||||
bool SetupJumboEngineSound(uint8 vol, int32 freq);
|
bool SetupJumboEngineSound(uint8 vol, uint32 freq);
|
||||||
bool SetupJumboFlySound(uint8 emittingVol);
|
bool SetupJumboFlySound(uint8 emittingVol);
|
||||||
bool SetupJumboRumbleSound(uint8 emittingVol);
|
bool SetupJumboRumbleSound(uint8 emittingVol);
|
||||||
bool SetupJumboTaxiSound(uint8 vol);
|
bool SetupJumboTaxiSound(uint8 vol);
|
||||||
bool SetupJumboWhineSound(uint8 emittingVol, int32 freq);
|
bool SetupJumboWhineSound(uint8 emittingVol, uint32 freq);
|
||||||
void SetupPedComments(cPedParams *params, uint32 sound);
|
void SetupPedComments(cPedParams *params, uint32 sound);
|
||||||
void SetupSuspectLastSeenReport();
|
void SetupSuspectLastSeenReport();
|
||||||
|
|
||||||
|
@ -414,11 +417,11 @@ public:
|
||||||
void TranslateEntity(Const CVector *v1, CVector *v2) const;
|
void TranslateEntity(Const CVector *v1, CVector *v2) const;
|
||||||
|
|
||||||
void UpdateReflections();
|
void UpdateReflections();
|
||||||
bool UsesReverseWarning(int32 model) const;
|
bool UsesReverseWarning(int32 model) const; //done
|
||||||
bool UsesSiren(int32 model) const;
|
bool UsesSiren(int32 model) const;
|
||||||
bool UsesSirenSwitching(int32 model) const;
|
bool UsesSirenSwitching(int32 model) const;
|
||||||
|
|
||||||
CVehicle *FindVehicleOfPlayer();
|
CVehicle *FindVehicleOfPlayer(); //done
|
||||||
void SetPedTalkingStatus(CPed *ped, uint8 status);
|
void SetPedTalkingStatus(CPed *ped, uint8 status);
|
||||||
void SetPlayersMood(uint8 mood, int32 time);
|
void SetPlayersMood(uint8 mood, int32 time);
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
cSampleManager SampleManager;
|
cSampleManager SampleManager;
|
||||||
bool _bSampmanInitialised = false;
|
bool _bSampmanInitialised = false;
|
||||||
|
|
||||||
uint32 BankStartOffset[MAX_SAMPLEBANKS];
|
uint32 BankStartOffset[MAX_SFX_BANKS];
|
||||||
uint32 nNumMP3s;
|
uint32 nNumMP3s;
|
||||||
|
|
||||||
cSampleManager::cSampleManager(void)
|
cSampleManager::cSampleManager(void)
|
||||||
|
@ -136,20 +136,20 @@ cSampleManager::SetMonoMode(uint8 nMode)
|
||||||
bool
|
bool
|
||||||
cSampleManager::LoadSampleBank(uint8 nBank)
|
cSampleManager::LoadSampleBank(uint8 nBank)
|
||||||
{
|
{
|
||||||
ASSERT( nBank < MAX_SAMPLEBANKS );
|
ASSERT( nBank < MAX_SFX_BANKS );
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cSampleManager::UnloadSampleBank(uint8 nBank)
|
cSampleManager::UnloadSampleBank(uint8 nBank)
|
||||||
{
|
{
|
||||||
ASSERT( nBank < MAX_SAMPLEBANKS );
|
ASSERT( nBank < MAX_SFX_BANKS );
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
cSampleManager::IsSampleBankLoaded(uint8 nBank)
|
cSampleManager::IsSampleBankLoaded(uint8 nBank)
|
||||||
{
|
{
|
||||||
ASSERT( nBank < MAX_SAMPLEBANKS );
|
ASSERT( nBank < MAX_SFX_BANKS );
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
|
||||||
int32
|
int32
|
||||||
cSampleManager::GetBankContainingSound(uint32 offset)
|
cSampleManager::GetBankContainingSound(uint32 offset)
|
||||||
{
|
{
|
||||||
return SAMPLEBANK_INVALID;
|
return INVALID_SFX_BANK;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32
|
int32
|
||||||
|
|
|
@ -1819,7 +1819,13 @@ CVehicle* CStoredCar::RestoreCar()
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
if (pVehicle->IsCar())
|
if (pVehicle->IsCar())
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
((CAutomobile*)pVehicle)->m_bombType = m_nCarBombType;
|
((CAutomobile*)pVehicle)->m_bombType = m_nCarBombType;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (m_nCarBombType != CARBOMB_NONE)
|
||||||
|
((CAutomobile*)pVehicle)->m_pBombRigger = FindPlayerPed();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
pVehicle->bHasBeenOwnedByPlayer = true;
|
pVehicle->bHasBeenOwnedByPlayer = true;
|
||||||
pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
|
pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
|
||||||
pVehicle->bBulletProof = m_bBulletproof;
|
pVehicle->bBulletProof = m_bBulletproof;
|
||||||
|
|
|
@ -107,11 +107,13 @@ CdStreamInit(int32 numChannels)
|
||||||
|
|
||||||
_gdwCdStreamFlags = 0;
|
_gdwCdStreamFlags = 0;
|
||||||
|
|
||||||
|
#ifndef FIX_BUGS // this just slows down streaming
|
||||||
if ( BytesPerSector <= CDSTREAM_SECTOR_SIZE )
|
if ( BytesPerSector <= CDSTREAM_SECTOR_SIZE )
|
||||||
{
|
{
|
||||||
_gdwCdStreamFlags |= FILE_FLAG_NO_BUFFERING;
|
_gdwCdStreamFlags |= FILE_FLAG_NO_BUFFERING;
|
||||||
debug("Using no buffered loading for streaming\n");
|
debug("Using no buffered loading for streaming\n");
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
_gbCdStreamOverlapped = TRUE;
|
_gbCdStreamOverlapped = TRUE;
|
||||||
|
|
||||||
|
|
|
@ -733,9 +733,6 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_Driving(int32
|
||||||
FindPlayerVehicle()->GetModelIndex() == MI_DODO
|
FindPlayerVehicle()->GetModelIndex() == MI_DODO
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
|| (CVehicle::bAllDodosCheat && !FindPlayerVehicle()->IsRealHeli())
|
|| (CVehicle::bAllDodosCheat && !FindPlayerVehicle()->IsRealHeli())
|
||||||
#ifdef ALLCARSHELI_CHEAT
|
|
||||||
|| bAllCarCheat
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
)))
|
)))
|
||||||
{
|
{
|
||||||
|
|
|
@ -526,7 +526,7 @@ void KangarooCheat()
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ALLCARSHELI_CHEAT
|
#ifdef RESTORE_ALLCARSHELI_CHEAT
|
||||||
void AllCarsHeliCheat(void)
|
void AllCarsHeliCheat(void)
|
||||||
{
|
{
|
||||||
wchar* string;
|
wchar* string;
|
||||||
|
@ -1438,7 +1438,7 @@ void CPad::AddToPCCheatString(char c)
|
||||||
CPed::SwitchDebugDisplay();
|
CPed::SwitchDebugDisplay();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ALLCARSHELI_CHEAT
|
#ifdef RESTORE_ALLCARSHELI_CHEAT
|
||||||
// "CARSAREHELI"
|
// "CARSAREHELI"
|
||||||
if (!_CHEATCMP("ILEHERASRAC"))
|
if (!_CHEATCMP("ILEHERASRAC"))
|
||||||
AllCarsHeliCheat();
|
AllCarsHeliCheat();
|
||||||
|
|
|
@ -286,6 +286,8 @@ public:
|
||||||
bool GetMiddleMouseJustUp() { return !!(!NewMouseControllerState.MMB && OldMouseControllerState.MMB); }
|
bool GetMiddleMouseJustUp() { return !!(!NewMouseControllerState.MMB && OldMouseControllerState.MMB); }
|
||||||
bool GetMouseWheelUpJustUp() { return !!(!NewMouseControllerState.WHEELUP && OldMouseControllerState.WHEELUP); }
|
bool GetMouseWheelUpJustUp() { return !!(!NewMouseControllerState.WHEELUP && OldMouseControllerState.WHEELUP); }
|
||||||
bool GetMouseWheelDownJustUp() { return !!(!NewMouseControllerState.WHEELDN && OldMouseControllerState.WHEELDN); }
|
bool GetMouseWheelDownJustUp() { return !!(!NewMouseControllerState.WHEELDN && OldMouseControllerState.WHEELDN); }
|
||||||
|
bool GetMouseX1JustUp() { return !!(!NewMouseControllerState.MXB1 && OldMouseControllerState.MXB1); }
|
||||||
|
bool GetMouseX2JustUp() { return !!(!NewMouseControllerState.MXB2 && OldMouseControllerState.MXB2); }
|
||||||
|
|
||||||
bool GetLeftMouse() { return NewMouseControllerState.LMB; }
|
bool GetLeftMouse() { return NewMouseControllerState.LMB; }
|
||||||
bool GetRightMouse() { return NewMouseControllerState.RMB; }
|
bool GetRightMouse() { return NewMouseControllerState.RMB; }
|
||||||
|
@ -470,7 +472,3 @@ public:
|
||||||
|
|
||||||
VALIDATE_SIZE(CPad, 0xFC);
|
VALIDATE_SIZE(CPad, 0xFC);
|
||||||
extern CPad Pads[MAX_PADS];
|
extern CPad Pads[MAX_PADS];
|
||||||
|
|
||||||
#ifdef ALLCARSHELI_CHEAT
|
|
||||||
extern bool bAllCarCheat;
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1151,6 +1151,10 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay
|
||||||
if (!ms_RadarTrace[nextBlip].m_bInUse)
|
if (!ms_RadarTrace[nextBlip].m_bInUse)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (nextBlip == NUMRADARBLIPS)
|
||||||
|
return -1;
|
||||||
|
#endif
|
||||||
ms_RadarTrace[nextBlip].m_eBlipType = type;
|
ms_RadarTrace[nextBlip].m_eBlipType = type;
|
||||||
ms_RadarTrace[nextBlip].m_nColor = color;
|
ms_RadarTrace[nextBlip].m_nColor = color;
|
||||||
ms_RadarTrace[nextBlip].m_bDim = true;
|
ms_RadarTrace[nextBlip].m_bDim = true;
|
||||||
|
@ -1182,6 +1186,10 @@ int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDispla
|
||||||
if (!ms_RadarTrace[nextBlip].m_bInUse)
|
if (!ms_RadarTrace[nextBlip].m_bInUse)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (nextBlip == NUMRADARBLIPS)
|
||||||
|
return -1;
|
||||||
|
#endif
|
||||||
ms_RadarTrace[nextBlip].m_eBlipType = type;
|
ms_RadarTrace[nextBlip].m_eBlipType = type;
|
||||||
ms_RadarTrace[nextBlip].m_nColor = color;
|
ms_RadarTrace[nextBlip].m_nColor = color;
|
||||||
ms_RadarTrace[nextBlip].m_bDim = true;
|
ms_RadarTrace[nextBlip].m_bDim = true;
|
||||||
|
@ -1526,6 +1534,10 @@ CRadar::ToggleTargetMarker(float x, float y)
|
||||||
if (!ms_RadarTrace[nextBlip].m_bInUse)
|
if (!ms_RadarTrace[nextBlip].m_bInUse)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (nextBlip == NUMRADARBLIPS)
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
ms_RadarTrace[nextBlip].m_eBlipType = BLIP_COORD;
|
ms_RadarTrace[nextBlip].m_eBlipType = BLIP_COORD;
|
||||||
ms_RadarTrace[nextBlip].m_nColor = 0x333333FF;
|
ms_RadarTrace[nextBlip].m_nColor = 0x333333FF;
|
||||||
ms_RadarTrace[nextBlip].m_bDim = 1;
|
ms_RadarTrace[nextBlip].m_bDim = 1;
|
||||||
|
|
|
@ -219,6 +219,8 @@ extern int strncasecmp(const char *str1, const char *str2, size_t len);
|
||||||
|
|
||||||
#define clamp(v, low, high) ((v)<(low) ? (low) : (v)>(high) ? (high) : (v))
|
#define clamp(v, low, high) ((v)<(low) ? (low) : (v)>(high) ? (high) : (v))
|
||||||
|
|
||||||
|
#define clamp2(v, center, radius) ((v) < (center) ? Max(v, center - radius) : Min(v, center + radius))
|
||||||
|
|
||||||
inline float sq(float x) { return x*x; }
|
inline float sq(float x) { return x*x; }
|
||||||
#define SQR(x) ((x) * (x))
|
#define SQR(x) ((x) * (x))
|
||||||
|
|
||||||
|
|
|
@ -250,7 +250,7 @@ enum Config {
|
||||||
#endif
|
#endif
|
||||||
#define DETECT_PAD_INPUT_SWITCH // Adds automatic switch of pad related stuff between controller and kb/m
|
#define DETECT_PAD_INPUT_SWITCH // Adds automatic switch of pad related stuff between controller and kb/m
|
||||||
#define KANGAROO_CHEAT
|
#define KANGAROO_CHEAT
|
||||||
#define ALLCARSHELI_CHEAT
|
#define RESTORE_ALLCARSHELI_CHEAT
|
||||||
#define ALT_DODO_CHEAT
|
#define ALT_DODO_CHEAT
|
||||||
#define WALLCLIMB_CHEAT
|
#define WALLCLIMB_CHEAT
|
||||||
#define REGISTER_START_BUTTON
|
#define REGISTER_START_BUTTON
|
||||||
|
@ -258,14 +258,13 @@ enum Config {
|
||||||
|
|
||||||
// Hud, frontend and radar
|
// Hud, frontend and radar
|
||||||
#define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better.
|
#define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better.
|
||||||
#define BETA_SLIDING_TEXT
|
//#define BETA_SLIDING_TEXT
|
||||||
#define TRIANGULAR_BLIPS // height indicating triangular radar blips, as in VC
|
#define TRIANGULAR_BLIPS // height indicating triangular radar blips, as in VC
|
||||||
#define PC_MENU
|
#define PC_MENU
|
||||||
|
|
||||||
#ifndef PC_MENU
|
#ifndef PC_MENU
|
||||||
# define PS2_MENU
|
# define PS2_MENU
|
||||||
//# define PS2_MENU_USEALLPAGEICONS
|
//# define PS2_MENU_USEALLPAGEICONS
|
||||||
//# define PS2_LIKE_MENU // An effort to recreate PS2 menu, cycling through tabs, different bg etc.
|
|
||||||
#else
|
#else
|
||||||
# define MAP_ENHANCEMENTS // Adding waypoint etc.
|
# define MAP_ENHANCEMENTS // Adding waypoint etc.
|
||||||
# define TRIANGLE_BACK_BUTTON
|
# define TRIANGLE_BACK_BUTTON
|
||||||
|
|
|
@ -50,7 +50,7 @@ void tbInit()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void tbStartTimer(int32 unk, char *name)
|
void tbStartTimer(int32 unk, Const char *name)
|
||||||
{
|
{
|
||||||
strcpy(TimerBar.Timers[TimerBar.count].name, name);
|
strcpy(TimerBar.Timers[TimerBar.count].name, name);
|
||||||
TimerBar.Timers[TimerBar.count].unk = unk;
|
TimerBar.Timers[TimerBar.count].unk = unk;
|
||||||
|
@ -58,7 +58,7 @@ void tbStartTimer(int32 unk, char *name)
|
||||||
TimerBar.count++;
|
TimerBar.count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
void tbEndTimer(char* name)
|
void tbEndTimer(Const char* name)
|
||||||
{
|
{
|
||||||
uint32 n = 1500;
|
uint32 n = 1500;
|
||||||
for (uint32 i = 0; i < TimerBar.count; i++) {
|
for (uint32 i = 0; i < TimerBar.count; i++) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
void tbInit();
|
void tbInit();
|
||||||
void tbStartTimer(int32, char*);
|
void tbStartTimer(int32, Const char*);
|
||||||
void tbEndTimer(char*);
|
void tbEndTimer(Const char*);
|
||||||
void tbDisplay();
|
void tbDisplay();
|
|
@ -103,6 +103,8 @@ public:
|
||||||
void Update(void);
|
void Update(void);
|
||||||
void SwitchOff(void);
|
void SwitchOff(void);
|
||||||
void AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
|
void AddThisOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
|
||||||
|
bool IsActive() const { return m_bIsActive; };
|
||||||
|
const CVector& GetPosition() const { return m_midPoint; };
|
||||||
};
|
};
|
||||||
|
|
||||||
class CEscalators
|
class CEscalators
|
||||||
|
@ -114,6 +116,7 @@ public:
|
||||||
static void Update(void);
|
static void Update(void);
|
||||||
static void AddOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
|
static void AddOne(CVector pos0, CVector pos1, CVector pos2, CVector pos3, bool b_isMovingDown);
|
||||||
static void Shutdown(void);
|
static void Shutdown(void);
|
||||||
|
static const CEscalator& GetEscalator(int ind) { return aEscalators[ind]; };
|
||||||
};
|
};
|
||||||
|
|
||||||
class CMovingThing
|
class CMovingThing
|
||||||
|
|
|
@ -1099,8 +1099,11 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
if ( wParam == VK_SHIFT )
|
if ( wParam == VK_SHIFT )
|
||||||
_InputTranslateShiftKeyUpDown(&ks);
|
_InputTranslateShiftKeyUpDown(&ks);
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
break;
|
||||||
|
#else
|
||||||
return 0L;
|
return 0L;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_KEYUP:
|
case WM_KEYUP:
|
||||||
|
@ -1113,7 +1116,11 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if ( wParam == VK_SHIFT )
|
if ( wParam == VK_SHIFT )
|
||||||
_InputTranslateShiftKeyUpDown(&ks);
|
_InputTranslateShiftKeyUpDown(&ks);
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
break;
|
||||||
|
#else
|
||||||
return 0L;
|
return 0L;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_SYSKEYDOWN:
|
case WM_SYSKEYDOWN:
|
||||||
|
@ -1126,7 +1133,11 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if ( wParam == VK_SHIFT )
|
if ( wParam == VK_SHIFT )
|
||||||
_InputTranslateShiftKeyUpDown(&ks);
|
_InputTranslateShiftKeyUpDown(&ks);
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
break;
|
||||||
|
#else
|
||||||
return 0L;
|
return 0L;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_SYSKEYUP:
|
case WM_SYSKEYUP:
|
||||||
|
@ -1139,7 +1150,11 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if ( wParam == VK_SHIFT )
|
if ( wParam == VK_SHIFT )
|
||||||
_InputTranslateShiftKeyUpDown(&ks);
|
_InputTranslateShiftKeyUpDown(&ks);
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
break;
|
||||||
|
#else
|
||||||
return 0L;
|
return 0L;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_ACTIVATEAPP:
|
case WM_ACTIVATEAPP:
|
||||||
|
@ -2508,8 +2523,10 @@ WinMain(HINSTANCE instance,
|
||||||
{
|
{
|
||||||
if ( gGameState == GS_PLAYING_GAME )
|
if ( gGameState == GS_PLAYING_GAME )
|
||||||
CGame::ShutDown();
|
CGame::ShutDown();
|
||||||
|
#ifndef MASTER
|
||||||
else if ( gGameState == GS_ANIMVIEWER )
|
else if ( gGameState == GS_ANIMVIEWER )
|
||||||
CAnimViewer::Shutdown();
|
CAnimViewer::Shutdown();
|
||||||
|
#endif
|
||||||
|
|
||||||
CTimer::Stop();
|
CTimer::Stop();
|
||||||
|
|
||||||
|
@ -2533,8 +2550,10 @@ WinMain(HINSTANCE instance,
|
||||||
|
|
||||||
if ( gGameState == GS_PLAYING_GAME )
|
if ( gGameState == GS_PLAYING_GAME )
|
||||||
CGame::ShutDown();
|
CGame::ShutDown();
|
||||||
|
#ifndef MASTER
|
||||||
else if ( gGameState == GS_ANIMVIEWER )
|
else if ( gGameState == GS_ANIMVIEWER )
|
||||||
CAnimViewer::Shutdown();
|
CAnimViewer::Shutdown();
|
||||||
|
#endif
|
||||||
|
|
||||||
DMAudio.Terminate();
|
DMAudio.Terminate();
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
|
||||||
}
|
}
|
||||||
|
|
||||||
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId);
|
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId);
|
||||||
pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)mi->m_handlingId);
|
pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)mi->m_handlingId);
|
||||||
|
|
||||||
m_auto_unused1 = 20.0f;
|
m_auto_unused1 = 20.0f;
|
||||||
m_auto_unused2 = 0;
|
m_auto_unused2 = 0;
|
||||||
|
@ -1293,7 +1293,7 @@ CAutomobile::ProcessControl(void)
|
||||||
|
|
||||||
// Process front wheels off ground
|
// Process front wheels off ground
|
||||||
|
|
||||||
if(!IsRealHeli()){
|
if (!IsRealHeli()) {
|
||||||
if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] <= 0.0f){
|
if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] <= 0.0f){
|
||||||
if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
|
if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
|
||||||
m_aWheelSpeed[CARWHEEL_FRONT_LEFT] *= 0.95f;
|
m_aWheelSpeed[CARWHEEL_FRONT_LEFT] *= 0.95f;
|
||||||
|
@ -1400,24 +1400,31 @@ CAutomobile::ProcessControl(void)
|
||||||
}else if(GetModelIndex() == MI_RCBARON){
|
}else if(GetModelIndex() == MI_RCBARON){
|
||||||
FlyingControl(FLIGHT_MODEL_RCPLANE);
|
FlyingControl(FLIGHT_MODEL_RCPLANE);
|
||||||
}else if(IsRealHeli() || bAllCarCheat){
|
}else if(IsRealHeli() || bAllCarCheat){
|
||||||
// Speed up rotor
|
#ifdef RESTORE_ALLCARSHELI_CHEAT
|
||||||
if(m_aWheelSpeed[1] < 0.22f && !bIsInWater){
|
if (bAllCarCheat)
|
||||||
if(GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN)
|
FlyingControl(FLIGHT_MODEL_HELI);
|
||||||
m_aWheelSpeed[1] += 0.003f;
|
else
|
||||||
else
|
#endif
|
||||||
m_aWheelSpeed[1] += 0.001f;
|
{
|
||||||
}
|
// Speed up rotor
|
||||||
|
if (m_aWheelSpeed[1] < 0.22f && !bIsInWater) {
|
||||||
|
if (GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN)
|
||||||
|
m_aWheelSpeed[1] += 0.003f;
|
||||||
|
else
|
||||||
|
m_aWheelSpeed[1] += 0.001f;
|
||||||
|
}
|
||||||
|
|
||||||
// Fly
|
// Fly
|
||||||
if(m_aWheelSpeed[1] > 0.15f){
|
if (m_aWheelSpeed[1] > 0.15f) {
|
||||||
if(GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN)
|
if (GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN)
|
||||||
FlyingControl(FLIGHT_MODEL_RCHELI);
|
FlyingControl(FLIGHT_MODEL_RCHELI);
|
||||||
else if(m_nWheelsOnGround < 4 && !(GetModelIndex() == MI_SEASPAR && bTouchingWater) ||
|
else if (m_nWheelsOnGround < 4 && !(GetModelIndex() == MI_SEASPAR && bTouchingWater) ||
|
||||||
CPad::GetPad(0)->GetAccelerate() != 0 || CPad::GetPad(0)->GetCarGunUpDown() > 1.0f ||
|
CPad::GetPad(0)->GetAccelerate() != 0 || CPad::GetPad(0)->GetCarGunUpDown() > 1.0f ||
|
||||||
Abs(m_vecMoveSpeed.x) > 0.02f ||
|
Abs(m_vecMoveSpeed.x) > 0.02f ||
|
||||||
Abs(m_vecMoveSpeed.y) > 0.02f ||
|
Abs(m_vecMoveSpeed.y) > 0.02f ||
|
||||||
Abs(m_vecMoveSpeed.z) > 0.02f)
|
Abs(m_vecMoveSpeed.z) > 0.02f)
|
||||||
FlyingControl(FLIGHT_MODEL_HELI);
|
FlyingControl(FLIGHT_MODEL_HELI);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Blade collision
|
// Blade collision
|
||||||
|
@ -1489,7 +1496,7 @@ CAutomobile::ProcessControl(void)
|
||||||
CMatrix mat;
|
CMatrix mat;
|
||||||
mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));
|
mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));
|
||||||
CVector blade = mat.GetRight();
|
CVector blade = mat.GetRight();
|
||||||
blade = GetMatrix() * blade;
|
blade = Multiply3x3(blade, GetMatrix());
|
||||||
camDist /= Max(Sqrt(distSq), 0.01f);
|
camDist /= Max(Sqrt(distSq), 0.01f);
|
||||||
if(Abs(DotProduct(camDist, blade)) > 0.95f){
|
if(Abs(DotProduct(camDist, blade)) > 0.95f){
|
||||||
DMAudio.PlayOneShot(m_audioEntityId, SOUND_31, 0.0f);
|
DMAudio.PlayOneShot(m_audioEntityId, SOUND_31, 0.0f);
|
||||||
|
|
|
@ -168,3 +168,4 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
extern CVector vecHunterGunPos;
|
extern CVector vecHunterGunPos;
|
||||||
|
extern bool bAllCarCheat;
|
|
@ -32,7 +32,7 @@ void CCarGenerator::SwitchOff()
|
||||||
|
|
||||||
void CCarGenerator::SwitchOn()
|
void CCarGenerator::SwitchOn()
|
||||||
{
|
{
|
||||||
m_nUsesRemaining = 255;
|
m_nUsesRemaining = UINT16_MAX;
|
||||||
m_nTimer = CalcNextGen();
|
m_nTimer = CalcNextGen();
|
||||||
++CTheCarGenerators::CurrentActiveCount;
|
++CTheCarGenerators::CurrentActiveCount;
|
||||||
}
|
}
|
||||||
|
@ -143,10 +143,10 @@ void CCarGenerator::DoInternalProcessing()
|
||||||
m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pVehicle);
|
m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pVehicle);
|
||||||
/* I don't think this is a correct comparasion */
|
/* I don't think this is a correct comparasion */
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
if (m_nUsesRemaining != 0)
|
if (m_nUsesRemaining < UINT16_MAX)
|
||||||
--m_nUsesRemaining;
|
--m_nUsesRemaining;
|
||||||
#else
|
#else
|
||||||
if (m_nUsesRemaining < -1)
|
if (m_nUsesRemaining < ~0)
|
||||||
--m_nUsesRemaining;
|
--m_nUsesRemaining;
|
||||||
#endif
|
#endif
|
||||||
m_nTimer = CalcNextGen();
|
m_nTimer = CalcNextGen();
|
||||||
|
|
|
@ -48,8 +48,10 @@ CDamageManager::FuckCarCompletely(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
// Why set to no damage?
|
// Why set to no damage?
|
||||||
|
#ifndef FIX_BUGS
|
||||||
m_lightStatus = 0;
|
m_lightStatus = 0;
|
||||||
m_panelStatus = 0;
|
m_panelStatus = 0;
|
||||||
|
#endif
|
||||||
SetEngineStatus(250);
|
SetEngineStatus(250);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -432,7 +432,12 @@ CVehicle::FlyingControl(eFlightModel flightModel)
|
||||||
case FLIGHT_MODEL_RCHELI:
|
case FLIGHT_MODEL_RCHELI:
|
||||||
case FLIGHT_MODEL_HELI:
|
case FLIGHT_MODEL_HELI:
|
||||||
{
|
{
|
||||||
float rm = Pow(pFlyingHandling->fMoveRes, CTimer::GetTimeStep());
|
#ifdef RESTORE_ALLCARSHELI_CHEAT
|
||||||
|
tFlyingHandlingData* flyingHandling = bAllCarCheat && GetStatus() == STATUS_PLAYER && !IsRealHeli() ? mod_HandlingManager.GetFlyingPointer(HANDLING_MAVERICK) : pFlyingHandling;
|
||||||
|
#else
|
||||||
|
tFlyingHandlingData* flyingHandling = pFlyingHandling;
|
||||||
|
#endif
|
||||||
|
float rm = Pow(flyingHandling->fMoveRes, CTimer::GetTimeStep());
|
||||||
m_vecMoveSpeed *= rm;
|
m_vecMoveSpeed *= rm;
|
||||||
if (GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE)
|
if (GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE)
|
||||||
return;
|
return;
|
||||||
|
@ -441,11 +446,11 @@ CVehicle::FlyingControl(eFlightModel flightModel)
|
||||||
if(fThrust < 0.0f)
|
if(fThrust < 0.0f)
|
||||||
fThrust *= 2.0f;
|
fThrust *= 2.0f;
|
||||||
if(flightModel == FLIGHT_MODEL_RCHELI){
|
if(flightModel == FLIGHT_MODEL_RCHELI){
|
||||||
fThrust = pFlyingHandling->fThrust * fThrust + 0.45f;
|
fThrust = flyingHandling->fThrust * fThrust + 0.45f;
|
||||||
ApplyMoveForce(GRAVITY * CVector(0.0f, 0.0f, 0.5f) * m_fMass * CTimer::GetTimeStep());
|
ApplyMoveForce(GRAVITY * CVector(0.0f, 0.0f, 0.5f) * m_fMass * CTimer::GetTimeStep());
|
||||||
}else
|
}else
|
||||||
fThrust = pFlyingHandling->fThrust * fThrust + 0.95f;
|
fThrust = flyingHandling->fThrust * fThrust + 0.95f;
|
||||||
fThrust -= pFlyingHandling->fThrustFallOff * fUpSpeed;
|
fThrust -= flyingHandling->fThrustFallOff * fUpSpeed;
|
||||||
if(flightModel == FLIGHT_MODEL_RCHELI && GetPosition().z > 40.0f)
|
if(flightModel == FLIGHT_MODEL_RCHELI && GetPosition().z > 40.0f)
|
||||||
fThrust *= 10.0f/(GetPosition().z - 30.0f);
|
fThrust *= 10.0f/(GetPosition().z - 30.0f);
|
||||||
else if(GetPosition().z > 80.0f)
|
else if(GetPosition().z > 80.0f)
|
||||||
|
@ -453,20 +458,20 @@ CVehicle::FlyingControl(eFlightModel flightModel)
|
||||||
ApplyMoveForce(GRAVITY * GetUp() * fThrust * m_fMass * CTimer::GetTimeStep());
|
ApplyMoveForce(GRAVITY * GetUp() * fThrust * m_fMass * CTimer::GetTimeStep());
|
||||||
|
|
||||||
if (GetUp().z > 0.0f){
|
if (GetUp().z > 0.0f){
|
||||||
float upRight = clamp(GetRight().z, -pFlyingHandling->fFormLift, pFlyingHandling->fFormLift);
|
float upRight = clamp(GetRight().z, -flyingHandling->fFormLift, flyingHandling->fFormLift);
|
||||||
float upImpulseRight = -upRight * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
float upImpulseRight = -upRight * flyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
||||||
ApplyTurnForce(upImpulseRight * GetUp(), GetRight());
|
ApplyTurnForce(upImpulseRight * GetUp(), GetRight());
|
||||||
|
|
||||||
float upFwd = clamp(GetForward().z, -pFlyingHandling->fFormLift, pFlyingHandling->fFormLift);
|
float upFwd = clamp(GetForward().z, -flyingHandling->fFormLift, flyingHandling->fFormLift);
|
||||||
float upImpulseFwd = -upFwd * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
float upImpulseFwd = -upFwd * flyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
||||||
ApplyTurnForce(upImpulseFwd * GetUp(), GetForward());
|
ApplyTurnForce(upImpulseFwd * GetUp(), GetForward());
|
||||||
}else{
|
}else{
|
||||||
float upRight = GetRight().z < 0.0f ? -pFlyingHandling->fFormLift : pFlyingHandling->fFormLift;
|
float upRight = GetRight().z < 0.0f ? -flyingHandling->fFormLift : flyingHandling->fFormLift;
|
||||||
float upImpulseRight = -upRight * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
float upImpulseRight = -upRight * flyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
||||||
ApplyTurnForce(upImpulseRight * GetUp(), GetRight());
|
ApplyTurnForce(upImpulseRight * GetUp(), GetRight());
|
||||||
|
|
||||||
float upFwd = GetForward().z < 0.0f ? -pFlyingHandling->fFormLift : pFlyingHandling->fFormLift;
|
float upFwd = GetForward().z < 0.0f ? -flyingHandling->fFormLift : flyingHandling->fFormLift;
|
||||||
float upImpulseFwd = -upFwd * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
float upImpulseFwd = -upFwd * flyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
|
||||||
ApplyTurnForce(upImpulseFwd * GetUp(), GetForward());
|
ApplyTurnForce(upImpulseFwd * GetUp(), GetForward());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -490,25 +495,25 @@ CVehicle::FlyingControl(eFlightModel flightModel)
|
||||||
fPitch = -CPad::GetPad(0)->GetCarGunUpDown() / 128.0f;
|
fPitch = -CPad::GetPad(0)->GetCarGunUpDown() / 128.0f;
|
||||||
if (CPad::GetPad(0)->GetHorn()) {
|
if (CPad::GetPad(0)->GetHorn()) {
|
||||||
fYaw = 0.0f;
|
fYaw = 0.0f;
|
||||||
fPitch = clamp(pFlyingHandling->fPitchStab * DotProduct(m_vecMoveSpeed, GetForward()), -200.0f, 1.3f);
|
fPitch = clamp(flyingHandling->fPitchStab * DotProduct(m_vecMoveSpeed, GetForward()), -200.0f, 1.3f);
|
||||||
fRoll = clamp(pFlyingHandling->fRollStab * DotProduct(m_vecMoveSpeed, GetRight()), -200.0f, 1.3f);
|
fRoll = clamp(flyingHandling->fRollStab * DotProduct(m_vecMoveSpeed, GetRight()), -200.0f, 1.3f);
|
||||||
}
|
}
|
||||||
ApplyTurnForce(fPitch * GetUp() * pFlyingHandling->fPitch * m_fTurnMass * CTimer::GetTimeStep(), GetForward());
|
ApplyTurnForce(fPitch * GetUp() * flyingHandling->fPitch * m_fTurnMass * CTimer::GetTimeStep(), GetForward());
|
||||||
ApplyTurnForce(fRoll * GetUp() * pFlyingHandling->fRoll * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
|
ApplyTurnForce(fRoll * GetUp() * flyingHandling->fRoll * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
|
||||||
|
|
||||||
float fSideSpeed = -DotProduct(GetMoveSpeed(), GetRight());
|
float fSideSpeed = -DotProduct(GetMoveSpeed(), GetRight());
|
||||||
float fSideSlipAccel = pFlyingHandling->fSideSlip * fSideSpeed * Abs(fSideSpeed);
|
float fSideSlipAccel = flyingHandling->fSideSlip * fSideSpeed * Abs(fSideSpeed);
|
||||||
ApplyMoveForce(m_fMass * GetRight() * fSideSlipAccel * CTimer::GetTimeStep());
|
ApplyMoveForce(m_fMass * GetRight() * fSideSlipAccel * CTimer::GetTimeStep());
|
||||||
float fYawAccel = pFlyingHandling->fYawStab * fSideSpeed * Abs(fSideSpeed) + pFlyingHandling->fYaw * fYaw;
|
float fYawAccel = flyingHandling->fYawStab * fSideSpeed * Abs(fSideSpeed) + flyingHandling->fYaw * fYaw;
|
||||||
ApplyTurnForce(fYawAccel * GetRight() * m_fTurnMass * CTimer::GetTimeStep(), -GetForward());
|
ApplyTurnForce(fYawAccel * GetRight() * m_fTurnMass * CTimer::GetTimeStep(), -GetForward());
|
||||||
|
|
||||||
ApplyTurnForce(fYaw * GetForward() * pFlyingHandling->fYaw * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
|
ApplyTurnForce(fYaw * GetForward() * flyingHandling->fYaw * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
|
||||||
|
|
||||||
float rX = Pow(pFlyingHandling->vecTurnRes.x, CTimer::GetTimeStep());
|
float rX = Pow(flyingHandling->vecTurnRes.x, CTimer::GetTimeStep());
|
||||||
float rY = Pow(pFlyingHandling->vecTurnRes.y, CTimer::GetTimeStep());
|
float rY = Pow(flyingHandling->vecTurnRes.y, CTimer::GetTimeStep());
|
||||||
float rZ = Pow(pFlyingHandling->vecTurnRes.z, CTimer::GetTimeStep());
|
float rZ = Pow(flyingHandling->vecTurnRes.z, CTimer::GetTimeStep());
|
||||||
CVector vecTurnSpeed = Multiply3x3(m_vecTurnSpeed, GetMatrix());
|
CVector vecTurnSpeed = Multiply3x3(m_vecTurnSpeed, GetMatrix());
|
||||||
float fResistanceMultiplier = Pow(1.0f / (pFlyingHandling->vecSpeedRes.z * SQR(vecTurnSpeed.z) + 1.0f) * rZ, CTimer::GetTimeStep());
|
float fResistanceMultiplier = Pow(1.0f / (flyingHandling->vecSpeedRes.z * SQR(vecTurnSpeed.z) + 1.0f) * rZ, CTimer::GetTimeStep());
|
||||||
float fResistance = vecTurnSpeed.z * fResistanceMultiplier - vecTurnSpeed.z;
|
float fResistance = vecTurnSpeed.z * fResistanceMultiplier - vecTurnSpeed.z;
|
||||||
vecTurnSpeed.x *= rX;
|
vecTurnSpeed.x *= rX;
|
||||||
vecTurnSpeed.y *= rY;
|
vecTurnSpeed.y *= rY;
|
||||||
|
|
Loading…
Reference in a new issue