mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-12 23:54:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
This commit is contained in:
Sergeanur 2020-05-13 00:55:52 +03:00
commit 7c2b9478d5
49 changed files with 146 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/render/Particle.cpp
View file

@ -984,6 +984,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
case PARTICLE_WATER_HYDRANT:
pParticle->m_vecPosition.z += 20.0f * psystem->m_fPositionRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE];
break;
default: break;
}
if ( fSize != 0.0f )
@ -1214,6 +1215,7 @@ void CParticle::Update()
continue;
}
break;
default: break;
}
}
}
@ -1295,6 +1297,7 @@ void CParticle::Update()
continue;
}
break;
default: break;
}
}
}