Changeset 8151

Timestamp:

Mar 28, 2011, 4:39:32 PM (14 years ago)

Author:

sven

Message:

XML support for different DockingEffects added, DockingEffect base class created

Location:

code/branches/dockingsystem

Files:

• data/levels/docking.oxw (modified) (4 diffs)
• src/modules/docking/CMakeLists.txt (modified) (1 diff)
• src/modules/docking/Dock.cc (modified) (3 diffs)
• src/modules/docking/Dock.h (modified) (2 diffs)
• src/modules/docking/DockToShip.cc (added)
• src/modules/docking/DockToShip.h (added)
• src/modules/docking/DockingEffect.cc (added)
• src/modules/docking/DockingEffect.h (added)
• src/modules/docking/DockingPrereqs.h (modified) (1 diff)

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

@@ -1 +1 @@
 <LevelInfo
  name = "Transporter"
- description = "Level with moving Transporter."
+ description = "Level with a Transporter. Demostrates the docking system."
  tags = ""
 />
@@ -14 +14 @@
 <Level
  name         = "Transporter"
- description  = "Level with Transporter :)"
+ description  = "Docking example level"
 >
   <templates>
@@ -48 +48 @@
 
                 <Dock>
+                        <effects>
+                                <DockToShip />
+                        </effects>
             <events>
                 <execute>
@@ -54 +57 @@
             </events>
             <attached>
-                <PlayerTrigger name="dockMe" /> //A PlayerTrigger triggering the execution of the QuestEffectBeacon.
+                <DistanceTrigger position="0,0,0" distance=2 target="ControllableEntity" name="dockMe" />
             </attached>
         </Dock>

code/branches/dockingsystem/src/modules/docking/CMakeLists.txt

@@ -1 +1 @@
 SET_SOURCE_FILES(DOCKING_SRC_FILES
+  DockingEffect.cc
+  DockToShip.cc
   Dock.cc
 )

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

@@ -38 +38 @@
 {
 
-
         CreateFactory(Dock);
 
@@ -56 +55 @@
         SUPER(Dock, XMLPort, xmlelement, mode);
 
-        // TODO: Something similar to XMLPortObject(Dock, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode);
+        XMLPortObject(Dock, DockingEffect, "effects", addEffect, getEffect, xmlelement, mode);
         XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
 
@@ -77 +76 @@
 
 
+        bool Dock::addEffect(DockingEffect* effect) {
+                assert(effect);
+                effects_.push_back(effect);
+                return true;
+        }
+    
+        const DockingEffect* Dock::getEffect(unsigned int index) const {
+                int i = index;
+        for (std::list<DockingEffect*>::const_iterator effect = this->effects_.begin(); effect != this->effects_.end(); ++effect)
+        {
+            if(i == 0)
+               return *effect;
+
+            i--;
+        }
+        return NULL;
+        }
+
 }

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

@@ -41 +41 @@
 
 #include "worldentities/StaticEntity.h"
+#include "DockingEffect.h"
 #include "DockingPrereqs.h"
 
@@ -55 +56 @@
 
         bool execute(bool bTriggered, BaseObject* trigger);
+
+        private:
+                std::list<DockingEffect*> effects_; //!< The list of DockingEffects to be executed when a player docks.
+
+        bool addEffect(DockingEffect* effect); //!< Add a DockingEffect to the Dock.
+        const DockingEffect* getEffect(unsigned int index) const; //!< Get the DockingEffect at a given index.
         };
 

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

@@ -66 +66 @@
 {
     class Dock;
+        class DockingEffect;
 }