archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-21 17:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/miami' into miami

Browse Source
This commit is contained in:
Nikolay Korolev
2020-05-16 10:52:58 +03:00
parent 5491a51daa 76dd769085
commit 5abd466b5d
10 changed files with 321 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/render/Glass.cpp
View File

@ -13,6 +13,7 @@
#include "Shadows.h"
#include "ModelIndices.h"
#include "main.h"
#include "soundlist.h"
uint32 CGlass::NumGlassEntities;
@ -101,7 +102,7 @@ CFallingGlassPane::Update(void)
pos = CVector(GetPosition().x, GetPosition().y, m_fGroundZ);
PlayOneShotScriptObject(_SCRSOUND_GLASS_SHARD, pos);
PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_LIGHT_BREAK, pos);
RwRGBA color = { 255, 255, 255, 255 };
@ -627,7 +628,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
if ( amount > 300.0f )
{
PlayOneShotScriptObject(_SCRSOUND_GLASS_SMASH_1, object->GetPosition());
PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_BREAK_L, object->GetPosition());
GeneratePanesForWindow(0,
CVector(minx, miny, minz),
@ -637,7 +638,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
}
else
{
PlayOneShotScriptObject(_SCRSOUND_GLASS_SMASH_2, object->GetPosition());
PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_BREAK_S, object->GetPosition());
GeneratePanesForWindow(1,
CVector(minx, miny, minz),
@ -659,7 +660,7 @@ CGlass::WindowRespondsToSoftCollision(CEntity *entity, float amount)
if ( amount > 50.0f && !object->bGlassCracked )
{
PlayOneShotScriptObject(_SCRSOUND_GLASS_CRACK, object->GetPosition());
PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_CRACK, object->GetPosition());
object->bGlassCracked = true;
}
}
@ -675,7 +676,7 @@ CGlass::WasGlassHitByBullet(CEntity *entity, CVector point)
{
if ( !object->bGlassCracked )
{
PlayOneShotScriptObject(_SCRSOUND_GLASS_CRACK, object->GetPosition());
PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_CRACK, object->GetPosition());
object->bGlassCracked = true;
}
else

5
src/render/Particle.cpp
View File

@ -11,6 +11,7 @@
#include "AudioScriptObject.h"
#include "ParticleObject.h"
#include "Particle.h"
#include "soundlist.h"
#define MAX_PARTICLES_ON_SCREEN (1000)
@ -1268,7 +1269,7 @@ void CParticle::Update()
nil,
particle->m_fSize, color, particle->m_nRotationStep, 0, 0, 0);
PlayOneShotScriptObject(_SCRSOUND_BULLET_SHELL_HIT_GROUND_1, particle->m_vecPosition);
PlayOneShotScriptObject(SCRIPT_SOUND_GUNSHELL_DROP, particle->m_vecPosition);
}
break;
@ -1287,7 +1288,7 @@ void CParticle::Update()
nil,
particle->m_fSize, color, 0, 0, 0, 0);
PlayOneShotScriptObject(_SCRSOUND_BULLET_SHELL_HIT_GROUND_2, particle->m_vecPosition);
PlayOneShotScriptObject(SCRIPT_SOUND_GUNSHELL_DROP_SOFT, particle->m_vecPosition);
}
break;