Changeset 9257 in orxonox.OLD for branches/proxy/src/util

Timestamp:

Jul 12, 2006, 5:10:09 PM (18 years ago)

Author:

patrick

Message:

more framework switching

Location:

branches/proxy/src/util

Files:

• game_rules.cc (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (7 diffs)

branches/proxy/src/util/game_rules.cc

@@ -88 +88 @@
 void GameRules::registerKill(const Kill& kill)
 {
-  if ( !SharedNetworkData::getInstance()->isGameServer() )
+  if ( !SharedNetworkData::getInstance()->isMasterServer() )
     return;
 

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -204 +204 @@
   assignPlayable();
 
-  if ( !SharedNetworkData::getInstance()->isGameServer() )
+  if ( !SharedNetworkData::getInstance()->isMasterServer() )
     return;
 
@@ -214 +214 @@
     this->killList.erase( this->killList.begin() );
   }
-  
+
 
 
@@ -268 +268 @@
 void MultiplayerTeamDeathmatch::checkGameRules()
 {
-  if ( !SharedNetworkData::getInstance()->isGameServer() )
+  if ( !SharedNetworkData::getInstance()->isMasterServer() )
     return;
 
@@ -320 +320 @@
       return "maps/male_fiend.pcx";
   }
-  
+
   return "";
 }
@@ -330 +330 @@
     return 10.0f;
   }
-  
+
   return 1.0f;
 }
@@ -680 +680 @@
   char st[10];
   int i = 0;
-  
+
   i = 2;
   for ( TeamScoreList::const_iterator it = scoreList[0].begin(); it != scoreList[0].end(); it++ )
@@ -719 +719 @@
     return;
   }
-  
+
   int killerUserId = killer->getOwner();
   int victimUserId = victim->getOwner();
-  
+
   PRINTF(0)("%d %d %x %x %s %s\n", killerUserId, victimUserId, killer, victim, killer->getClassName(), victim->getClassName());
 
   PlayerStats & victimStats = *PlayerStats::getStats( victimUserId );
   PlayerStats & killerStats = *PlayerStats::getStats( killerUserId );
-  
+
   if ( killerStats.getPlayable() != killer || victimStats.getPlayable() != victim )
   {