From 23552eb1a7a493f0fff8f57efd1903076462abdb Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Fri, 18 Oct 2013 04:55:29 +0000
Subject: [PATCH] - bugfix for particles CRC calculation for oos

---
 source/glest_game/game/game.cpp               |  1 +
 .../shared_lib/sources/graphics/particle.cpp  | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index d1ae7c3b..ac49713f 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -4941,6 +4941,7 @@ void Game::DumpCRCWorldLogIfRequired(string fileSuffix) {
 			logFile << "World CRC debug information:"  << std::endl;
 			logFile << "============================"  << std::endl;
 			logFile << "Maximum framecount: " << world.getFaction(0)->getCRC_DetailsForWorldFrameCount() << std::endl;
+			logFile << "Software version: " << glestVersionString << "-" << getCompilerNameString() << "-" << getSVNRevisionString() << std::endl;
 
 			for(unsigned int worldFrameIndex = 0; worldFrameIndex < world.getFaction(0)->getCRC_DetailsForWorldFrameCount(); ++worldFrameIndex) {
 				//factions (and their related info)
diff --git a/source/shared_lib/sources/graphics/particle.cpp b/source/shared_lib/sources/graphics/particle.cpp
index 000ad980..44b9b8d3 100644
--- a/source/shared_lib/sources/graphics/particle.cpp
+++ b/source/shared_lib/sources/graphics/particle.cpp
@@ -154,7 +154,7 @@ Checksum ParticleSystem::getCRC() {
 	crcForParticleSystem.addInt(blendMode);
 	crcForParticleSystem.addInt(state);
 	crcForParticleSystem.addInt(active);
-	crcForParticleSystem.addInt(visible);
+	//crcForParticleSystem.addInt(visible);
 	crcForParticleSystem.addInt(aliveParticleCount);
 	crcForParticleSystem.addInt(particleCount);
 
@@ -325,7 +325,7 @@ string ParticleSystem::toString() const {
 	result += "\nblendMode = " + intToStr(blendMode);
 	result += "\nstate = " + intToStr(state);
 	result += "\nactive = " + intToStr(active);
-	result += "\nvisible = " + intToStr(visible);
+	//result += "\nvisible = " + intToStr(visible);
 	result += "\naliveParticleCount = " + intToStr(aliveParticleCount);
 	result += "\nparticleCount = " + intToStr(particleCount);
 
@@ -1453,13 +1453,13 @@ void UnitParticleSystem::loadGame(const XmlNode *rootNode) {
 }
 
 Checksum UnitParticleSystem::getCRC() {
-	Checksum crcForParticleSystem = ParticleSystem::getCRC();
+	Checksum crcForParticleSystem = GameParticleSystem::getCRC();
 
 	return crcForParticleSystem;
 }
 
 string UnitParticleSystem::toString() const {
-	string result = ParticleSystem::toString();
+	string result = GameParticleSystem::toString();
 
 	result += "\nUnitParticleSystem ";
 	result += "\nradius = " + floatToStr(radius);
@@ -1687,13 +1687,13 @@ void AttackParticleSystem::loadGame(const XmlNode *rootNode) {
 }
 
 Checksum AttackParticleSystem::getCRC() {
-	Checksum crcForParticleSystem = ParticleSystem::getCRC();
+	Checksum crcForParticleSystem = GameParticleSystem::getCRC();
 
 	return crcForParticleSystem;
 }
 
 string AttackParticleSystem::toString() const {
-	string result = ParticleSystem::toString();
+	string result = GameParticleSystem::toString();
 
 	result += "\nAttackParticleSystem ";
 	result += "\nsizeNoEnergy = " + floatToStr(sizeNoEnergy);
@@ -2067,13 +2067,13 @@ void ProjectileParticleSystem::loadGame(const XmlNode *rootNode) {
 }
 
 Checksum ProjectileParticleSystem::getCRC() {
-	Checksum crcForParticleSystem = ParticleSystem::getCRC();
+	Checksum crcForParticleSystem = AttackParticleSystem::getCRC();
 
 	return crcForParticleSystem;
 }
 
 string ProjectileParticleSystem::toString() const {
-	string result = ParticleSystem::toString();
+	string result = AttackParticleSystem::toString();
 
 	result += "\nProjectileParticleSystem ";
 	if(nextParticleSystem != NULL) {
@@ -2249,13 +2249,13 @@ void SplashParticleSystem::loadGame(const XmlNode *rootNode) {
 }
 
 Checksum SplashParticleSystem::getCRC() {
-	Checksum crcForParticleSystem = ParticleSystem::getCRC();
+	Checksum crcForParticleSystem = AttackParticleSystem::getCRC();
 
 	return crcForParticleSystem;
 }
 
 string SplashParticleSystem::toString() const {
-	string result = ParticleSystem::toString();
+	string result = AttackParticleSystem::toString();
 
 	result += "\nSplashParticleSystem ";
 	if(prevParticleSystem != NULL) {