Changeset 8140

Timestamp:

Mar 28, 2011, 3:24:12 PM (13 years ago)

Author:

sven

Message:

fixed includes

Location:

code/branches/dockingsystem/src/modules/docking

Files:

• Dock.cc (modified) (3 diffs)
• Dock.h (modified) (2 diffs)
• DockingPrereqs.h (modified) (1 diff)

code/branches/dockingsystem/src/modules/docking/Dock.cc

@@ -34 +34 @@
 #include "Dock.h"
 
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
 
 namespace orxonox
@@ -47 +44 @@
     {
         RegisterObject(Dock);
-                COUT(0) << "Registering dock..." << endl;
+                COUT(0) << "Registering dock..." << std::endl;
     }
 
@@ -75 +72 @@
     bool Dock::execute(bool bTriggered, BaseObject* trigger)
         {
-                COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << endl;
+                COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << std::endl;
+                return true;
         }
 

code/branches/dockingsystem/src/modules/docking/Dock.h

@@ -36 +36 @@
 #define _Dock_H__
 
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/EventIncludes.h"
+
+#include "worldentities/StaticEntity.h"
 #include "DockingPrereqs.h"
 
@@ -50 +55 @@
 
         bool execute(bool bTriggered, BaseObject* trigger);
-        }
+        };
 
 

code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h

@@ -65 +65 @@
 namespace orxonox
 {
-    class Notification;
-    class NotificationDispatcher;
-    class NotificationManager;
-    class NotificationQueue;
-    
-    //dispatchers
-    class CommandNotification;
-    class SimpleNotification;
+    class Dock;
 }