Changeset 11175 for code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

Timestamp:

Apr 28, 2016, 3:09:26 PM (8 years ago)

Author:

sagerj

Message:

overwritten many fire functions now only need to implement timer/charges

File:

• code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc (modified) (3 diffs)

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

@@ -49 +49 @@
     RegisterClass(ControllableEntity);
 
-    registerMemberNetworkFunction( ControllableEntity, fire );
+    registerMemberNetworkFunction( ControllableEntity, push );
     registerMemberNetworkFunction( ControllableEntity, setTargetInternal );
 
@@ -307 +307 @@
         else
         {
-            callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
+            callMemberNetworkFunction(&ControllableEntity::push, this->getObjectID(), 0, firemode);
         }
     }
@@ -319 +319 @@
         else
         {
-            callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
+            callMemberNetworkFunction(&ControllableEntity::release, this->getObjectID(), 0, firemode);
         }
     }