Changeset 3233 in orxonox.OLD

Timestamp:

Dec 20, 2004, 12:58:13 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: unstable - minor changes everywhere

Location:

orxonox/trunk/src

Files:

• player.cc (modified) (1 diff)
• world.cc (modified) (6 diffs)

orxonox/trunk/src/player.cc

@@ -104 +104 @@
   
   glTranslatef(getPlacement()->r.x, getPlacement()->r.y, getPlacement()->r.z);
-  get_placement()->w.matrix (matrix);
+  getPlacement()->w.matrix (matrix);
   glMultMatrixf((float*)matrix);
   

orxonox/trunk/src/world.cc

@@ -473 +473 @@
       if( !entity->isFree() )
         {
-          loc = entity->get_location();
-          plc = entity->get_placement();
+          loc = entity->getLocation();
+          plc = entity->getPlacement();
           t = loc->part;
           
@@ -481 +481 @@
             {
               printf("An entity is out of the game area\n");
-              entity->left_world ();
+              entity->leftWorld ();
             }
           else
             {
-              while( track[t].map_coords( loc, plc) )
+              while( track[t].mapCoords( loc, plc) )
                 {
-                  track[t].post_leave (entity);
+                  track[t].postLeave (entity);
                   if( loc->part >= tracklen )
                     {
                       printf("An entity has left the game area\n");
-                      entity->left_world ();
+                      entity->leftWorld ();
                       break;
                     }
-                  track[loc->part].post_enter (entity);
+                  track[loc->part].postEnter (entity);
                 }
             }
@@ -549 +549 @@
 void World::calcCameraPos (Location* loc, Placement* plc)
 {
-  track[loc->part].map_camera (loc, plc);
+  track[loc->part].mapCamera (loc, plc);
 }
 
@@ -736 +736 @@
   if (entity->bFree)
     {
-      this->track[loc->part].map_coords( loc, entity->get_placement());
-    }
-  entity->post_spawn ();
+      this->track[loc->part].mapCoords( loc, entity->getPlacement());
+    }
+  entity->postSpawn ();
 }
 
@@ -763 +763 @@
   if (entity->bFree)
     {
-      this->track[loc->part].map_coords( loc, entity->get_placement());
-    }
-  entity->post_spawn ();
+      this->track[loc->part].mapCoords( loc, entity->getPlacement());
+    }
+  entity->postSpawn ();
   //return entity;
 }
@@ -787 +787 @@
   this->entities->add (entity);
   entity->init (plc, owner);
-  entity->post_spawn ();
+  entity->postSpawn ();
   //return entity;
 }