Changeset 10602 in orxonox.OLD for branches/cleanup/src

Timestamp:

Mar 26, 2007, 12:31:58 AM (18 years ago)

Author:

rennerc

Message:

added ghost feature, which lets player fly around and print coords
add this to level file to enable ghost
<Spectator>

<name>Ghost</name>
<allowGhost>1</allowGhost>

</Spectator>

Location:

branches/cleanup/src/world_entities

Files:

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

branches/cleanup/src/world_entities/spectator.cc

@@ -25 +25 @@
 #include "src/world_entities/npcs/generic_npc.h"
 
+#include "src/lib/util/loading/load_param.h"
+
+#include "player.h"
+
 
 ObjectListDefinition(Spectator);
 CREATE_FACTORY(Spectator);
 
-
+Spectator* Spectator::ghost = NULL;
+Playable* Spectator::regularPlayable = NULL;
 
 #include "state.h"
+#include "shell_command.h"
+             
+SHELL_COMMAND( enableGhost, Spectator, enableGhost )
+             ->describe("fly around")
+             ->setAlias("ghost");
 
 
@@ -109 +119 @@
 /**
  * loads the Settings of a Spectator from an XML-element.
- * @param root the XML-element to load the Spaceship's properties from
+ * @param root the XML-element to load the Spectator's properties from
  */
 void Spectator::loadParams(const TiXmlElement* root)
 {
   Playable::loadParams(root);
+  
+  LoadParam(root, "allowGhost", this, Spectator, allowGhost)
+    .describe("Allows the Player to fly around");
+}
+
+
+
+void Spectator::allowGhost( bool flag )
+{
+  PRINTF(0)( "SPECTATOR ALLOWGHOST: %d\n", flag );
+  if ( flag )
+  {
+    assert( ghost == NULL && "only one flySpectator allowed" );
+    
+    ghost = this;
+  }
+  else
+  {
+    ghost = NULL;
+  }
+}
+
+
+void Spectator::enableGhost( )
+{
+  if ( !regularPlayable )
+  {
+    if ( !State::getPlayer() || !State::getPlayer()->getPlayable() )
+      return;
+    
+    regularPlayable = State::getPlayer()->getPlayable();
+    
+    ghost->setAbsCoor( regularPlayable->getAbsCoor() );
+    ghost->setAbsDir( regularPlayable->getAbsDir() );
+    
+    State::getPlayer()->setPlayable( ghost );
+  }
+  else
+  {
+    if ( !State::getPlayer() || !State::getPlayer()->getPlayable() )
+      return;
+    
+    State::getPlayer()->setPlayable( regularPlayable );
+    regularPlayable = NULL;
+  }
 }
 
@@ -264 +319 @@
 
 
+

branches/cleanup/src/world_entities/spectator.h

@@ -30 +30 @@
 
     virtual void process(const Event &event);
+    
+    void allowGhost( bool flag );
+    
+    static void enableGhost();
 
   private:
@@ -45 +49 @@
     float                 angleX;
     float                 angleY;
+    
+    static Spectator*     ghost;
+    static Playable*      regularPlayable;
 
 };