Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/command_node.cc

Timestamp:

May 27, 2005, 7:14:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:

• orxonox/branches/physics/src/command_node.cc (modified) (7 diffs)

orxonox/branches/physics/src/command_node.cc

@@ -24 +24 @@
 #include "list.h"
 #include "orxonox.h"
+#include "p_node.h"
 
 #include <stdio.h>
@@ -37 +38 @@
 CommandNode::CommandNode (int ID)
 {
-  this->bound = new tList<WorldEntity>();
+  this->bound = new tList<PNode>();
   this->aliases = NULL;
   this->netID = ID;
@@ -54 +55 @@
   this->bLocalInput = true;
   this->netID = 0;
-  this->bound = new tList<WorldEntity>();
+  this->bound = new tList<PNode>();
   this->bEnabled = true;
   this->world = NULL;
@@ -194 +195 @@
    \param entity: Pointer to the entity to bind
 */
-void CommandNode::bind (WorldEntity* entity)
+void CommandNode::bind (PNode* entity)
 {
   bound->add (entity);
@@ -203 +204 @@
    \param entity: Pointer to the entity to relese
 */
-void CommandNode::unbind (WorldEntity* entity)
+void CommandNode::unbind (PNode* entity)
 {
   bound->remove (entity);
@@ -264 +265 @@
           cmd.xrel = event.motion.xrel;
           cmd.yrel = event.motion.yrel;
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_MOUSEBUTTONUP:
@@ -308 +310 @@
   if( this->world->command(cmd)) return;
 
-  tIterator<WorldEntity>* iterator = bound->getIterator();
-  WorldEntity* entity = iterator->nextElement();
+  tIterator<PNode>* iterator = bound->getIterator();
+  PNode* entity = iterator->nextElement();
   while( entity != NULL)
     {
-      entity->command (cmd); /*no absorbtion of command! strange*/
+      ((WorldEntity*)entity)->command (cmd); /*no absorbtion of command! strange*/
       entity = iterator->nextElement();
     }