Changeset 9455 in orxonox.OLD for branches

Timestamp:

Jul 25, 2006, 2:16:40 PM (18 years ago)

Author:

bensch

Message:

high dynamic loading of network entities improoved

Location:

branches/proxy/src

Files:

• util/multiplayer_team_deathmatch.cc (modified) (2 diffs)
• world_entities/spawning_point.cc (modified) (1 diff)
• world_entities/spawning_point.h (modified) (2 diffs)

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -306 +306 @@
 
   if ( team == 0 || team == 1 )
-    return CL_FPS_PLAYER;
+    return CL_TURBINE_HOVER;
 
   assert( false );
@@ -313 +313 @@
 std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, ClassID classId )
 {
+  if (classId == CL_TURBINE_HOVER)
+   return "models/ships/hoverglider_mainbody.obj";
   if ( team == 0 )
     return "models/creatures/doom_guy.md2";

branches/proxy/src/world_entities/spawning_point.cc

@@ -201 +201 @@
  * Just override this function with whatever you want to be drawn.
  */
-void SpawningPoint::draw()
+void SpawningPoint::draw() const
 {
 }

branches/proxy/src/world_entities/spawning_point.h

@@ -50 +50 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    inline int getTeamId(){ return this->teamId; }
-    inline void setTeamId( int teamId ){ this->teamId = teamId; }
+    inline int getTeamId() const { return this->teamId; }
+    inline void setTeamId( int teamId ) { this->teamId = teamId; }
 
     void pushEntity(Playable* entity, float delay = 0);
@@ -63 +63 @@
 
     virtual void tick(float dt);
-    virtual void draw();
+    virtual void draw() const;
 
 
   private:
     void spawn(Playable* entity);
-    
+
     void sendRespawnMessage( int uniqueId );
     static bool respawnMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );