Changeset 9500 in orxonox.OLD

Timestamp:

Jul 27, 2006, 12:15:06 PM (18 years ago)

Author:

bensch

Message:

compiles again, the Playables should now be able to choose their design per team

Location:

branches/proxy/src

Files:

• lib/particles/particle_system.cc (modified) (2 diffs)
• util/multiplayer_team_deathmatch.cc (modified) (2 diffs)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/playable.h (modified) (2 diffs)
• world_entities/space_ships/turbine_hover.cc (modified) (2 diffs)
• world_entities/space_ships/turbine_hover.h (modified) (1 diff)

branches/proxy/src/lib/particles/particle_system.cc

@@ -238 +238 @@
   PRINTF(4)("Color of %s::%s on timeslice %f is r:%f g:%f b:%f a:%f\n",
     this->getClassCName(), this->getCName(), lifeCycleTime, red, green, blue, alpha);
+
+  this->colorAnim[0].debug();
 }
 
@@ -466 +468 @@
            this->maxCount,
            ((this->maxCount!=0)?100*this->count/this->maxCount:0));
-  if (this->deadList)
+
+  if (likely(this->deadList != NULL))
   {
     PRINT(0)("  - ParticleDeadList is used: ");

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -489 +489 @@
 
 
-  ClassID playableClassId = getPlayableClassId( userId, stats.getPreferedTeamId() );
+  ClassID     playableClassId = getPlayableClassId( userId, stats.getPreferedTeamId() );
   std::string playableModel = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
   std::string playableTexture = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
@@ -503 +503 @@
   playable.loadMD2Texture( playableTexture );
   playable.loadModel( playableModel, playableScale );
+  playable.setTeam(stats.getPreferedTeamId());
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
   playable.setSynchronized( true );
-
-  playable.setTeam(stats.getPreferedTeamId());
 
   stats.setTeamId( stats.getPreferedTeamId() );

branches/proxy/src/world_entities/playable.cc

@@ -273 +273 @@
 }
 
+
+/**
+ * @brief sets the TeamID and all the properties needed to be visible on the Playable
+ * @param teamID: the new TeamID of the Entity
+ */
+void Playable::setTeam(int teamID)
+{
+  /// Derive this function to make it look different with differen groups.
+  PRINTF(4)("No special team specific function implemented for %s::%s in Team %d\n", this->getClassCName(), this->getCName(), teamID);
+}
+
+
 /**
  * @brief attaches the current Camera to this Playable

branches/proxy/src/world_entities/playable.h

@@ -61 +61 @@
   /** @return a List of Events in PEV_* sytle */
   inline const std::vector<int>& getEventList() { return this->events; };
+  virtual void setTeam(int teamID);
+
 
   // Camera and Playmode
@@ -87 +89 @@
   virtual void tick(float dt);
 
+
+  inline bool beFire() const { return this->bFire; }
+  inline void fire(bool bF) { this->bFire = bF;}
+
   // Transformations:
   static Playable::Playmode stringToPlaymode(const std::string& playmode);
   static const std::string& playmodeToString(Playable::Playmode playmode);
   static const std::string playmodeNames[];
-
-  inline bool beFire(){ return this->bFire; }
-  inline void fire(bool bF){ this->bFire = bF;}
 
 protected:

branches/proxy/src/world_entities/space_ships/turbine_hover.cc

@@ -236 +236 @@
 void TurbineHover::setBoostColor(const Color& color)
 {
+  printf("color:: "), color.debug();
   this->burstSystem->setColor(0.0, color);
   this->burstSystem->setColor(0.2, color * 0.6);
@@ -265 +266 @@
 
 }
+
+void TurbineHover::setTeam(int teamID)
+{
+  printf("::::::::::::::::: TEAM ::: %d\n", teamID);
+  if (teamID == 0)
+    this->setBoostColor(Color::blue);
+  else if (teamID == 1)
+    this->setBoostColor(Color::red);
+}
+
 
 

branches/proxy/src/world_entities/space_ships/turbine_hover.h

@@ -29 +29 @@
     virtual void enter();
     virtual void leave();
+
+    virtual void setTeam(int teamID);
 
     virtual void postSpawn();