Changeset 9406 in orxonox.OLD for trunk/src/world_entities/weapons/aiming_system.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/world_entities/weapons/aiming_system.cc (modified) (4 diffs)

trunk/src/world_entities/weapons/aiming_system.cc

@@ -28 +28 @@
 
 
-using namespace std;
+
 
 
@@ -91 +91 @@
 
 
-  for( int i = 0; i < this->selectionList.size(); i++)
+  for(unsigned int i = 0; i < this->selectionList.size(); i++)
   {
     distance = fabs((this->getAbsCoor() - this->selectionList[i]->getAbsCoor()).len());
@@ -101 +101 @@
   }
 
-  PRINTF(0)("entity: %s\n", nearestEntity->getClassName());
+  PRINTF(0)("entity: %s\n", nearestEntity->getClassCName());
     return nearestEntity;
 }
@@ -115 +115 @@
   if( this->owner != killer)
   {
-    //PRINTF(0)("real hit: %s\n", killer->getClassName());
+    //PRINTF(0)("real hit: %s\n", killer->getClassCName());
     this->selectionList.push_back(killer);
   }