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

- cleanup some msvc++ compiler warnings

Browse Source
This commit is contained in:
SoftCoder
2013-12-22 23:15:31 -08:00
parent 3a24531ba7
commit bcaad53fbe
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/glest_game/graphics/particle_type.cpp
View File

@@ -333,8 +333,8 @@ void ParticleSystemType::loadGame(const XmlNode *rootNode) {
energyMax = particleSystemTypeNode->getAttribute("energyMax")->getIntValue(); energyMax = particleSystemTypeNode->getAttribute("energyMax")->getIntValue();
energyVar = particleSystemTypeNode->getAttribute("energyVar")->getIntValue(); energyVar = particleSystemTypeNode->getAttribute("energyVar")->getIntValue();
mode = particleSystemTypeNode->getAttribute("mode")->getValue(); mode = particleSystemTypeNode->getAttribute("mode")->getValue();
teamcolorNoEnergy = particleSystemTypeNode->getAttribute("teamcolorNoEnergy")->getIntValue(); teamcolorNoEnergy = (particleSystemTypeNode->getAttribute("teamcolorNoEnergy")->getIntValue() != 0);
teamcolorEnergy = particleSystemTypeNode->getAttribute("teamcolorEnergy")->getIntValue(); teamcolorEnergy = (particleSystemTypeNode->getAttribute("teamcolorEnergy")->getIntValue() != 0);
alternations = particleSystemTypeNode->getAttribute("alternations")->getIntValue(); alternations = particleSystemTypeNode->getAttribute("alternations")->getIntValue();
particleSystemStartDelay = particleSystemTypeNode->getAttribute("particleSystemStartDelay")->getIntValue(); particleSystemStartDelay = particleSystemTypeNode->getAttribute("particleSystemStartDelay")->getIntValue();
@@ -349,10 +349,10 @@ void ParticleSystemType::loadGame(const XmlNode *rootNode) {
} }
} }
minmaxEnabled = particleSystemTypeNode->getAttribute("minmaxEnabled")->getIntValue(); minmaxEnabled = (particleSystemTypeNode->getAttribute("minmaxEnabled")->getIntValue() != 0);
minHp = particleSystemTypeNode->getAttribute("minHp")->getIntValue(); minHp = particleSystemTypeNode->getAttribute("minHp")->getIntValue();
maxHp = particleSystemTypeNode->getAttribute("maxHp")->getIntValue(); maxHp = particleSystemTypeNode->getAttribute("maxHp")->getIntValue();
minmaxIsPercent = particleSystemTypeNode->getAttribute("minmaxIsPercent")->getIntValue(); minmaxIsPercent = (particleSystemTypeNode->getAttribute("minmaxIsPercent")->getIntValue() != 0);
} }
void ParticleSystemType::saveGame(XmlNode *rootNode) { void ParticleSystemType::saveGame(XmlNode *rootNode) {

14
source/glest_game/graphics/unit_particle_type.cpp
View File

@@ -302,14 +302,14 @@ void UnitParticleSystemType::loadGame(const XmlNode *rootNode) {
minRadius = unitParticleSystemTypeNode->getAttribute("minRadius")->getFloatValue(); minRadius = unitParticleSystemTypeNode->getAttribute("minRadius")->getFloatValue();
emissionRateFade = unitParticleSystemTypeNode->getAttribute("emissionRateFade")->getFloatValue(); emissionRateFade = unitParticleSystemTypeNode->getAttribute("emissionRateFade")->getFloatValue();
direction = Vec3f::strToVec3(unitParticleSystemTypeNode->getAttribute("direction")->getValue()); direction = Vec3f::strToVec3(unitParticleSystemTypeNode->getAttribute("direction")->getValue());
relative = unitParticleSystemTypeNode->getAttribute("relative")->getIntValue(); relative = (unitParticleSystemTypeNode->getAttribute("relative")->getIntValue() != 0);
relativeDirection = unitParticleSystemTypeNode->getAttribute("relativeDirection")->getIntValue(); relativeDirection = (unitParticleSystemTypeNode->getAttribute("relativeDirection")->getIntValue() != 0);
fixed = unitParticleSystemTypeNode->getAttribute("fixed")->getIntValue(); fixed = (unitParticleSystemTypeNode->getAttribute("fixed")->getIntValue() != 0);
staticParticleCount = unitParticleSystemTypeNode->getAttribute("staticParticleCount")->getIntValue(); staticParticleCount = unitParticleSystemTypeNode->getAttribute("staticParticleCount")->getIntValue();
isVisibleAtNight = unitParticleSystemTypeNode->getAttribute("isVisibleAtNight")->getIntValue(); isVisibleAtNight = (unitParticleSystemTypeNode->getAttribute("isVisibleAtNight")->getIntValue() != 0);
isVisibleAtDay = unitParticleSystemTypeNode->getAttribute("isVisibleAtDay")->getIntValue(); isVisibleAtDay = (unitParticleSystemTypeNode->getAttribute("isVisibleAtDay")->getIntValue() != 0);
isDaylightAffected = unitParticleSystemTypeNode->getAttribute("isDaylightAffected")->getIntValue(); isDaylightAffected = (unitParticleSystemTypeNode->getAttribute("isDaylightAffected")->getIntValue() != 0);
radiusBasedStartenergy = unitParticleSystemTypeNode->getAttribute("radiusBasedStartenergy")->getIntValue(); radiusBasedStartenergy = (unitParticleSystemTypeNode->getAttribute("radiusBasedStartenergy")->getIntValue() != 0);
delay = unitParticleSystemTypeNode->getAttribute("delay")->getIntValue(); delay = unitParticleSystemTypeNode->getAttribute("delay")->getIntValue();
lifetime = unitParticleSystemTypeNode->getAttribute("lifetime")->getIntValue(); lifetime = unitParticleSystemTypeNode->getAttribute("lifetime")->getIntValue();
startTime = unitParticleSystemTypeNode->getAttribute("startTime")->getFloatValue(); startTime = unitParticleSystemTypeNode->getAttribute("startTime")->getFloatValue();