Changeset 9907 in orxonox.OLD

Timestamp:

Oct 28, 2006, 10:52:35 PM (17 years ago)

Author:

rennerc

Message:

less debug - network seems to work again

Location:

branches/network/src

Files:

• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (2 diffs)
• lib/network/synchronizeable_var/synchronizeable_classid.cc (modified) (1 diff)
• util/game_rules.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (1 diff)
• world_entities/power_ups/laser_power_up.cc (modified) (1 diff)
• world_entities/power_ups/turret_power_up.cc (modified) (1 diff)

branches/network/src/lib/network/network_stream.cc

@@ -1193 +1193 @@
           }
           else
-            ; /// FIXME CLASS_ID :: b = Factory::fabricate( leafClassId );
-          b = Factory::fabricate( ObjectListBase::retrieveIdentity( leafClassId )  );
+                  b = Factory::fabricate( ObjectListBase::retrieveIdentity( leafClassId )  );
+          
           if ( !b )
           {

branches/network/src/lib/network/synchronizeable.cc

@@ -271 +271 @@
 //       PRINTF(0)("sending %s %d\n", (*it)->getName().c_str(), n);
 
-//       if( this->isA(CL_PLAYABLE))
+//       if( this->isA( Playable::staticClassID() ))
 //       {
 //         PRINTF(0)("ms: %i, ps: %i, c: %i, sender: %i, reciever: %i, owner: %i, perm: (ow %i, ms %i, s %i, a %i)\n",
@@ -457 +457 @@
       //(*it)->debug();
 
-//       if( this->isA(CL_PLAYABLE))
+//       if( this->isA(Playable::staticClassID()))
 //       {
 //         PRINTF(0)("ms: %i, ps: %i, c: %i, sender: %i, reciever: %i, owner: %i, perm: (ow %i, ms %i, s %i, a %i)\n",

branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid.cc

@@ -47 +47 @@
 {
   int res = Converter::intToByteArray( vPtrIn->getLeafClassID().id(), buf, maxLength );
-  printf( "%s has id %d\n", vPtrIn->getClassName().c_str(), vPtrIn->getLeafClassID().id() );
 
   assert( res == INTSIZE );

branches/network/src/util/game_rules.cc

@@ -65 +65 @@
     PRINTF(4)("Adding Mission Goal:%s\n", element->Value());
     BaseObject* created = Factory::fabricate(element);
-    if (created != NULL /*&& created->isA(CL_GAME_RULES)*/)
+    if (created != NULL /*&& created->isA(GameRules::staticClassID())*/)
     {
       MissionGoal* mg = dynamic_cast<MissionGoal*>(created);

branches/network/src/util/multiplayer_team_deathmatch.cc

@@ -499 +499 @@
 
   assert( bo != NULL );
-  assert( bo->isA( CL_PLAYABLE ) );
+  assert( bo->isA( Playable::staticClassID() ) );
 
   Playable & playable = *(dynamic_cast<Playable*>(bo));

branches/network/src/world_entities/power_ups/laser_power_up.cc

@@ -80 +80 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYABLE))
+  if (entity->isA(Playable::staticClassID()))
   this->toList(OM_DEAD);
 }

branches/network/src/world_entities/power_ups/turret_power_up.cc

@@ -76 +76 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYABLE))
+  if (entity->isA(Playable::staticClassID()))
    this->toList(OM_DEAD);
 }