Changeset 6959 for code/branches

Timestamp:

May 21, 2010, 4:06:04 PM (15 years ago)

Author:

jo

Message:

bug removed - should be playable now

File:

• code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) (2 diffs)

code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc

@@ -92 +92 @@
         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
             
@@ -106 +106 @@
         if (!originator||!victim)
             return false;
-        if (!!originator->getPlayer()||!victim->getPlayer())
+        if (!originator->getPlayer()||!victim->getPlayer())
             return false;
         if (victim && victim->getPlayer()) //&& originator && originator->getPlayer() ??