Changeset 3086 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

May 27, 2009, 1:44:48 AM (16 years ago)

Author:

landauf

Message:

added bot-support for TeamBaseMatch (and some small fixes)

Location:

code/trunk/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.h (modified) (1 diff)
• TeamBaseMatchBase.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -147 +147 @@
     class _OrxonoxExport PawnListener : virtual public OrxonoxClass
     {
-        friend class Pawn;
-
         public:
             PawnListener();
             virtual ~PawnListener() {}
 
-        protected:
             virtual void destroyedPawn(Pawn* pawn) = 0;
     };

code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc

@@ -48 +48 @@
             gametype->addBase(this);
         }
+
+        this->setRadarObjectShape(RadarViewable::Triangle);
     }
 
@@ -70 +72 @@
             case BaseState::uncontrolled:
             default:
-                colour = ColourValue(0.5, 0.5, 0.7, 1.0);
+                colour = ColourValue(0.5, 0.5, 0.5, 1.0);
                 break;
         }
@@ -84 +86 @@
             }
         }
+
+        this->setRadarObjectColour(colour);
+
+        // Call this so bots stop shooting at the base after they converted it
+        for (ObjectList<PawnListener>::iterator it = ObjectList<PawnListener>::begin(); it != ObjectList<PawnListener>::end(); ++it)
+            it->destroyedPawn(this);
     }
 }