mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 04:00:00 +00:00
Merge branch 'master' of github.com:GTAmodding/re3
This commit is contained in:
commit
81e462b677
|
@ -346,7 +346,7 @@ void CWeather::AddRain()
|
||||||
pos.y = CGeneral::GetRandomNumberInRange(DROPLETS_TOP_OFFSET, screen_height - DROPLETS_TOP_OFFSET);
|
pos.y = CGeneral::GetRandomNumberInRange(DROPLETS_TOP_OFFSET, screen_height - DROPLETS_TOP_OFFSET);
|
||||||
pos.z = 0.0f;
|
pos.z = 0.0f;
|
||||||
CParticle::AddParticle(PARTICLE_RAINDROP_2D, pos, CVector(0.0f, 0.0f, 0.0f), nil, CGeneral::GetRandomNumberInRange(0.5f, 0.9f),
|
CParticle::AddParticle(PARTICLE_RAINDROP_2D, pos, CVector(0.0f, 0.0f, 0.0f), nil, CGeneral::GetRandomNumberInRange(0.5f, 0.9f),
|
||||||
colour, CGeneral::GetRandomNumberInRange(-10, 10), 360 - rain_angle + CGeneral::GetRandomNumberInRange(-30, 30), cur_frame, 0);
|
colour, CGeneral::GetRandomNumberInRange(-10, 10), 360 - rain_angle + CGeneral::GetRandomNumberInRange(-30, 30), cur_frame, 50);
|
||||||
}
|
}
|
||||||
int num_splash_attempts = (int)(3 * Rain) + 1;
|
int num_splash_attempts = (int)(3 * Rain) + 1;
|
||||||
int num_splashes = (int)(3 * Rain) + 4;
|
int num_splashes = (int)(3 * Rain) + 4;
|
||||||
|
|
|
@ -108,10 +108,17 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
|
||||||
CVector fireOffset(0.0f, 0.0f, 0.6f);
|
CVector fireOffset(0.0f, 0.0f, 0.6f);
|
||||||
CVector *source = fireSource;
|
CVector *source = fireSource;
|
||||||
|
|
||||||
if (!fireSource) {
|
if (!fireSource)
|
||||||
|
{
|
||||||
|
fireOffset = shooter->GetMatrix() * fireOffset;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
static CVector tmp;
|
static CVector tmp;
|
||||||
tmp = shooter->GetMatrix() * fireOffset;
|
tmp = fireOffset;
|
||||||
source = &tmp;
|
source = &tmp;
|
||||||
|
#else
|
||||||
|
source = &fireOffset;
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
if ( m_bAddRotOffset )
|
if ( m_bAddRotOffset )
|
||||||
{
|
{
|
||||||
|
@ -1166,6 +1173,7 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
|
||||||
{
|
{
|
||||||
float shootAngle = DEGTORAD(7.5f*i + shooterAngle - 15.0f);
|
float shootAngle = DEGTORAD(7.5f*i + shooterAngle - 15.0f);
|
||||||
CVector2D shootRot(-Sin(shootAngle), Cos(shootAngle));
|
CVector2D shootRot(-Sin(shootAngle), Cos(shootAngle));
|
||||||
|
shootRot.Normalise();
|
||||||
|
|
||||||
CVector source, target;
|
CVector source, target;
|
||||||
CColPoint point;
|
CColPoint point;
|
||||||
|
|
Loading…
Reference in a new issue