mirror of
https://github.com/GTAmodding/re3.git
synced 2024-12-26 16:55:46 +00:00
Audio fixes
This commit is contained in:
Filip Gawin
parent
01ac2929cd
commit
5a36d46692
7 changed files with 95 additions and 608 deletions
|
|
@ -2823,7 +2823,6 @@ cAudioManager::GetNum3DProvidersAvailable() const
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int32
|
int32
|
||||||
cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
|
cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
|
||||||
{
|
{
|
||||||
|
|
@ -3038,6 +3037,13 @@ cAudioManager::PlayOneShot(int32 index, int16 sound, float vol)
|
||||||
EAXJMP(0x57A500);
|
EAXJMP(0x57A500);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WRAPPER
|
||||||
|
uint32
|
||||||
|
cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
|
||||||
|
{
|
||||||
|
EAXJMP(0x580500);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::PlayerJustGotInCar() const
|
cAudioManager::PlayerJustGotInCar() const
|
||||||
{
|
{
|
||||||
|
|
@ -3092,7 +3098,6 @@ cAudioManager::PostTerminateGameSpecificShutdown()
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::PreInitialiseGameSpecificSetup() const
|
cAudioManager::PreInitialiseGameSpecificSetup() const
|
||||||
{
|
{
|
||||||
|
|
@ -3100,6 +3105,13 @@ cAudioManager::PreInitialiseGameSpecificSetup() const
|
||||||
BankStartOffset[1] = AUDIO_SAMPLE_POLICE_COP_1_ARREST_1;
|
BankStartOffset[1] = AUDIO_SAMPLE_POLICE_COP_1_ARREST_1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WRAPPER
|
||||||
|
void
|
||||||
|
cAudioManager::PreloadMissionAudio(char *)
|
||||||
|
{
|
||||||
|
EAXJMP(0x579550);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::PreTerminateGameSpecificShutdown()
|
cAudioManager::PreTerminateGameSpecificShutdown()
|
||||||
{
|
{
|
||||||
|
|
@ -7790,6 +7802,20 @@ cAudioManager::ReleaseDigitalHandle() const
|
||||||
if(m_bIsInitialised) { SampleManager.ReleaseDigitalHandle(); }
|
if(m_bIsInitialised) { SampleManager.ReleaseDigitalHandle(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WRAPPER
|
||||||
|
int32
|
||||||
|
cAudioManager::ReportCollision(CEntity *a2, CEntity *a3, uint8 a4, uint8 a5, float a6, float a7)
|
||||||
|
{
|
||||||
|
EAXJMP(0x568410);
|
||||||
|
}
|
||||||
|
|
||||||
|
WRAPPER
|
||||||
|
int32
|
||||||
|
cAudioManager::ReportCrime(eCrimeType crime, const CVector *pos)
|
||||||
|
{
|
||||||
|
EAXJMP(0x5803D0);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::ResetAudioLogicTimers(int32 timer)
|
cAudioManager::ResetAudioLogicTimers(int32 timer)
|
||||||
{
|
{
|
||||||
|
|
@ -7824,12 +7850,21 @@ cAudioManager::ResetPoliceRadio()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WRAPPER
|
||||||
|
void
|
||||||
|
cAudioManager::ResetTimers(uint32 a2)
|
||||||
|
{
|
||||||
|
EAXJMP(0x57A7B0);
|
||||||
|
}
|
||||||
|
|
||||||
WRAPPER void
|
WRAPPER void
|
||||||
cAudioManager::Service()
|
cAudioManager::Service()
|
||||||
{
|
{
|
||||||
EAXJMP(0x57A2A0);
|
EAXJMP(0x57A2A0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WRAPPER
|
||||||
|
int8 cAudioManager::SetCurrent3DProvider(uint8) { EAXJMP(0x57A910); }
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::SetDynamicAcousticModelingStatus(bool status)
|
cAudioManager::SetDynamicAcousticModelingStatus(bool status)
|
||||||
|
|
@ -7891,7 +7926,6 @@ cAudioManager::SetMusicMasterVolume(uint8 volume) const
|
||||||
SampleManager.SetMusicMasterVolume(volume);
|
SampleManager.SetMusicMasterVolume(volume);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::SetSpeakerConfig(int32 conf) const
|
cAudioManager::SetSpeakerConfig(int32 conf) const
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -503,17 +503,17 @@ public:
|
||||||
void ReleaseDigitalHandle() const;
|
void ReleaseDigitalHandle() const;
|
||||||
int32 ReportCollision(CEntity *a2, CEntity *a3, uint8 a4, uint8 a5, float a6,
|
int32 ReportCollision(CEntity *a2, CEntity *a3, uint8 a4, uint8 a5, float a6,
|
||||||
float a7); // todo
|
float a7); // todo
|
||||||
int32 ReportCrime(int a2, int *a3); // todo
|
int32 ReportCrime(eCrimeType crime, const CVector *pos); // todo
|
||||||
void ResetAudioLogicTimers(int32 timer); /// ok
|
void ResetAudioLogicTimers(int32 timer); /// ok
|
||||||
void ResetPoliceRadio();
|
void ResetPoliceRadio(); /// ok
|
||||||
void ResetTimers(unsigned int a2); // todo
|
void ResetTimers(uint32 a2); // todo
|
||||||
|
|
||||||
void Service(); // todo
|
void Service(); // todo
|
||||||
void ServiceCollisions(); // todo
|
void ServiceCollisions(); // todo
|
||||||
void ServicePoliceRadio(); // todo
|
void ServicePoliceRadio(); // todo
|
||||||
void ServicePoliceRadioChannel(int a2); // todo
|
void ServicePoliceRadioChannel(int a2); // todo
|
||||||
void ServiceSoundEffects(); // todo
|
void ServiceSoundEffects(); // todo
|
||||||
void SetCurrent3DProvider(uint8);
|
int8 SetCurrent3DProvider(uint8); // todo
|
||||||
void SetDynamicAcousticModelingStatus(bool status);
|
void SetDynamicAcousticModelingStatus(bool status);
|
||||||
void SetEffectsFadeVolume(uint8 volume) const;
|
void SetEffectsFadeVolume(uint8 volume) const;
|
||||||
void SetEffectsMasterVolume(uint8 volume) const;
|
void SetEffectsMasterVolume(uint8 volume) const;
|
||||||
|
|
|
||||||
|
|
@ -1,549 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "AudioSamples.h"
|
|
||||||
#include "DMAudio.h"
|
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
class tActiveSample
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
int32 m_nEntityIndex;
|
|
||||||
int32 m_counter;
|
|
||||||
int32 m_nSampleIndex;
|
|
||||||
uint8 m_bBankIndex;
|
|
||||||
uint8 m_bIsDistant;
|
|
||||||
uint8 field_14;
|
|
||||||
uint8 field_15;
|
|
||||||
int32 field_16;
|
|
||||||
int32 m_nFrequency;
|
|
||||||
uint8 m_bVolume;
|
|
||||||
uint8 field_25;
|
|
||||||
uint8 field_26;
|
|
||||||
uint8 field_27;
|
|
||||||
float m_fDistance;
|
|
||||||
int32 m_nLoopCount;
|
|
||||||
int32 m_nLoopStart;
|
|
||||||
int32 m_nLoopEnd;
|
|
||||||
uint8 m_bEmittingVolume;
|
|
||||||
uint8 field_45;
|
|
||||||
uint8 field_46;
|
|
||||||
uint8 field_47;
|
|
||||||
float field_48;
|
|
||||||
float m_fSoundIntensity;
|
|
||||||
uint8 field_56;
|
|
||||||
uint8 field_57;
|
|
||||||
uint8 field_58;
|
|
||||||
uint8 field_59;
|
|
||||||
CVector m_vecPos;
|
|
||||||
uint8 m_bReverbFlag;
|
|
||||||
uint8 m_bLoopsRemaining;
|
|
||||||
uint8 m_bRequireReflection;
|
|
||||||
uint8 m_bOffset;
|
|
||||||
int32 field_76;
|
|
||||||
uint8 m_bIsProcessed;
|
|
||||||
uint8 m_bLoopEnded;
|
|
||||||
uint8 field_82;
|
|
||||||
uint8 field_83;
|
|
||||||
int32 calculatedVolume;
|
|
||||||
uint8 field_88;
|
|
||||||
uint8 field_89;
|
|
||||||
uint8 field_90;
|
|
||||||
uint8 field_91;
|
|
||||||
|
|
||||||
// no methods
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(tActiveSample) == 92, "tActiveSample: error");
|
|
||||||
|
|
||||||
enum eAudioType : int32 {
|
|
||||||
AUDIOTYPE_PHYSICAL = 0,
|
|
||||||
AUDIOTYPE_EXPLOSION = 1,
|
|
||||||
AUDIOTYPE_FIRE = 2,
|
|
||||||
AUDIOTYPE_WEATHER = 3,
|
|
||||||
AUDIOTYPE_CRANE = 4,
|
|
||||||
AUDIOTYPE_SCRIPTOBJECT = 5,
|
|
||||||
AUDIOTYPE_BRIDGE = 6,
|
|
||||||
AUDIOTYPE_COLLISION = 7,
|
|
||||||
AUDIOTYPE_FRONTEND = 8,
|
|
||||||
AUDIOTYPE_PROJECTILE = 9,
|
|
||||||
AUDIOTYPE_GARAGE = 10,
|
|
||||||
AUDIOTYPE_FIREHYDRANT = 11,
|
|
||||||
AUDIOTYPE_WATERCANNON = 12,
|
|
||||||
AUDIOTYPE_POLICERADIO = 13,
|
|
||||||
TOTAL_AUDIO_TYPES = 14,
|
|
||||||
};
|
|
||||||
|
|
||||||
class CPhysical;
|
|
||||||
class CAutomobile;
|
|
||||||
|
|
||||||
class tAudioEntity
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
eAudioType m_nType;
|
|
||||||
void *m_pEntity;
|
|
||||||
bool m_bIsUsed;
|
|
||||||
uint8 m_bStatus;
|
|
||||||
int16 m_awAudioEvent[4];
|
|
||||||
uint8 gap_18[2];
|
|
||||||
float m_afVolume[4];
|
|
||||||
uint8 m_Loops;
|
|
||||||
uint8 field_25[3];
|
|
||||||
|
|
||||||
// no methods
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
|
|
||||||
|
|
||||||
class tPedComment
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
int32 m_nSampleIndex;
|
|
||||||
int32 m_entityIndex;
|
|
||||||
CVector m_vecPos;
|
|
||||||
float m_fDistance;
|
|
||||||
uint8 m_bVolume;
|
|
||||||
int8 field_25; // allocated time?
|
|
||||||
uint8 gap_26[2];
|
|
||||||
|
|
||||||
// no methods
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(tPedComment) == 28, "tPedComment: error");
|
|
||||||
|
|
||||||
class cPedComments
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
tPedComment m_asPedComments[2][20];
|
|
||||||
uint8 indexMap[2][20];
|
|
||||||
uint8 nrOfCommentsInBank[2];
|
|
||||||
uint8 activeBank;
|
|
||||||
uint8 gap_1163[1];
|
|
||||||
|
|
||||||
// reversed all methods
|
|
||||||
void Add(tPedComment *com); /// ok
|
|
||||||
void Process(); /// ok
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(cPedComments) == 1164, "cPedComments: error");
|
|
||||||
|
|
||||||
class CEntity;
|
|
||||||
|
|
||||||
class cAudioCollision
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
CEntity *m_pEntity1;
|
|
||||||
CEntity *m_pEntity2;
|
|
||||||
uint8 m_bSurface1;
|
|
||||||
uint8 m_bSurface2;
|
|
||||||
uint8 field_10;
|
|
||||||
uint8 field_11;
|
|
||||||
float m_fIntensity1;
|
|
||||||
float m_fIntensity2;
|
|
||||||
CVector m_vecPosition;
|
|
||||||
float m_fDistance;
|
|
||||||
int32 m_nBaseVolume;
|
|
||||||
|
|
||||||
// no methods
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(cAudioCollision) == 40, "cAudioCollision: error");
|
|
||||||
|
|
||||||
class cAudioCollisionManager
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
cAudioCollision m_asCollisions1[10];
|
|
||||||
cAudioCollision m_asCollisions2[10];
|
|
||||||
uint8 m_bIndicesTable[10];
|
|
||||||
uint8 m_bCollisionsInQueue;
|
|
||||||
uint8 gap_811;
|
|
||||||
cAudioCollision m_sQueue;
|
|
||||||
|
|
||||||
void AddCollisionToRequestedQueue(); // todo
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(cAudioCollisionManager) == 852, "cAudioCollisionManager: error");
|
|
||||||
|
|
||||||
class cMissionAudio
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
CVector m_vecPos;
|
|
||||||
uint8 field_12;
|
|
||||||
uint8 gap_13[3];
|
|
||||||
int m_nSampleIndex;
|
|
||||||
uint8 m_bLoadingStatus;
|
|
||||||
uint8 m_bPlayStatus;
|
|
||||||
uint8 field_22;
|
|
||||||
uint8 field_23;
|
|
||||||
int field_24;
|
|
||||||
bool m_bIsPlayed;
|
|
||||||
uint8 field_29;
|
|
||||||
uint8 field_30;
|
|
||||||
uint8 field_31;
|
|
||||||
// no methods
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(cMissionAudio) == 32, "cMissionAudio: error");
|
|
||||||
|
|
||||||
class cVehicleParams;
|
|
||||||
class CPlane;
|
|
||||||
class CVehicle;
|
|
||||||
class CPed;
|
|
||||||
class cPedParams;
|
|
||||||
class cTransmission;
|
|
||||||
|
|
||||||
class cAudioScriptObject {
|
|
||||||
public:
|
|
||||||
int16 AudioId;
|
|
||||||
char _pad0[2];
|
|
||||||
CVector Posn;
|
|
||||||
int32 AudioEntity;
|
|
||||||
|
|
||||||
static void *operator new(size_t);
|
|
||||||
static void *operator new(size_t, int);
|
|
||||||
static void operator delete(void *, size_t);
|
|
||||||
static void operator delete(void *, int);
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(cAudioScriptObject) == 20, "cAudioScriptObject: error");
|
|
||||||
|
|
||||||
enum {
|
|
||||||
/*
|
|
||||||
REFLECTION_YMAX = 0, top
|
|
||||||
REFLECTION_YMIN = 1, bottom
|
|
||||||
REFLECTION_XMIN = 2, left
|
|
||||||
REFLECTION_XMAX = 3, right
|
|
||||||
REFLECTION_ZMAX = 4,
|
|
||||||
*/
|
|
||||||
|
|
||||||
REFLECTION_TOP = 0,
|
|
||||||
REFLECTION_BOTTOM,
|
|
||||||
REFLECTION_LEFT,
|
|
||||||
REFLECTION_RIGHT,
|
|
||||||
REFLECTION_UP,
|
|
||||||
MAX_REFLECTIONS,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum AudioEntityHandle
|
|
||||||
{
|
|
||||||
AEHANDLE_NONE = -5,
|
|
||||||
AEHANDLE_ERROR_NOAUDIOSYS = -4,
|
|
||||||
AEHANDLE_ERROR_NOFREESLOT = -3,
|
|
||||||
AEHANDLE_ERROR_NOENTITY = -2,
|
|
||||||
AEHANDLE_ERROR_BADAUDIOTYPE = -1,
|
|
||||||
};
|
|
||||||
|
|
||||||
class cAudioManager
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
bool m_bIsInitialised;
|
|
||||||
uint8 field_1;
|
|
||||||
uint8 field_2;
|
|
||||||
uint8 m_bActiveSamples;
|
|
||||||
uint8 field_4;
|
|
||||||
bool m_bDynamicAcousticModelingStatus;
|
|
||||||
uint8 field_6;
|
|
||||||
uint8 field_7;
|
|
||||||
float speedOfSound;
|
|
||||||
bool m_bTimerJustReset;
|
|
||||||
uint8 field_13;
|
|
||||||
uint8 field_14;
|
|
||||||
uint8 field_15;
|
|
||||||
int32 m_nTimer;
|
|
||||||
tActiveSample m_sQueueSample;
|
|
||||||
uint8 m_bActiveSampleQueue;
|
|
||||||
uint8 gap_109[3];
|
|
||||||
tActiveSample m_asSamples[2][27];
|
|
||||||
uint8 m_abSampleQueueIndexTable[2][27];
|
|
||||||
uint8 m_bSampleRequestQueuesStatus[2];
|
|
||||||
tActiveSample m_asActiveSamples[27];
|
|
||||||
tAudioEntity m_asAudioEntities[200];
|
|
||||||
int32 m_anAudioEntityIndices[200];
|
|
||||||
int32 m_nAudioEntitiesTotal;
|
|
||||||
CVector m_avecReflectionsPos[5];
|
|
||||||
float m_afReflectionsDistances[5];
|
|
||||||
int32 m_anScriptObjectEntityIndices[40];
|
|
||||||
int32 m_nScriptObjectEntityTotal;
|
|
||||||
cPedComments m_sPedComments;
|
|
||||||
int32 m_nFireAudioEntity;
|
|
||||||
int32 m_nWaterCannonEntity;
|
|
||||||
int32 m_nPoliceChannelEntity;
|
|
||||||
uint8 gap45B8[444];
|
|
||||||
int32 m_nFrontEndEntity;
|
|
||||||
int32 m_nCollisionEntity;
|
|
||||||
cAudioCollisionManager m_sCollisionManager;
|
|
||||||
int32 m_nProjectileEntity;
|
|
||||||
int32 m_nBridgeEntity;
|
|
||||||
cMissionAudio m_sMissionAudio;
|
|
||||||
int32 m_anRandomTable[5];
|
|
||||||
uint8 field_19192;
|
|
||||||
uint8 m_bUserPause;
|
|
||||||
uint8 m_bPreviousUserPause;
|
|
||||||
uint8 field_19195; // time?
|
|
||||||
uint32 m_FrameCounter;
|
|
||||||
|
|
||||||
// getters
|
|
||||||
uint32 GetFrameCounter() const { return m_FrameCounter; }
|
|
||||||
float GetReflectionsDistance(int32 idx) const { return m_afReflectionsDistances[idx]; }
|
|
||||||
int32 GetRandomTabe(int32 idx) const { return m_anRandomTable[idx]; }
|
|
||||||
|
|
||||||
// "Should" be in alphabetic order, except "getXTalkSfx"
|
|
||||||
void AddDetailsToRequestedOrderList(uint8 sample); /// ok
|
|
||||||
void AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 unk1,
|
|
||||||
uint8 counter, bool notLooping); /// ok
|
|
||||||
void AddReflectionsToRequestedQueue(); /// ok (check value)
|
|
||||||
void AddReleasingSounds(); // todo (difficult)
|
|
||||||
void AddSampleToRequestedQueue(); /// ok
|
|
||||||
void AgeCrimes(); // todo
|
|
||||||
|
|
||||||
void CalculateDistance(bool *ptr, float dist); /// ok
|
|
||||||
bool CheckForAnAudioFileOnCD() const; /// ok
|
|
||||||
void ClearMissionAudio(); /// ok
|
|
||||||
void ClearRequestedQueue(); /// ok
|
|
||||||
int32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2,
|
|
||||||
float speedMultiplier) const; /// ok
|
|
||||||
int32 ComputePan(float, CVector *); // todo
|
|
||||||
uint32 ComputeVolume(int emittingVolume, float soundIntensity, float distance) const; /// ok
|
|
||||||
int32 CreateEntity(int32 type, CPhysical *entity); /// ok
|
|
||||||
|
|
||||||
void DestroyAllGameCreatedEntities(); /// ok
|
|
||||||
void DestroyEntity(int32 id); /// ok
|
|
||||||
void DoJumboVolOffset() const; /// ok
|
|
||||||
void DoPoliceRadioCrackle(); /// ok
|
|
||||||
|
|
||||||
// functions returning talk sfx,
|
|
||||||
// order from GetPedCommentSfx
|
|
||||||
uint32 GetPlayerTalkSfx(int16 sound);
|
|
||||||
uint32 GetCopTalkSfx(int16 sound);
|
|
||||||
uint32 GetSwatTalkSfx(int16 sound);
|
|
||||||
uint32 GetFBITalkSfx(int16 sound);
|
|
||||||
uint32 GetArmyTalkSfx(int16 sound);
|
|
||||||
uint32 GetMedicTalkSfx(int16 sound);
|
|
||||||
uint32 GetFiremanTalkSfx(int16 sound);
|
|
||||||
uint32 GetNormalMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetTaxiDriverTalkSfx(int16 sound);
|
|
||||||
uint32 GetPimpTalkSfx(int16 sound);
|
|
||||||
uint32 GetMafiaTalkSfx(int16 sound);
|
|
||||||
uint32 GetTriadTalkSfx(int16 sound);
|
|
||||||
uint32 GetDiabloTalkSfx(int16 sound);
|
|
||||||
uint32 GetYakuzaTalkSfx(int16 sound);
|
|
||||||
uint32 GetYardieTalkSfx(int16 sound);
|
|
||||||
uint32 GetColumbianTalkSfx(int16 sound);
|
|
||||||
uint32 GetHoodTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackCriminalTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteCriminalTalkSfx(int16 sound);
|
|
||||||
uint32 GetMaleNo2TalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackProjectMaleTalkSfx(int16 sound, int32 model);
|
|
||||||
uint32 GetWhiteFatMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackFatMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackCasualFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteCasualFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetFemaleNo3TalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackFatFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteFatFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackFemaleProstituteTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteFemaleProstituteTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackProjectFemaleOldTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackProjectFemaleYoungTalkSfx(int16 sound);
|
|
||||||
uint32 GetChinatownMaleOldTalkSfx(int16 sound);
|
|
||||||
uint32 GetChinatownMaleYoungTalkSfx(int16 sound);
|
|
||||||
uint32 GetChinatownFemaleOldTalkSfx(int16 sound);
|
|
||||||
uint32 GetChinatownFemaleYoungTalkSfx(int16 sound);
|
|
||||||
uint32 GetLittleItalyMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetLittleItalyFemaleOldTalkSfx(int16 sound);
|
|
||||||
uint32 GetLittleItalyFemaleYoungTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteDockerMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackDockerMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetScumMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetScumFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteWorkerMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackWorkerMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetBusinessMaleYoungTalkSfx(int16 sound, int32 model);
|
|
||||||
uint32 GetBusinessMaleOldTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteBusinessFemaleTalkSfx(int16 sound, int32 model);
|
|
||||||
uint32 GetBlackBusinessFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetSupermodelMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetSupermodelFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetStewardMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetStewardFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetFanMaleTalkSfx(int16 sound, int32 model);
|
|
||||||
uint32 GetFanFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetHospitalMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetHospitalFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetWhiteConstructionWorkerTalkSfx(int16 sound);
|
|
||||||
uint32 GetBlackConstructionWorkerTalkSfx(int16 sound);
|
|
||||||
uint32 GetShopperFemaleTalkSfx(int16 sound, int32 model);
|
|
||||||
uint32 GetStudentMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetStudentFemaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetCasualMaleOldTalkSfx(int16 sound);
|
|
||||||
|
|
||||||
uint32 GetSpecialCharacterTalkSfx(int32 modelIndex, int32 sound);
|
|
||||||
uint32 GetEightTalkSfx(int16 sound);
|
|
||||||
uint32 GetFrankieTalkSfx(int16 sound);
|
|
||||||
uint32 GetMistyTalkSfx(int16 sound);
|
|
||||||
uint32 GetOJGTalkSfx(int16 sound);
|
|
||||||
uint32 GetCatatalinaTalkSfx(int16 sound);
|
|
||||||
uint32 GetBomberTalkSfx(int16 sound);
|
|
||||||
uint32 GetSecurityGuardTalkSfx(int16 sound);
|
|
||||||
uint32 GetChunkyTalkSfx(int16 sound);
|
|
||||||
|
|
||||||
uint32 GetGenericMaleTalkSfx(int16 sound);
|
|
||||||
uint32 GetGenericFemaleTalkSfx(int16 sound);
|
|
||||||
// end of functions returning talk sfx
|
|
||||||
|
|
||||||
void GenerateIntegerRandomNumberTable(); /// ok
|
|
||||||
char *Get3DProviderName(uint8 id) const;
|
|
||||||
uint8 GetCDAudioDriveLetter() const;
|
|
||||||
int8 GetCurrent3DProviderIndex() const; /// ok
|
|
||||||
float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // not used
|
|
||||||
float GetCollisionOneShotRatio(uint32 a, float b) const; /// ok
|
|
||||||
float GetCollisionRatio(float a, float b, float c, float d) const; /// ok
|
|
||||||
float GetDistanceSquared(CVector *v) const; /// ok
|
|
||||||
int32 GetJumboTaxiFreq() const; /// ok
|
|
||||||
bool GetMissionAudioLoadingStatus() const; /// ok
|
|
||||||
char GetMissionScriptPoliceAudioPlayingStatus() const; /// ok
|
|
||||||
uint8 GetNum3DProvidersAvailable() const;
|
|
||||||
int32 GetPedCommentSfx(CPed *ped, int32 sound);
|
|
||||||
void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset) const;
|
|
||||||
float GetVehicleDriveWheelSkidValue(uint8 a1, CAutomobile *a2, cTransmission *a3,
|
|
||||||
float a4); // todo
|
|
||||||
int32 GetVehicleNonDriveWheelSkidValue(float a1, int a2, int a3, int a4, float a5); // todo
|
|
||||||
|
|
||||||
bool HasAirBrakes(int32 model) const; /// ok
|
|
||||||
|
|
||||||
void Initialise(); /// ok
|
|
||||||
void InitialisePoliceRadio(); // todo
|
|
||||||
void InitialisePoliceRadioZones(); // todo
|
|
||||||
void InterrogateAudioEntities(); /// ok
|
|
||||||
bool IsAudioInitialised() const; /// ok
|
|
||||||
bool IsMissionAudioSampleFinished(); /// ok
|
|
||||||
bool IsMP3RadioChannelAvailable() const;
|
|
||||||
|
|
||||||
bool MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; /// ok
|
|
||||||
|
|
||||||
void PlayLoadedMissionAudio(); /// ok
|
|
||||||
void PlayOneShot(int32 index, int16 sound, float vol); // todo
|
|
||||||
uint32 PlaySuspectLastSeen(float x, float y, float z); // todo
|
|
||||||
void PlayerJustGotInCar() const; /// ok
|
|
||||||
void PlayerJustLeftCar() const; /// ok
|
|
||||||
void PostInitialiseGameSpecificSetup(); /// ok
|
|
||||||
void PostTerminateGameSpecificShutdown(); /// ok
|
|
||||||
void PreInitialiseGameSpecificSetup() const;
|
|
||||||
void PreloadMissionAudio(char *); // todo
|
|
||||||
void PreTerminateGameSpecificShutdown(); /// ok
|
|
||||||
/// processX - main logic of adding new sounds
|
|
||||||
void ProcessActiveQueues(); // todo
|
|
||||||
bool ProcessAirBrakes(cVehicleParams *params); /// ok
|
|
||||||
void ProcessAirportScriptObject(uint8 sound); /// ok
|
|
||||||
bool ProcessBoatEngine(cVehicleParams *params); /// ok
|
|
||||||
bool ProcessBoatMovingOverWater(cVehicleParams *params); /// ok
|
|
||||||
void ProcessBridge(); /// ok
|
|
||||||
void ProcessBridgeMotor(); /// ok
|
|
||||||
void ProcessBridgeOneShots(); /// ok
|
|
||||||
void ProcessBridgeWarning(); /// ok
|
|
||||||
bool ProcessCarBombTick(cVehicleParams *params); /// ok
|
|
||||||
void ProcessCesna(void *); // todo requires CPlane
|
|
||||||
void ProcessCinemaScriptObject(uint8 sound); /// ok
|
|
||||||
void ProcessCrane(); // todo requires CCrane
|
|
||||||
void ProcessDocksScriptObject(uint8 sound); /// ok
|
|
||||||
bool ProcessEngineDamage(cVehicleParams *params); /// ok
|
|
||||||
void ProcessEntity(int32 sound); /// ok
|
|
||||||
void ProcessExplosions(int32 explosion); /// ok
|
|
||||||
void ProcessFireHydrant(); /// ok
|
|
||||||
void ProcessFires(int32 entity); // todo requires gFireManager
|
|
||||||
void ProcessFrontEnd(); /// ok
|
|
||||||
void ProcessGarages(); // todo requires CGarages::aGarages
|
|
||||||
bool ProcessHelicopter(cVehicleParams *params); /// ok
|
|
||||||
void ProcessHomeScriptObject(uint8 sound); /// ok
|
|
||||||
void ProcessJumbo(cVehicleParams *); /// ok
|
|
||||||
void ProcessJumboAccel(CPlane *plane); /// ok
|
|
||||||
void ProcessJumboDecel(CPlane *plane); /// ok
|
|
||||||
void ProcessJumboFlying(); /// ok
|
|
||||||
void ProcessJumboLanding(CPlane *plane); /// ok
|
|
||||||
void ProcessJumboTakeOff(CPlane *plane); /// ok
|
|
||||||
void ProcessJumboTaxi(); /// ok
|
|
||||||
void ProcessLaunderetteScriptObject(uint8 sound); /// ok
|
|
||||||
void ProcessLoopingScriptObject(uint8 sound); /// ok
|
|
||||||
void ProcessMissionAudio(); /// ok
|
|
||||||
void ProcessModelCarEngine(cVehicleParams *params); /// ok (check float comparisons)
|
|
||||||
void ProcessOneShotScriptObject(uint8 sound); /// ok
|
|
||||||
void ProcessPed(CPhysical *ped); /// ok
|
|
||||||
void ProcessPedHeadphones(cPedParams *params); /// ok
|
|
||||||
void ProcessPedOneShots(cPedParams *params); // todo later (weird)
|
|
||||||
void ProcessPhysical(int32 id); /// ok
|
|
||||||
void ProcessPlane(cVehicleParams *params); /// ok
|
|
||||||
void ProcessPlayersVehicleEngine(cVehicleParams *params,
|
|
||||||
CAutomobile *automobile); /// ok (check float comparisons)
|
|
||||||
void ProcessPoliceCellBeatingScriptObject(uint8 sound); // todo
|
|
||||||
void ProcessPornCinema(uint8 sound); /// ok
|
|
||||||
void ProcessProjectiles(); // todo requires CProjectileInfo
|
|
||||||
void ProcessRainOnVehicle(cVehicleParams *params); /// ok
|
|
||||||
void ProcessReverb() const; /// ok
|
|
||||||
bool ProcessReverseGear(cVehicleParams *a2); /// ok
|
|
||||||
void ProcessSawMillScriptObject(uint8 sound); /// ok
|
|
||||||
void ProcessScriptObject(int32 id); /// ok
|
|
||||||
void ProcessShopScriptObject(uint8 sound); /// ok
|
|
||||||
void ProcessSpecial(); /// ok
|
|
||||||
bool ProcessTrainNoise(cVehicleParams *params); /// ok
|
|
||||||
void ProcessVehicle(CVehicle *); // todo
|
|
||||||
bool ProcessVehicleDoors(cVehicleParams *params); /// ok
|
|
||||||
// bool ProcessVehicleEngine(void *);
|
|
||||||
// void ProcessVehicleHorn(cVehicleParams *params);
|
|
||||||
// void ProcessVehicleOneShots(void *);
|
|
||||||
bool ProcessVehicleReverseWarning(cVehicleParams *params); /// ok
|
|
||||||
bool ProcessVehicleRoadNoise(cVehicleParams *params); /// ok
|
|
||||||
// void ProcessVehicleSirenOrAlarm(void *);
|
|
||||||
// void ProcessVehicleSkidding(void *);
|
|
||||||
void ProcessWaterCannon(int32); // todo
|
|
||||||
void ProcessWeather(int32 id); /// ok
|
|
||||||
bool ProcessWetRoadNoise(cVehicleParams *params); /// ok
|
|
||||||
void ProcessWorkShopScriptObject(uint8 sound); /// ok
|
|
||||||
|
|
||||||
int32 RandomDisplacement(uint32 seed) const;
|
|
||||||
void ReacquireDigitalHandle() const;
|
|
||||||
void ReleaseDigitalHandle() const;
|
|
||||||
int32 ReportCollision(CEntity *a2, CEntity *a3, uint8 a4, uint8 a5, float a6,
|
|
||||||
float a7); // todo
|
|
||||||
int32 ReportCrime(int a2, int *a3); // todo
|
|
||||||
void ResetAudioLogicTimers(int32 timer); /// ok
|
|
||||||
void ResetPoliceRadio();
|
|
||||||
void ResetTimers(unsigned int a2); // todo
|
|
||||||
|
|
||||||
void Service(); // todo
|
|
||||||
void ServiceCollisions(); // todo
|
|
||||||
void ServicePoliceRadio(); // todo
|
|
||||||
void ServicePoliceRadioChannel(int a2); // todo
|
|
||||||
void ServiceSoundEffects(); // todo
|
|
||||||
void SetDynamicAcousticModelingStatus(bool status);
|
|
||||||
void SetEffectsFadeVolume(uint8 volume) const;
|
|
||||||
void SetEffectsMasterVolume(uint8 volume) const;
|
|
||||||
void SetEntityStatus(int32 id, bool status);
|
|
||||||
uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(int32); // todo
|
|
||||||
void SetMissionAudioLocation(float x, float y, float z);
|
|
||||||
void SetMissionScriptPoliceAudio(int32 sfx) const;
|
|
||||||
void SetMonoMode(uint8); // todo
|
|
||||||
void SetMusicFadeVolume(uint8 volume) const;
|
|
||||||
void SetMusicMasterVolume(uint8 volume) const;
|
|
||||||
void SetSpeakerConfig(int32 conf) const;
|
|
||||||
void SetUpLoopingCollisionSound(int a2, int a3); // todo
|
|
||||||
void SetUpOneShotCollisionSound(int a2); // todo
|
|
||||||
void SetupCrimeReport(); // todo
|
|
||||||
bool SetupJumboEngineSound(uint8, int32); // todo
|
|
||||||
bool SetupJumboFlySound(uint8 emittingVol); /// ok
|
|
||||||
bool SetupJumboRumbleSound(uint8 emittingVol); /// ok
|
|
||||||
bool SetupJumboTaxiSound(uint8 vol); /// ok
|
|
||||||
bool SetupJumboWhineSound(uint8 emittingVol, int32 freq); /// ok
|
|
||||||
void SetupPedComments(cPedParams *params, uint32 sound); /// ok
|
|
||||||
void SetupSuspectLastSeenReport(); // todo
|
|
||||||
|
|
||||||
void Terminate();
|
|
||||||
void TranslateEntity(CVector *v1, CVector *v2) const; /// ok
|
|
||||||
|
|
||||||
void UpdateGasPedalAudio(CAutomobile *automobile); // todo hook
|
|
||||||
bool UsesReverseWarning(int32 model) const;
|
|
||||||
bool UsesSiren(int32 model) const;
|
|
||||||
bool UsesSirenSwitching(int32 model) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
|
|
||||||
|
|
||||||
extern cAudioManager &AudioManager;
|
|
||||||
|
|
@ -7,9 +7,6 @@
|
||||||
|
|
||||||
cDMAudio &DMAudio = *(cDMAudio*)0x95CDBE;
|
cDMAudio &DMAudio = *(cDMAudio*)0x95CDBE;
|
||||||
|
|
||||||
#define AEHANDLE_IS_FAILED(h) ((h)<0)
|
|
||||||
#define AEHANDLE_IS_OK(h) ((h)>=0)
|
|
||||||
|
|
||||||
void
|
void
|
||||||
cDMAudio::Initialise(void)
|
cDMAudio::Initialise(void)
|
||||||
{
|
{
|
||||||
|
|
@ -167,7 +164,7 @@ cDMAudio::IsAudioInitialised(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cDMAudio::ReportCrime(eCrimeType crime, CVector const &pos)
|
cDMAudio::ReportCrime(eCrimeType crime, const CVector &pos)
|
||||||
{
|
{
|
||||||
AudioManager.ReportCrime(crime, &pos);
|
AudioManager.ReportCrime(crime, &pos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -174,6 +174,9 @@ enum eSound : int16
|
||||||
SOUND_TOTAL_PED_SOUNDS = 167,
|
SOUND_TOTAL_PED_SOUNDS = 167,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define AEHANDLE_IS_FAILED(h) ((h)<0)
|
||||||
|
#define AEHANDLE_IS_OK(h) ((h)>=0)
|
||||||
|
|
||||||
class cAudioScriptObject;
|
class cAudioScriptObject;
|
||||||
class CEntity;
|
class CEntity;
|
||||||
enum eCrimeType;
|
enum eCrimeType;
|
||||||
|
|
|
||||||
|
|
@ -158,14 +158,14 @@ release_existing()
|
||||||
if ( opened_samples[i] )
|
if ( opened_samples[i] )
|
||||||
{
|
{
|
||||||
AIL_release_3D_sample_handle(opened_samples[i]);
|
AIL_release_3D_sample_handle(opened_samples[i]);
|
||||||
opened_samples[i] = 0;
|
opened_samples[i] = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( opened_provider )
|
if ( opened_provider )
|
||||||
{
|
{
|
||||||
AIL_close_3D_provider(opened_provider);
|
AIL_close_3D_provider(opened_provider);
|
||||||
opened_provider = 0;
|
opened_provider = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
_fPrevEaxRatioDestination = 0.0f;
|
_fPrevEaxRatioDestination = 0.0f;
|
||||||
|
|
@ -879,7 +879,7 @@ cSampleManager::Initialise(void)
|
||||||
|
|
||||||
_maxSamples = 0;
|
_maxSamples = 0;
|
||||||
|
|
||||||
opened_provider = 0;
|
opened_provider = NULL;
|
||||||
DIG = NULL;
|
DIG = NULL;
|
||||||
|
|
||||||
for ( int32 i = 0; i < MAXCHANNELS; i++ )
|
for ( int32 i = 0; i < MAXCHANNELS; i++ )
|
||||||
|
|
@ -2020,9 +2020,10 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
||||||
{
|
{
|
||||||
uint32 i = 0;
|
uint32 i = 0;
|
||||||
|
|
||||||
|
if ( !_bIsMp3Active ) goto FIND_MP3TRACK;
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
if(_bIsMp3Active){
|
|
||||||
if ( ++_CurMP3Index >= nNumMP3s )
|
if ( ++_CurMP3Index >= nNumMP3s )
|
||||||
_CurMP3Index = 0;
|
_CurMP3Index = 0;
|
||||||
|
|
||||||
|
|
@ -2058,12 +2059,18 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
||||||
AIL_pause_stream(mp3Stream[nStream], 0);
|
AIL_pause_stream(mp3Stream[nStream], 0);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if(nPos > nStreamLength[STREAMED_SOUND_RADIO_MP3_PLAYER]) position = 0;
|
goto NEXT_MP3TRACK;
|
||||||
|
|
||||||
|
FIND_MP3TRACK:
|
||||||
|
if ( nPos > nStreamLength[STREAMED_SOUND_RADIO_MP3_PLAYER] )
|
||||||
|
position = 0;
|
||||||
|
|
||||||
tMP3Entry *e;
|
tMP3Entry *e;
|
||||||
if(!_GetMP3PosFromStreamPos(&position, &e)) {
|
if ( !_GetMP3PosFromStreamPos(&position, &e) )
|
||||||
if(e == NULL) {
|
{
|
||||||
|
if ( e == NULL )
|
||||||
|
{
|
||||||
nFile = 0;
|
nFile = 0;
|
||||||
goto PLAY_STREAMEDTRACK;
|
goto PLAY_STREAMEDTRACK;
|
||||||
}
|
}
|
||||||
|
|
@ -2090,12 +2097,14 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NEXT_MP3TRACK:
|
||||||
_bIsMp3Active = false;
|
_bIsMp3Active = false;
|
||||||
|
|
||||||
} while ( ++i < nNumMP3s );
|
} while ( ++i < nNumMP3s );
|
||||||
|
|
||||||
position = 0;
|
position = 0;
|
||||||
nFile = 0;
|
nFile = 0;
|
||||||
|
goto PLAY_STREAMEDTRACK;
|
||||||
}
|
}
|
||||||
|
|
||||||
PLAY_STREAMEDTRACK:
|
PLAY_STREAMEDTRACK:
|
||||||
|
|
|
||||||
|
|
@ -1263,9 +1263,7 @@ CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode
|
||||||
static CPathNode *apNodesToBeCleared[4995];
|
static CPathNode *apNodesToBeCleared[4995];
|
||||||
|
|
||||||
void
|
void
|
||||||
CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector target,
|
CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector target, CPathNode **nodes, int16 *pNumNodes, int16 maxNumNodes, CVehicle *vehicle, float *pDist, float distLimit, int32 forcedTargetNode)
|
||||||
CPathNode **nodes, int16 *pNumNodes, int16 maxNumNodes, CVehicle *vehicle,
|
|
||||||
float *pDist, float distLimit, int32 forcedTargetNode)
|
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
|
|
@ -1275,11 +1273,8 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
|
||||||
targetNode = FindNodeClosestToCoors(target, type, distLimit);
|
targetNode = FindNodeClosestToCoors(target, type, distLimit);
|
||||||
else
|
else
|
||||||
targetNode = forcedTargetNode;
|
targetNode = forcedTargetNode;
|
||||||
if(targetNode < 0) {
|
if(targetNode < 0)
|
||||||
*pNumNodes = 0;
|
goto fail;
|
||||||
if(pDist) *pDist = 100000.0f;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find start
|
// Find start
|
||||||
int numPathsToTry;
|
int numPathsToTry;
|
||||||
|
|
@ -1289,37 +1284,30 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
|
||||||
startObj = FindRoadObjectClosestToCoors(start, type);
|
startObj = FindRoadObjectClosestToCoors(start, type);
|
||||||
numPathsToTry = 0;
|
numPathsToTry = 0;
|
||||||
for(i = 0; i < 12; i++){
|
for(i = 0; i < 12; i++){
|
||||||
if(startObj->m_nodeIndices[type][i] < 0) break;
|
if(startObj->m_nodeIndices[type][i] < 0)
|
||||||
if(m_pathNodes[startObj->m_nodeIndices[type][i]].group ==
|
break;
|
||||||
m_pathNodes[targetNode].group)
|
if(m_pathNodes[startObj->m_nodeIndices[type][i]].group == m_pathNodes[targetNode].group)
|
||||||
numPathsToTry++;
|
numPathsToTry++;
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
numPathsToTry = 1;
|
numPathsToTry = 1;
|
||||||
startObj = m_mapObjects[m_pathNodes[startNodeId].objectIndex];
|
startObj = m_mapObjects[m_pathNodes[startNodeId].objectIndex];
|
||||||
}
|
}
|
||||||
if(numPathsToTry == 0) {
|
if(numPathsToTry == 0)
|
||||||
*pNumNodes = 0;
|
goto fail;
|
||||||
if(pDist) *pDist = 100000.0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(startNodeId < 0){
|
if(startNodeId < 0){
|
||||||
// why only check node 0?
|
// why only check node 0?
|
||||||
if(m_pathNodes[startObj->m_nodeIndices[type][0]].group !=
|
if(m_pathNodes[startObj->m_nodeIndices[type][0]].group != m_pathNodes[targetNode].group)
|
||||||
m_pathNodes[targetNode].group) {
|
goto fail;
|
||||||
*pNumNodes = 0;
|
|
||||||
if(pDist) *pDist = 100000.0f;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}else{
|
}else{
|
||||||
if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group) {
|
if(m_pathNodes[startNodeId].group != m_pathNodes[targetNode].group)
|
||||||
*pNumNodes = 0;
|
goto fail;
|
||||||
if(pDist) *pDist = 100000.0f;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < 512; i++) m_searchNodes[i].next = nil;
|
|
||||||
|
for(i = 0; i < 512; i++)
|
||||||
|
m_searchNodes[i].next = nil;
|
||||||
AddNodeToList(&m_pathNodes[targetNode], 0);
|
AddNodeToList(&m_pathNodes[targetNode], 0);
|
||||||
int numNodesToBeCleared = 0;
|
int numNodesToBeCleared = 0;
|
||||||
apNodesToBeCleared[numNodesToBeCleared++] = &m_pathNodes[targetNode];
|
apNodesToBeCleared[numNodesToBeCleared++] = &m_pathNodes[targetNode];
|
||||||
|
|
@ -1395,6 +1383,11 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
|
||||||
for(i = 0; i < numNodesToBeCleared; i++)
|
for(i = 0; i < numNodesToBeCleared; i++)
|
||||||
apNodesToBeCleared[i]->distance = MAX_DIST;
|
apNodesToBeCleared[i]->distance = MAX_DIST;
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
fail:
|
||||||
|
*pNumNodes = 0;
|
||||||
|
if(pDist)
|
||||||
|
*pDist = 100000.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
static CPathNode *pNodeList[32];
|
static CPathNode *pNodeList[32];
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue