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

- added code to merge duplicate sounds used in a techtree

Browse Source
This commit is contained in:
Mark Vejvoda
2011-05-06 07:47:31 +00:00
parent c258dc0822
commit e34e70a0c8
31 changed files with 330 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/g3d_viewer/main.cpp
View File

@@ -1113,8 +1113,8 @@ void MainWindow::loadParticle(string path) {
// std::cout << "About to load [" << particlePath << "] from [" << dir << "] unit [" << unitXML << "]" << std::endl;
std::map<string,vector<string> > loadedFileList;
UnitParticleSystemType *unitParticleSystemType= new UnitParticleSystemType();
std::map<string,vector<pair<string, string> > > loadedFileList;
UnitParticleSystemType *unitParticleSystemType = new UnitParticleSystemType();
unitParticleSystemType->load(dir, dir + folderDelimiter + particlePath,
renderer,loadedFileList,"g3dviewer");
unitParticleSystemTypes.push_back(unitParticleSystemType);
@@ -1210,7 +1210,7 @@ void MainWindow::loadProjectileParticle(string path) {
// std::cout << "Loaded successfully, loading values..." << std::endl;
std::map<string,vector<string> > loadedFileList;
std::map<string,vector<pair<string, string> > > loadedFileList;
ParticleSystemTypeProjectile *projectileParticleSystemType= new ParticleSystemTypeProjectile();
projectileParticleSystemType->load(dir,
dir + folderDelimiter + particlePath,renderer, loadedFileList,
@@ -1313,7 +1313,7 @@ void MainWindow::loadSplashParticle(string path) { // uses ParticleSystemTypeSp
// std::cout << "Loaded successfully, loading values..." << std::endl;
std::map<string,vector<string> > loadedFileList;
std::map<string,vector<pair<string, string> > > loadedFileList;
ParticleSystemTypeSplash *splashParticleSystemType= new ParticleSystemTypeSplash();
splashParticleSystemType->load(dir, dir + folderDelimiter + particlePath,renderer,
loadedFileList,"g3dviewer"); // <---- only that must be splash...