mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-20 23:21:19 +02:00
Code Issues Projects Releases Wiki Activity

attempt for big cleanup of out of synch issues, please test!

Browse Source
This commit is contained in:
Mark Vejvoda
2013-09-23 17:16:34 +00:00
parent 440ec7dd7e
commit 3a6544a257
24 changed files with 679 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/g3d_viewer/main.cpp
View File

@@ -1450,7 +1450,7 @@ void MainWindow::loadProjectileParticle(string path) {
for(std::vector<ParticleSystemTypeProjectile *>::const_iterator it= projectileParticleSystemTypes.begin();
it != projectileParticleSystemTypes.end(); ++it) {
ProjectileParticleSystem *ps = (*it)->create();
ProjectileParticleSystem *ps = (*it)->create(NULL);
if(size > 0) {
Vec3f vec = Vec3f(0.f, height / 2.f, 0.f);
@@ -1559,7 +1559,7 @@ void MainWindow::loadSplashParticle(string path) { // uses ParticleSystemTypeSp
//ParticleSystemTypeSplash
for(std::vector<ParticleSystemTypeSplash *>::const_iterator it= splashParticleSystemTypes.begin(); it != splashParticleSystemTypes.end(); ++it) {
SplashParticleSystem *ps = (*it)->create();
SplashParticleSystem *ps = (*it)->create(NULL);
if(size > 0) {
Vec3f vec = Vec3f(0.f, height / 2.f, 0.f);