crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity

fix mistakes

Browse Source
This commit is contained in:
Roman Masanin 2020-10-05 17:24:57 +03:00
parent e3273d7268
commit 4fd93fea51
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/AudioLogic.cpp
View File

@ -5932,7 +5932,7 @@ cAudioManager::ProcessGarages()
void void
cAudioManager::ProcessFireHydrant() cAudioManager::ProcessFireHydrant()
{ {
static const int SOUND_INTENSITY = 35; const int SOUND_INTENSITY = 35;
float distSquared; float distSquared;

19
src/weapons/Explosion.cpp
View File

@ -25,6 +25,9 @@ CExplosion gaExplosion[NUM_EXPLOSIONS];
RwRGBA colMedExpl = { 0, 0, 0, 0 }; RwRGBA colMedExpl = { 0, 0, 0, 0 };
RwRGBA colUpdate = { 0, 0, 0, 0 }; RwRGBA colUpdate = { 0, 0, 0, 0 };
const RwRGBA colAddExplosion = { 160, 160, 160, 255 };
const RwRGBA colGrenade = { 96, 96, 96, 255 };
int AudioHandle = AEHANDLE_NONE; int AudioHandle = AEHANDLE_NONE;
void void
@ -99,15 +102,14 @@ CExplosion::GetExplosionPosition(uint8 id)
} }
bool bool
CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool isMakeSound) CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool makeSound)
{ {
const RwRGBA color = { 160, 160, 160, 255 };
const RwRGBA colorGrenade = { 96, 96, 96, 255 };
CVector pPosn; CVector pPosn;
CVector posGround; CVector posGround;
RwRGBA colorMedium = colMedExpl; RwRGBA colorMedium = colMedExpl;
RwRGBA color = colAddExplosion;
RwRGBA colorGrenade = colGrenade;
bool bDontExplode = false; bool bDontExplode = false;
pPosn = pos; pPosn = pos;
pPosn.z += 5.0f; pPosn.z += 5.0f;
@ -138,7 +140,7 @@ CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionT
explosion.m_nIteration = 1; explosion.m_nIteration = 1;
explosion.m_nActiveCounter = 1; explosion.m_nActiveCounter = 1;
explosion.m_bIsBoat = false; explosion.m_bIsBoat = false;
explosion.m_bIsMakeSound = true; explosion.m_bIsMakeSound = makeSound;
explosion.m_nParticlesExpireTime = lifetime != 0 ? CTimer::GetTimeInMilliseconds() + lifetime : 0; explosion.m_nParticlesExpireTime = lifetime != 0 ? CTimer::GetTimeInMilliseconds() + lifetime : 0;
switch (type) switch (type)
{ {
@ -152,10 +154,9 @@ CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionT
CEventList::RegisterEvent(EVENT_EXPLOSION, posGround, 250); CEventList::RegisterEvent(EVENT_EXPLOSION, posGround, 250);
if (Distance(explosion.m_vecPosition, TheCamera.GetPosition()) < 40.0f) { if (Distance(explosion.m_vecPosition, TheCamera.GetPosition()) < 40.0f) {
uint8 tmp = CGeneral::GetRandomNumberInRange(0, 64) - 64; uint8 tmp = CGeneral::GetRandomNumberInRange(0, 64) - 64;
RwRGBA tmpColor = colorGrenade; colorGrenade.green += tmp;
tmpColor.green += tmp; colorGrenade.blue += tmp;
tmpColor.blue += tmp; CParticle::AddParticle(PARTICLE_EXPLOSION_LFAST, explosion.m_vecPosition, CVector(0.0f, 0.0f, 0.0f), nil, 4.5f, colorGrenade);
CParticle::AddParticle(PARTICLE_EXPLOSION_LFAST, explosion.m_vecPosition, CVector(0.0f, 0.0f, 0.0f), nil, 4.5f, tmpColor);
} }
break; break;
case EXPLOSION_MOLOTOV: case EXPLOSION_MOLOTOV:

2
src/weapons/Explosion.h
View File

@ -37,7 +37,7 @@ class CExplosion
float m_fPower; float m_fPower;
float m_fZshift; float m_fZshift;
public: public:
static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool isMakeSound = true); //done(new parametr in android ver is fix for one mission) static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool makeSound = true); //done(new parametr in android ver is fix for one mission)
static void ClearAllExplosions(); //done static void ClearAllExplosions(); //done
static bool DoesExplosionMakeSound(uint8 id); //done static bool DoesExplosionMakeSound(uint8 id); //done
static int8 GetExplosionActiveCounter(uint8 id); //done static int8 GetExplosionActiveCounter(uint8 id); //done