Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop

This commit is contained in:
titiger 2014-11-27 23:05:49 +01:00
parent 5f0714bb25 cbf9a305c5
commit 8090161fff
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/glest_game/type_instances/unit.cpp
View File

@ -5263,7 +5263,6 @@ Unit * Unit::loadGame(const XmlNode *rootNode, GameSettings *settings, Faction *
//result->fire->setTexture(CoreData::getInstance().getFireTexture());
result->fireParticleSystems.push_back(result->fire);
//Renderer::getInstance().manageParticleSystem(result->fire, rsGame);
Renderer::getInstance().addToDeferredParticleSystemList(make_pair(result->fire, rsGame));
}
@ -5388,16 +5387,18 @@ Unit * Unit::loadGame(const XmlNode *rootNode, GameSettings *settings, Faction *
for(int i = 0; i < (int)unitParticleSystemNodeList.size(); ++i) {
XmlNode *node = unitParticleSystemNodeList[i];
FireParticleSystem *ups = new FireParticleSystem();
ups->loadGame(node);
//ups->setTexture(CoreData::getInstance().getFireTexture());
result->fireParticleSystems.push_back(ups);
if(linkFireIndex != i) {
FireParticleSystem *ups = new FireParticleSystem();
ups->setParticleOwner(result);
ups->loadGame(node);
//ups->setTexture(CoreData::getInstance().getFireTexture());
result->fireParticleSystems.push_back(ups);
if(linkFireIndex >= 0 && linkFireIndex == i) {
result->fire = ups;
//if(linkFireIndex >= 0 && linkFireIndex == i) {
// result->fire = ups;
//}
Renderer::getInstance().addToDeferredParticleSystemList(make_pair(ups, rsGame));
}
//Renderer::getInstance().manageParticleSystem(result->fire, rsGame);
Renderer::getInstance().addToDeferredParticleSystemList(make_pair(ups, rsGame));
}
}

2
source/shared_lib/sources/graphics/particle.cpp
View File

@ -1452,7 +1452,7 @@ void UnitParticleSystem::loadGame(const XmlNode *rootNode) {
// Vec3f windSpeed;
windSpeed = Vec3f::strToVec3(unitParticleSystemNode->getAttribute("windSpeed")->getValue());
// Vec3f cRotation;
windSpeed = Vec3f::strToVec3(unitParticleSystemNode->getAttribute("cRotation")->getValue());
cRotation = Vec3f::strToVec3(unitParticleSystemNode->getAttribute("cRotation")->getValue());
// Vec3f fixedAddition;
fixedAddition = Vec3f::strToVec3(unitParticleSystemNode->getAttribute("fixedAddition")->getValue());
// Vec3f oldPosition;