Merge branch 'release' into develop

Author: hoijui

rts/CMakeLists.txt

@@ -24,6 +24,15 @@ endif (TRACE_SYNC)
 SET(SYNCDEBUG FALSE CACHE BOOL "Enable sync debugger (needs SYNCCHECK=true)")
 if (SYNCDEBUG)
 	ADD_DEFINITIONS(-DSYNCDEBUG)
+	If     (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG2" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG3")
+		Message(FATAL_ERROR "You need CMAKE_BUILD_TYPE set to either DEBUG2 or DEBUG3 for a SYNCDEBUG build")
+	EndIf  ()
+	If     (NOT SYNCCHECK)
+		Message(FATAL_ERROR "You need SYNCCHECK=TRUE for a SYNCDEBUG build")
+	EndIf  ()
+	If     (NOT TRACE_SYNC)
+		Message(WARNING "It is recommended to use TRACE_SYNC=TRUE for a SYNCDEBUG build")
+	EndIf  ()
 endif (SYNCDEBUG)
 
 # Only used by GML build, but used in builds/GML and lib/gml

rts/ExternalAI/EngineOutHandler.h

@@ -134,17 +134,17 @@ class CEngineOutHandler : public CObject {
 	#define CATCH_AI_EXCEPTION									\
 		catch (const std::exception& e) {						\
 			CEngineOutHandler::HandleAIException(e.what());		\
-			throw;											\
+			throw e;											\
 		} catch (const std::string& s) {						\
 			CEngineOutHandler::HandleAIException(s.c_str());	\
-			throw;											\
+			throw s;											\
 		} catch (const char* s) {								\
 			CEngineOutHandler::HandleAIException(s);			\
-			throw;											\
+			throw s;											\
 		} catch (int err) {										\
 			const std::string s = IntToString(err);				\
 			CEngineOutHandler::HandleAIException(s.c_str());	\
-			throw;											\
+			throw err;											\
 		} catch (...) {											\
 			CEngineOutHandler::HandleAIException("Unknown");	\
 			throw;												\

rts/ExternalAI/Interface/SSkirmishAICallback.h

@@ -2075,18 +2075,23 @@ struct SSkirmishAICallback {
 
 	float             (CALLING_CONV *WeaponDef_getIntensity)(int skirmishAIId, int weaponDefId);
 
+	/** @deprecated only relevant for visualization */
 	float             (CALLING_CONV *WeaponDef_getThickness)(int skirmishAIId, int weaponDefId);
 
+	/** @deprecated only relevant for visualization */
 	float             (CALLING_CONV *WeaponDef_getLaserFlareSize)(int skirmishAIId, int weaponDefId);
 
+	/** @deprecated only relevant for visualization */
 	float             (CALLING_CONV *WeaponDef_getCoreThickness)(int skirmishAIId, int weaponDefId);
 
 	float             (CALLING_CONV *WeaponDef_getDuration)(int skirmishAIId, int weaponDefId);
 
+	/** @deprecated only relevant for visualization */
 	int               (CALLING_CONV *WeaponDef_getLodDistance)(int skirmishAIId, int weaponDefId);
 
 	float             (CALLING_CONV *WeaponDef_getFalloffRate)(int skirmishAIId, int weaponDefId);
 
+	/** @deprecated only relevant for visualization */
 	int               (CALLING_CONV *WeaponDef_getGraphicsType)(int skirmishAIId, int weaponDefId);
 
 	bool              (CALLING_CONV *WeaponDef_isSoundTrigger)(int skirmishAIId, int weaponDefId);

rts/Game/Game.cpp

@@ -408,7 +408,6 @@ CGame::~CGame()
 	SafeDelete(weaponDefHandler);
 	SafeDelete(damageArrayHandler);
 	SafeDelete(explGenHandler);
-	SafeDelete(gCEG);
 	SafeDelete(helper);
 	SafeDelete((mapInfo = const_cast<CMapInfo*>(mapInfo)));
 
@@ -534,7 +533,6 @@ void CGame::LoadSimulation(const std::string& mapName)
 	qf = new CQuadField();
 	damageArrayHandler = new CDamageArrayHandler();
 	explGenHandler = new CExplosionGeneratorHandler();
-	gCEG = new CCustomExplosionGenerator();
 
 	{
 		//! FIXME: these five need to be loaded before featureHandler
@@ -1739,7 +1737,7 @@ void CGame::DumpState(int newMinFrameNum, int newMaxFrameNum, int newFramePeriod
 		file << "\t\t\t\toldUpdatePos: <" << oldUpdatePos.x << ", " << oldUpdatePos.y << ", " << oldUpdatePos.z << ">\n";
 		file << "\t\t\t\toldSlowUpPos: <" << oldSlowUpPos.x << ", " << oldSlowUpPos.y << ", " << oldSlowUpPos.z << ">\n";
 		file << "\t\t\t\tmaxSpeed: " << amt->maxSpeed << ", maxWantedSpeed: " << amt->maxWantedSpeed << "\n";
-		file << "\t\t\t\tpadStatus: " << amt->padStatus << ", progressState: " << amt->progressState << "\n";
+		file << "\t\t\t\tprogressState: " << amt->progressState << "\n";
 		#endif
 	}
 	#endif
@@ -2073,10 +2071,6 @@ void CGame::ReloadCOB(const string& msg, int player)
 	LOG("Reloaded cob script for %i units", count);
 }
 
-void CGame::ReloadCEGs(const std::string& tag) {
-	gCEG->RefreshCache(tag);
-}
-
 
 
 void CGame::SelectUnits(const string& line)

rts/Game/GameServer.cpp

@@ -136,6 +136,7 @@ CGameServer::CGameServer(const std::string& hostIP, int hostPort, const GameData
 	internalSpeed = 1.0f;
 	gamePausable = true;
 	noHelperAIs = false;
+	canReconnect = false;
 	allowSpecDraw = true;
 	cheating = false;
 
@@ -264,7 +265,7 @@ CGameServer::~CGameServer()
 	if (setup->useLuaGaia && (numTeams > 0)) {
 		--numTeams;
 	}
-	demoRecorder->SetTime(serverFrameNum / 30, spring_tomsecs(spring_gettime()-serverStartTime)/1000);
+	demoRecorder->SetTime(serverFrameNum / GAME_SPEED, spring_tomsecs(spring_gettime() - serverStartTime) / 1000);
 	demoRecorder->InitializeStats(players.size(), numTeams);
 
 	// Pass the winners to the CDemoRecorder.
@@ -502,7 +503,7 @@ bool CGameServer::SendDemoData(int targetFrameNum)
 					pckt >> spectator;
 					pckt >> team;
 					pckt >> name;
-					AddAdditionalUser(name, "", true); // even though this is a demo, keep the players vector properly updated
+					AddAdditionalUser(name, "", true,(bool)spectator,(int)team); // even though this is a demo, keep the players vector properly updated
 				} catch (const netcode::UnpackPacketException& ex) {
 					Message(str(format("Warning: Discarding invalid new player packet in demo: %s") %ex.what()));
 					continue;
@@ -1171,7 +1172,8 @@ void CGameServer::ProcessPacket(const unsigned playerNum, boost::shared_ptr<cons
 			}
 		} break;
 
-		case NETMSG_LUAMSG:
+
+		case NETMSG_LUAMSG: {
 			try {
 				netcode::UnpackPacket pckt(packet, 3);
 				unsigned char playerNum;
@@ -1188,19 +1190,36 @@ void CGameServer::ProcessPacket(const unsigned playerNum, boost::shared_ptr<cons
 			} catch (const netcode::UnpackPacketException& ex) {
 				Message(str(format("Player %s sent invalid LuaMsg: %s") %players[a].name %ex.what()));
 			}
-			break;
+		} break;
+
 
 		case NETMSG_SYNCRESPONSE: {
 #ifdef SYNCCHECK
-			const int frameNum = *(int*)&inbuf[1];
+			netcode::UnpackPacket pckt(packet, 1);
+
+			unsigned char playerNum; pckt >> playerNum;
+			          int  frameNum; pckt >> frameNum;
+			unsigned  int  checkSum; pckt >> checkSum;
+
+			assert(a == playerNum);
+
 			if (outstandingSyncFrames.find(frameNum) != outstandingSyncFrames.end())
-				players[a].syncResponse[frameNum] = *(unsigned*)&inbuf[5];
-				// update players' ping (if !defined(SYNCCHECK) this is done in NETMSG_KEYFRAME)
+				players[a].syncResponse[frameNum] = checkSum;
+
+			// update player's ping (if !defined(SYNCCHECK) this is done in NETMSG_KEYFRAME)
 			if (frameNum <= serverFrameNum && frameNum > players[a].lastFrameResponse)
 				players[a].lastFrameResponse = frameNum;
+
+#ifndef NDEBUG
+			// send player <a>'s sync-response back to everybody
+			// (the only purpose of this is to allow a client to
+			// detect if it is desynced wrt. a demo-stream)
+			if ((frameNum % GAME_SPEED) == 0) {
+				Broadcast((CBaseNetProtocol::Get()).SendSyncResponse(playerNum, frameNum, checkSum));
+			}
 #endif
-		}
-			break;
+#endif
+		} break;
 
 		case NETMSG_SHARE:
 			if (inbuf[1] != a) {
@@ -2023,7 +2042,14 @@ void CGameServer::PushAction(const Action& action)
 			if (tokens.size() > 1) {
 				const std::string& name = tokens[0];
 				const std::string& password = tokens[1];
-
+				int team = 0;
+				bool spectator = true;
+				if ( tokens.size() > 2 ) {
+					spectator = (tokens[2] == "0") ? false : true;
+				}
+				if ( tokens.size() > 3 ) {
+					team = atoi(tokens[3].c_str());
+				}
 				GameParticipant gp;
 					gp.name = name;
 				// note: this must only compare by name
@@ -2040,11 +2066,15 @@ void CGameServer::PushAction(const Action& action)
 					participantIter->SetValue("password", password);
 					LOG("Changed player/spectator password: \"%s\" \"%s\"", name.c_str(), password.c_str());
 				} else {
-					AddAdditionalUser(name, password);
-					LOG("Added player/spectator password: \"%s\" \"%s\"", name.c_str(), password.c_str());
+					AddAdditionalUser(name, password, false, spectator, team);
+					std::string logstring = "Added ";
+					if ( spectator ) logstring = logstring + "spectator";
+					else logstring = logstring + "player";
+					logstring = logstring + " \"%s\" with password \"%s\", to team %d";
+					LOG(logstring.c_str(), name.c_str(), password.c_str(),team);
 				}
 			} else {
-				LOG_L(L_WARNING, "Failed to add player/spectator password. usage: /adduser <player-name> <password>");
+				LOG_L(L_WARNING, "Failed to add player/spectator password. usage: /adduser <player-name> <password> [spectator] [team]");
 			}
 		}
 	}
@@ -2243,13 +2273,13 @@ void CGameServer::KickPlayer(const int playerNum)
 }
 
 
-void CGameServer::AddAdditionalUser(const std::string& name, const std::string& passwd, bool fromDemo)
+void CGameServer::AddAdditionalUser(const std::string& name, const std::string& passwd, bool fromDemo, bool spectator, int team)
 {
 	GameParticipant buf;
 	buf.isFromDemo = fromDemo;
 	buf.name = name;
-	buf.spectator = true;
-	buf.team = 0;
+	buf.spectator = spectator;
+	buf.team = team;
 	buf.isMidgameJoin = true;
 	if (passwd.size() > 0)
 		buf.SetValue("password",passwd);
@@ -2461,4 +2491,3 @@ void CGameServer::AddToPacketCache(boost::shared_ptr<const netcode::RawPacket> &
 	}
 	packetCache.back().push_back(pckt);
 }
-

rts/Game/GameServer.h

@@ -204,6 +204,7 @@ class CGameServer
 	float minUserSpeed;
 
 	bool noHelperAIs;
+	bool canReconnect;
 	bool allowSpecDraw;
 	bool allowAdditionalPlayers;
 	bool whiteListAdditionalPlayers;
@@ -220,7 +221,7 @@ class CGameServer
 	void InternalSpeedChange(float newSpeed);
 	void UserSpeedChange(float newSpeed, int player);
 
-	void AddAdditionalUser( const std::string& name, const std::string& passwd, bool fromDemo = false );
+	void AddAdditionalUser( const std::string& name, const std::string& passwd, bool fromDemo = false, bool spectator = true, int team = 0);
 
 	bool hasLocalClient;
 	unsigned localClientNumber;
@@ -239,7 +240,6 @@ class CGameServer
 
 	mutable Threading::RecursiveMutex gameServerMutex;
 
-	bool canReconnect;
 	volatile bool gameHasStarted;
 	volatile bool generatedGameID;
 
@@ -250,4 +250,3 @@ class CGameServer
 extern CGameServer* gameServer;
 
 #endif // _GAME_SERVER_H
-

rts/Game/NetCommands.cpp

@@ -362,8 +362,10 @@ void CGame::ClientReadNet()
 				SimFrame();
 				// both NETMSG_SYNCRESPONSE and NETMSG_NEWFRAME are used for ping calculation by server
 #ifdef SYNCCHECK
-				net->Send(CBaseNetProtocol::Get().SendSyncResponse(gs->frameNum, CSyncChecker::GetChecksum()));
-				if ((gs->frameNum & 4095) == 0) {// reset checksum every ~2.5 minute gametime
+				net->Send(CBaseNetProtocol::Get().SendSyncResponse(gu->myPlayerNum, gs->frameNum, CSyncChecker::GetChecksum()));
+
+				if ((gs->frameNum & 4095) == 0) {
+					// reset checksum every 4096 frames =~ 2.5 minutes
 					CSyncChecker::NewFrame();
 				}
 #endif
@@ -375,6 +377,36 @@ void CGame::ClientReadNet()
 				break;
 			}
 
+			case NETMSG_SYNCRESPONSE: {
+#if (defined(SYNCCHECK) && !defined(NDEBUG))
+				// NOTE:
+				//     this packet is also sent during live games,
+				//     during which we should just ignore it (the
+				//     server does sync-checking for us)
+				netcode::UnpackPacket pckt(packet, 1);
+
+				unsigned char playerNum; pckt >> playerNum;
+				          int  frameNum; pckt >> frameNum;
+				unsigned  int  checkSum; pckt >> checkSum;
+
+				const unsigned int ourCheckSum = CSyncChecker::GetChecksum();
+				const char* fmtStr =
+					"[DESYNC_WARNING] checksum %x from player %d (%s)"
+					" does not match our checksum %x for frame-number %d";
+				const CPlayer* player = playerHandler->Player(playerNum);
+
+				// check if our checksum for this frame matches what
+				// player <playerNum> sent to the server at the same
+				// frame in the original game (in case of a demo)
+				if (playerNum == gu->myPlayerNum) { return; }
+				if (gs->frameNum != frameNum) { return; }
+				if (checkSum == ourCheckSum) { return; }
+
+				LOG_L(L_ERROR, fmtStr, checkSum, playerNum, player->name.c_str(), ourCheckSum, gs->frameNum);
+#endif
+			} break;
+
+
 			case NETMSG_COMMAND: {
 				try {
 					netcode::UnpackPacket pckt(packet, 1);
@@ -1041,10 +1073,13 @@ void CGame::ClientReadNet()
 					player.team = team;
 					player.playerNum = playerNum;
 					// add the new player
+					// TODO NETMSG_CREATE_NEWPLAYER perhaps add a lua hook; hook should be able to reassign the player to a team and/or create a new team/allyteam
 					playerHandler->AddPlayer(player);
 					eventHandler.PlayerAdded(player.playerNum);
 					LOG("Added new player: %s", name.c_str());
-					// TODO NETMSG_CREATE_NEWPLAYER perhaps add a lua hook; hook should be able to reassign the player to a team and/or create a new team/allyteam
+					if (!player.spectator) {
+						eventHandler.TeamChanged(player.team);
+					}
 					AddTraffic(-1, packetCode, dataLength);
 				} catch (const netcode::UnpackPacketException& ex) {
 					LOG_L(L_ERROR, "Got invalid New player message: %s", ex.what());
@@ -1071,4 +1106,3 @@ void CGame::ClientReadNet()
 		}
 	}
 }
-

rts/Game/PreGame.cpp

@@ -443,13 +443,21 @@ void CPreGame::GameDataReceived(boost::shared_ptr<const netcode::RawPacket> pack
 	LOG("Using map: %s", gameSetup->mapName.c_str());
 
 	vfsHandler->AddArchiveWithDeps(gameSetup->mapName, false);
-	archiveScanner->CheckArchive(gameSetup->mapName, gameData->GetMapChecksum());
+	try {
+		archiveScanner->CheckArchive(gameSetup->mapName, gameData->GetMapChecksum());
+	} catch (const content_error& ex) {
+		LOG_L(L_WARNING, "Incompatible map-checksum: %s", ex.what());
+	}
 
 	LOG("Using game: %s", gameSetup->modName.c_str());
 	vfsHandler->AddArchiveWithDeps(gameSetup->modName, false);
 	modArchive = archiveScanner->ArchiveFromName(gameSetup->modName);
 	LOG("Using game archive: %s", modArchive.c_str());
-	archiveScanner->CheckArchive(modArchive, gameData->GetModChecksum());
+	try {
+		archiveScanner->CheckArchive(modArchive, gameData->GetModChecksum());
+	} catch (const content_error& ex) {
+		LOG_L(L_WARNING, "Incompatible game-checksum: %s", ex.what());
+	}
 
 	if (net && net->GetDemoRecorder()) {
 		net->GetDemoRecorder()->SetName(gameSetup->mapName, gameSetup->modName);

rts/Game/SelectedUnitsAI.cpp

@@ -165,7 +165,7 @@ void CSelectedUnitsAI::GiveCommandNet(Command &c, int player)
 		CalculateGroupData(player, !!(c.options & SHIFT_KEY));
 
 		// use the vector from the middle of group to new pos as forward dir
-		const float3 pos(c.GetParam(0), c.GetParam(1), c.GetParam(3));
+		const float3 pos(c.GetParam(0), c.GetParam(1), c.GetParam(2));
 		float3 frontdir = pos - centerCoor;
 		frontdir.y = 0.0f;
 		frontdir.ANormalize();

rts/Game/SyncedGameCommands.cpp

@@ -19,6 +19,7 @@
 #include "Lua/LuaRules.h"
 #include "Sim/Misc/GlobalSynced.h"
 #include "Sim/Misc/TeamHandler.h"
+#include "Sim/Projectiles/ExplosionGenerator.h"
 #include "Sim/Units/UnitDefHandler.h"
 #include "Sim/Units/UnitHandler.h"
 #include "Sim/Units/UnitLoader.h"
@@ -180,11 +181,11 @@ class ReloadCobActionExecutor : public ISyncedActionExecutor {
 
 class ReloadCegsActionExecutor : public ISyncedActionExecutor {
 public:
-	ReloadCegsActionExecutor() : ISyncedActionExecutor("ReloadCegs",
-			"Reloads Ceg scripts", true) {}
+	ReloadCegsActionExecutor() : ISyncedActionExecutor("ReloadCEGs",
+			"Reloads CEG scripts", true) {}
 
 	void Execute(const SyncedAction& action) const {
-		game->ReloadCEGs(action.GetArgs());
+		explGenHandler->ReloadGenerators(action.GetArgs());
 	}
 };