* Apply fixed patch by colorblind, doesn't desync the game anymore after choosing resign.

* Reapply part of my fix for com dies game ends exploit. (I assume it was wrongly merged out in r1354?)



git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@1434 37977431-3df6-0310-b722-df95706aa16b

Author: tvo

rts/Game/Team.cpp

@@ -173,6 +173,20 @@ void CTeam::Update()
 		lastStatSave+=480;
 		statHistory.push_back(currentStats);
 	}
+
+	/* Kill the player on 'com dies = game ends' games.  This can't be done in
+	CTeam::CommanderDied anymore, because that function is called in
+	CUnit::ChangeTeam(), hence it'd cause a random amount of the shared units
+	to be killed if the commander is among them. Also, ".take" would kill all
+	units once it transfered the commander. */
+	if(gs->gameMode==1 && numCommanders<=0){
+		for(list<CUnit*>::iterator ui=uh->activeUnits.begin();ui!=uh->activeUnits.end();++ui){
+			if((*ui)->team==teamNum && !(*ui)->unitDef->isCommander)
+				(*ui)->KillUnit(true,false,0);
+		}
+		// Set to 1 to prevent above loop from being done every update.
+		numCommanders = 1;
+	}
 }
 
 void CTeam::AddUnit(CUnit* unit,AddType type)
@@ -226,10 +240,4 @@ void CTeam::CommanderDied(CUnit* commander)
 {
 	assert(commander->unitDef->isCommander);
 	--numCommanders;
-	if(gs->gameMode==1 && numCommanders<=0){
-		for(list<CUnit*>::iterator ui=uh->activeUnits.begin();ui!=uh->activeUnits.end();++ui){
-			if((*ui)->team==teamNum)
-				(*ui)->KillUnit(true,false,0);
-		}
-	}
 }

rts/Game/UI/QuitBox.cpp

@@ -194,15 +194,15 @@ void CQuitBox::MouseRelease(int x,int y,int button)
 
 	if(InBox(mx,my,box+resignQuitBox) || InBox(mx,my,box+resignBox) || InBox(mx,my,box+giveAwayBox) && !gs->Team(shareTeam)->isDead && !gs->Team(gu->myTeam)->isDead){
 		set<CUnit*>* tu=&gs->Team(gu->myTeam)->units;
+		//select all units
+		selectedUnits.ClearSelected();
+		for(set<CUnit*>::iterator ui=tu->begin();ui!=tu->end();++ui){
+			selectedUnits.AddUnit(*ui);
+		}
+		Command c;
 		// give away all units (and resources)
 		if(InBox(mx,my,box+giveAwayBox)){
-			//select all units
-			selectedUnits.ClearSelected();
-			for(set<CUnit*>::iterator ui=tu->begin();ui!=tu->end();++ui){
-				selectedUnits.AddUnit(*ui);
-			}
 			//make sure the units are stopped and that the selection is transmitted
-			Command c;
 			c.id=CMD_STOP;
 			selectedUnits.GiveCommand(c,false);
 			net->SendData<unsigned char, unsigned char, unsigned char, float, float>(
@@ -218,10 +218,10 @@ void CQuitBox::MouseRelease(int x,int y,int button)
 			net->SendSTLData<unsigned char, std::string>(NETMSG_CHAT, gu->myPlayerNum, givenAwayMsg);
 		}
 		// resign, so self-d all units
-		if(InBox(mx,my,box+resignQuitBox) || InBox(mx,my,box+resignBox))
-			for(set<CUnit*>::iterator ui=tu->begin();ui!=tu->end();++ui){
-				(*ui)->KillUnit(true,false,0);
-			}
+		if(InBox(mx,my,box+resignQuitBox) || InBox(mx,my,box+resignBox)) {
+			c.id=CMD_SELFD;
+			selectedUnits.GiveCommand(c,false);
+		}
 		// (resign and) quit, so leave the game
 		if(InBox(mx,my,box+resignQuitBox)){
 			info->AddLine("User exited");