- Timestamp:
- Apr 6, 2009, 1:59:00 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui merged: 2796,2798-2801,2805,2807-2808,2811,2814-2817,2834,2840-2850,2853-2854,2859,2862-2863,2869,2875,2887,2892
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc
r2851 r2896 34 34 #include "core/CoreIncludes.h" 35 35 #include "core/ConfigValueIncludes.h" 36 #include "core/ Core.h"36 #include "core/GameMode.h" 37 37 #include "core/XMLPort.h" 38 38 #include "core/Template.h" … … 245 245 this->startLocalHumanControl(); 246 246 247 if (! Core::isMaster())247 if (!GameMode::isMaster()) 248 248 { 249 249 this->client_overwrite_ = this->server_overwrite_; … … 357 357 if (!this->isDynamic()) 358 358 { 359 if ( Core::isMaster())359 if (GameMode::isMaster()) 360 360 { 361 361 this->server_position_ = this->getPosition(); … … 472 472 void ControllableEntity::setPosition(const Vector3& position) 473 473 { 474 if ( Core::isMaster())474 if (GameMode::isMaster()) 475 475 { 476 476 MobileEntity::setPosition(position); … … 487 487 void ControllableEntity::setOrientation(const Quaternion& orientation) 488 488 { 489 if ( Core::isMaster())489 if (GameMode::isMaster()) 490 490 { 491 491 MobileEntity::setOrientation(orientation); … … 502 502 void ControllableEntity::setVelocity(const Vector3& velocity) 503 503 { 504 if ( Core::isMaster())504 if (GameMode::isMaster()) 505 505 { 506 506 MobileEntity::setVelocity(velocity); … … 517 517 void ControllableEntity::setAngularVelocity(const Vector3& velocity) 518 518 { 519 if ( Core::isMaster())519 if (GameMode::isMaster()) 520 520 { 521 521 MobileEntity::setAngularVelocity(velocity); … … 533 533 { 534 534 MobileEntity::setWorldTransform(worldTrans); 535 if ( Core::isMaster())535 if (GameMode::isMaster()) 536 536 { 537 537 this->server_position_ = this->getPosition();
Note: See TracChangeset
for help on using the changeset viewer.