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

- display which files contain the reference (the parents) to duplicate data in validation report

Browse Source
This commit is contained in:
Mark Vejvoda
2011-05-05 20:18:38 +00:00
parent 6492832c35
commit c258dc0822
15 changed files with 149 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/g3d_viewer/main.cpp
View File

@@ -1116,7 +1116,7 @@ void MainWindow::loadParticle(string path) {
std::map<string,vector<string> > loadedFileList;
UnitParticleSystemType *unitParticleSystemType= new UnitParticleSystemType();
unitParticleSystemType->load(dir, dir + folderDelimiter + particlePath,
renderer,loadedFileList);
renderer,loadedFileList,"g3dviewer");
unitParticleSystemTypes.push_back(unitParticleSystemType);
for(std::vector<UnitParticleSystemType *>::const_iterator it= unitParticleSystemTypes.begin(); it != unitParticleSystemTypes.end(); ++it) {
@@ -1213,7 +1213,8 @@ void MainWindow::loadProjectileParticle(string path) {
std::map<string,vector<string> > loadedFileList;
ParticleSystemTypeProjectile *projectileParticleSystemType= new ParticleSystemTypeProjectile();
projectileParticleSystemType->load(dir,
dir + folderDelimiter + particlePath,renderer, loadedFileList);
dir + folderDelimiter + particlePath,renderer, loadedFileList,
"g3dviewer");
// std::cout << "Values loaded, about to read..." << std::endl;
@@ -1315,7 +1316,7 @@ void MainWindow::loadSplashParticle(string path) { // uses ParticleSystemTypeSp
std::map<string,vector<string> > loadedFileList;
ParticleSystemTypeSplash *splashParticleSystemType= new ParticleSystemTypeSplash();
splashParticleSystemType->load(dir, dir + folderDelimiter + particlePath,renderer,
loadedFileList); // <---- only that must be splash...
loadedFileList,"g3dviewer"); // <---- only that must be splash...
// std::cout << "Values loaded, about to read..." << std::endl;