[Orxonox-commit 2243] r6959 - code/branches/dynamicmatch/src/orxonox/gametypes

[jo at orxonox.net]

Author: jo
Date: 2010-05-21 16:06:04 +0200 (Fri, 21 May 2010)
New Revision: 6959

Modified:
   code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc
Log:
bug removed - should be playable now

Modified: code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc	2010-05-21 13:19:42 UTC (rev 6958)
+++ code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc	2010-05-21 14:06:04 UTC (rev 6959)
@@ -91,8 +91,8 @@
         SetConfigValue(tutorial, true);
         static ColourValue colours[] =
         {
-            ColourValue(0.3f, 0.3f, 1.0f),	//chasercolour
-            ColourValue(1.0f, 0.3f, 0.3f),	//piggycolour
+            ColourValue(1.0f, 0.3f, 0.3f),	//chasercolour
+            ColourValue(0.3f, 0.3f, 1.0f),	//piggycolour
             ColourValue(0.3f, 1.0f, 0.3f)	//killercolour  what about black: 0.0f, 0.0f, 0.0f
             
         };
@@ -105,7 +105,7 @@
     {	//TODO: static and fading message for the "human" player's
         if (!originator||!victim)
             return false;
-        if (!!originator->getPlayer()||!victim->getPlayer())
+        if (!originator->getPlayer()||!victim->getPlayer())
             return false;
         if (victim && victim->getPlayer()) //&& originator && originator->getPlayer() ??
         {