Changeset 9406 in orxonox.OLD for trunk/src/util/game_rules.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/util/game_rules.cc (modified) (4 diffs)

trunk/src/util/game_rules.cc

@@ -27 +27 @@
 
 
-using namespace std;
+
 
 
@@ -50 +50 @@
   BaseObject::loadParams(root);
 
-  PRINTF(0)("GameRules::loadParams(...) hit me\n");
   LoadParamXML(root, "MissionGoal", this, GameRules, loadMissionGoal)
       .describe("an XML-Element to load the missions from");
@@ -59 +58 @@
 void GameRules::loadMissionGoal(const TiXmlElement* root)
 {
-  PRINTF(0)("Trying to load MissionGoals\n");
+  PRINTF(4)("Trying to load MissionGoals\n");
   const TiXmlElement* element = root->FirstChildElement();
   while( element != NULL)
@@ -88 +87 @@
 void GameRules::registerKill(const Kill& kill)
 {
-  if ( !SharedNetworkData::getInstance()->isGameServer() )
+  if ( SharedNetworkData::getInstance()->isClient() )
     return;
 
-  PRINTF(0)("Received Event: Kill\n");
+  PRINTF(4)("Received Event: Kill\n");
 
   this->killList.push_back( kill );