Changeset 9853 for code/branches

Timestamp:

Dec 2, 2013, 3:49:14 PM (11 years ago)

Author:

georgr

Message:

A should fire main lazors now, 3rd try

Location:

code/branches/wiimote/src/libraries/core/input

Files:

• WiiMote.cc (modified) (3 diffs)
• WiiMote.h (modified) (2 diffs)

code/branches/wiimote/src/libraries/core/input/WiiMote.cc

@@ -3 +3 @@
 //#include "core/command/ConsoleCommand.h"
 #include <wiicpp/wiicpp/wiicpp.h>
-#include <command/CommandExecutor.h>
+#include "core/command/CommandExecutor.h"
 
 
@@ -22 +22 @@
                         if(p->Buttons.isPressed(CButtons::BUTTON_A))
                                 {
-                                        CE->execute("fire 0", 0, 0);
+                                        CommandExecutor::execute("fire 0", 0, 0);
                                 }
                         Orientation o;
@@ -59 +59 @@
                 lastOrientation.roll = 0;
                 lastOrientation.pitch = 0;
-                CE = &(CommandExecutor::getInstance());
+
 
         }

code/branches/wiimote/src/libraries/core/input/WiiMote.h

@@ -9 +9 @@
 namespace orxonox
 {
-
-        class CommandExecutor;
         struct Orientation
     {
@@ -42 +40 @@
                  CWiimote * p;
                  CWii * PWii; //parent "wii" the wiimote is registered to
-                 CommandExecutor * CE;
         };
 };