[Widelands-cvs] SF.net SVN: widelands:[4732] trunk/src/logic/militarysite.cc

[<si...@us...>]

Revision: 4732
          http://widelands.svn.sourceforge.net/widelands/?rev=4732&view=rev
Author:   sigra
Date:     2009-11-28 18:33:15 +0000 (Sat, 28 Nov 2009)

Log Message:
-----------
Without this alias test, militarysites will always be destroyed because they protect themselves and the change in revision 4724 makes no sense (that commit message actually said "other militarysites of that player"). It also seems like the code could make a militarysite of another player have effect.

Revision Links:
--------------
    http://widelands.svn.sourceforge.net/widelands/?rev=4724&view=rev

Modified Paths:
--------------
    trunk/src/logic/militarysite.cc

Modified: trunk/src/logic/militarysite.cc
===================================================================
--- trunk/src/logic/militarysite.cc	2009-11-28 16:50:32 UTC (rev 4731)
+++ trunk/src/logic/militarysite.cc	2009-11-28 18:33:15 UTC (rev 4732)
@@ -544,10 +544,10 @@
 		const Coords   coords = get_position();
 		{
 			char message[2048];
-				snprintf
-					(message, sizeof(message),
-					 _("The enemy defeated your soldiers at the %s."),
-					 descname().c_str());
+			snprintf
+				(message, sizeof(message),
+				 _("The enemy defeated your soldiers at the %s."),
+				 descname().c_str());
 			MessageQueue::add
 				(owner(),
 				 Message
@@ -641,14 +641,13 @@
 	FCoords const fc = game.map().get_fcoords(get_position());
 	game.map().find_immovables(Area<FCoords>(fc, 3), &immovables);
 
-	for (uint32_t i = 0; i < immovables.size(); ++i) {
-		const BaseImmovable & base_immovable = *immovables[i].object;
-		if (upcast(MilitarySite const, militarysite, &base_immovable)) {
-			if (get_size() <= militarysite->get_size()) {
+	for (uint32_t i = 0; i < immovables.size(); ++i)
+		if (upcast(MilitarySite const, militarysite, immovables[i].object))
+			if
+				(this       !=  militarysite          and
+				 &owner  () == &militarysite->owner() and
+				 get_size() <=  militarysite->get_size())
 				return true;
-			}
-		}
-	}
 	return false;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.