Changeset 8487 for code/branches/dockingsystem2/src

Timestamp:

May 16, 2011, 1:39:51 PM (14 years ago)

Author:

sven

Message:

 

Location:

code/branches/dockingsystem2/src/modules/docking

Files:

• DockingEffect.cc (modified) (1 diff)
• DockingEffect.h (modified) (2 diffs)

code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc

@@ -52 +52 @@
         COUT(4) << "Invoking DockingEffects on player: " << player << " ."  << std::endl;
 
-        for (std::list<DockingEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++) {
-            switch(event) {
+        for (std::list<DockingEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
+        {
+            switch(event)
+            {
                 case docking::DOCKING:
                     check &= (*effect)->docking(player);
-                    break;
-                case docking::ATTACH:
-                    check &= (*effect)->attach(player);
                     break;
                 case docking::RELEASE:

code/branches/dockingsystem2/src/modules/docking/DockingEffect.h

@@ -52 +52 @@
         enum event {
             DOCKING,
-            ATTACH,
             RELEASE
         };
@@ -72 +71 @@
             virtual ~DockingEffect();
 
-            virtual bool docking(PlayerInfo* player) = 0; //!< Called when docking starts
-            virtual bool attach(PlayerInfo* player) = 0; //!< Called after docking animation
+            virtual bool docking(PlayerInfo* player) = 0; //!< Called when player docked
             virtual bool release(PlayerInfo* player) = 0; //!< Called when player wants to undock