Changeset 5916 for code/branches/core5/src/orxonox

Timestamp:

Oct 9, 2009, 4:41:30 PM (15 years ago)

Author:

scheusso

Message:

some cleaning up in the network
more to come

Location:

code/branches/core5/src/orxonox

Files:

• graphics/Camera.cc (modified) (1 diff)
• infos/HumanPlayer.cc (modified) (1 diff)
• worldentities/CameraPosition.cc (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (2 diffs)
• worldentities/SpawnPoint.cc (modified) (1 diff)
• worldentities/pawns/Spectator.cc (modified) (1 diff)

code/branches/core5/src/orxonox/graphics/Camera.cc

@@ -68 +68 @@
         this->nearClipDistance_ = 1;
 
-        this->setObjectMode(0x0);
+        this->setSyncMode(0x0);
 
         this->setConfigValues();

code/branches/core5/src/orxonox/infos/HumanPlayer.cc

@@ -116 +116 @@
 
             if (!GameMode::isMaster())
-                this->setObjectMode(ObjectDirection::Bidirectional);
+                this->setSyncMode(ObjectDirection::Bidirectional);
             else
                 this->setName(this->nick_);

code/branches/core5/src/orxonox/worldentities/CameraPosition.cc

@@ -46 +46 @@
         this->bRenderCamera_ = false;
 
-        this->setObjectMode(0x0);
+        this->setSyncMode(0x0);
     }
 

code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc

@@ -238 +238 @@
             {
                 this->client_overwrite_ = this->server_overwrite_;
-                this->setObjectMode(ObjectDirection::Bidirectional);
+                this->setSyncMode(ObjectDirection::Bidirectional);
             }
         }
@@ -254 +254 @@
         this->bHasLocalController_ = false;
         this->bHasHumanController_ = false;
-        this->setObjectMode(ObjectDirection::ToClient);
+        this->setSyncMode(ObjectDirection::ToClient);
 
         this->changedPlayer();

code/branches/core5/src/orxonox/worldentities/SpawnPoint.cc

@@ -50 +50 @@
             COUT(1) << "Error: SpawnPoint has no Gametype" << std::endl;
 
-        this->setObjectMode(0x0);
+        this->setSyncMode(0x0);
     }
 

code/branches/core5/src/orxonox/worldentities/pawns/Spectator.cc

@@ -145 +145 @@
         ControllableEntity::setPlayer(player);
 
-//        this->setObjectMode(ObjectDirection::ToClient);
+//        this->setSyncMode(ObjectDirection::ToClient);
     }