Changeset 8487

Timestamp:

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

Author:

sven

Message:

 

Location:

code/branches/dockingsystem2

Files:

• data/gui/scripts/DockingDialog.lua (modified) (1 diff)
• data/levels/docking.oxw (modified) (2 diffs)
• src/modules/docking/DockingEffect.cc (modified) (1 diff)
• src/modules/docking/DockingEffect.h (modified) (2 diffs)

code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua

@@ -10 +10 @@
 
 function P.onShow()
+    orxonox.CommandExecutor:execute("pause")
     P.update()
-    orxonox.CommandExecutor:execute("pause")
 end
 

code/branches/dockingsystem2/data/levels/docking.oxw

@@ -37 +37 @@
 
     <Dock>
+        <animation>
+            <MoveToDockingTarget target="destroyer" position="10,150,40" />
+        </animation>
         <effects>
             <DockToShip target="destroyer" />
@@ -46 +49 @@
         </events>
         <attached>
-            <DistanceTrigger position="0,0,0" distance="50" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
+            <DistanceTrigger position="0,0,0" distance="30" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
             <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
         </attached>

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