Changeset 8708 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 22, 2006, 12:48:01 PM (19 years ago)

Author:

bensch

Message:

merged network back
merged with command:
svn merge -r8625:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
no conflicts

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (2 diffs)
• spectator.cc (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -33 +33 @@
 
 #include "network_game_manager.h"
+#include "shared_network_data.h"
 
 #include "power_ups/weapon_power_up.h"
@@ -326 +327 @@
   Playable::tick(time);
 
-  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
+  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == SharedNetworkData::getInstance()->getHostID() )
    {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;

trunk/src/world_entities/spectator.cc

@@ -20 +20 @@
 #include "key_mapper.h"
 
+#include "shared_network_data.h"
 
 CREATE_FACTORY(Spectator, CL_SPECTATOR);
@@ -161 +162 @@
   Playable::tick( time );
   
-  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
+  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == SharedNetworkData::getInstance()->getHostID() )
   {
     xMouse *= time / 10;