Changeset 10624 for code/trunk/src/orxonox/infos/GametypeInfo.cc
- Timestamp:
- Oct 4, 2015, 9:12:21 PM (9 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
-
code/trunk/src/orxonox/infos/GametypeInfo.cc
r9667 r10624 37 37 #include "core/GameMode.h" 38 38 #include "network/Host.h" 39 #include "network/NetworkFunction .h"39 #include "network/NetworkFunctionIncludes.h" 40 40 #include "util/Convert.h" 41 41 … … 369 369 this->changedReadyToSpawn(ready); 370 370 else 371 callMemberNetworkFunction( GametypeInfo,changedReadyToSpawn, this->getObjectID(), player->getClientID(), ready);371 callMemberNetworkFunction(&GametypeInfo::changedReadyToSpawn, this->getObjectID(), player->getClientID(), ready); 372 372 } 373 373 } … … 388 388 this->changedSpawned(spawned); 389 389 else 390 callMemberNetworkFunction( GametypeInfo,changedSpawned, this->getObjectID(), player->getClientID(), spawned);390 callMemberNetworkFunction(&GametypeInfo::changedSpawned, this->getObjectID(), player->getClientID(), spawned); 391 391 } 392 392 } … … 399 399 if (GameMode::isMaster()) 400 400 { 401 callMemberNetworkFunction( GametypeInfo,dispatchAnnounceMessage, this->getObjectID(), NETWORK_PEER_ID_BROADCAST, message);401 callMemberNetworkFunction(&GametypeInfo::dispatchAnnounceMessage, this->getObjectID(), NETWORK_PEER_ID_BROADCAST, message); 402 402 this->dispatchAnnounceMessage(message); 403 403 } … … 411 411 this->dispatchAnnounceMessage(message); 412 412 else 413 callMemberNetworkFunction( GametypeInfo,dispatchAnnounceMessage, this->getObjectID(), clientID, message);413 callMemberNetworkFunction(&GametypeInfo::dispatchAnnounceMessage, this->getObjectID(), clientID, message); 414 414 } 415 415 } … … 422 422 this->dispatchKillMessage(message); 423 423 else 424 callMemberNetworkFunction( GametypeInfo,dispatchKillMessage, this->getObjectID(), clientID, message);424 callMemberNetworkFunction(&GametypeInfo::dispatchKillMessage, this->getObjectID(), clientID, message); 425 425 } 426 426 } … … 433 433 this->dispatchDeathMessage(message); 434 434 else 435 callMemberNetworkFunction( GametypeInfo,dispatchDeathMessage, this->getObjectID(), clientID, message);435 callMemberNetworkFunction(&GametypeInfo::dispatchDeathMessage, this->getObjectID(), clientID, message); 436 436 } 437 437 } … … 444 444 this->dispatchStaticMessage(message, colour); 445 445 else 446 callMemberNetworkFunction( GametypeInfo,dispatchStaticMessage, this->getObjectID(), clientID, message, colour);446 callMemberNetworkFunction(&GametypeInfo::dispatchStaticMessage, this->getObjectID(), clientID, message, colour); 447 447 } 448 448 } … … 455 455 this->dispatchFadingMessage(message); 456 456 else 457 callMemberNetworkFunction( GametypeInfo,dispatchFadingMessage, this->getObjectID(), clientID, message);457 callMemberNetworkFunction(&GametypeInfo::dispatchFadingMessage, this->getObjectID(), clientID, message); 458 458 } 459 459 }
Note: See TracChangeset
for help on using the changeset viewer.