Changeset 1383 for code/branches/script_trigger/src/orxonox/objects

Timestamp:

May 22, 2008, 4:45:32 PM (17 years ago)

Author:

bknecht

Message:

crazy stuff!! triggers and the best: you can now use the lua function "include(levelfile)" to include another level file into the level. it's great!!!

Location:

code/branches/script_trigger/src/orxonox/objects

Files:

• Model.cc (modified) (1 diff)
• Script.cc (added)
• Script.h (added)
• SpaceShip.cc (modified) (1 diff)
• Trigger.cc (added)
• Trigger.h (added)

code/branches/script_trigger/src/orxonox/objects/Model.cc

@@ -50 +50 @@
 
     /**
-        @brief XML loading and saving.
-    @p
-    aram xmlelement The XML-element
-        @param loading Loading (true) or saving (false)
-        @return The XML-element
+    @brief XML loading and saving.
+    @param xmlelement The XML-element
+    @param loading Loading (true) or saving (false)
+    @return The XML-element
     */
     void Model::XMLPort(Element& xmlelement, XMLPort::Mode mode)

code/branches/script_trigger/src/orxonox/objects/SpaceShip.cc

@@ -277 +277 @@
       // change camera attributes here, if you want to ;)
     }
-    
+
     void SpaceShip::getFocus(){
       COUT(4) << "requesting focus" << std::endl;
       if(network::Client::getSingleton()==0 || network::Client::getSingleton()->getShipID()==objectID)
         CameraHandler::getInstance()->requestFocus(cam_);
-      
-    }
-    
+
+    }
+
     void SpaceShip::createCamera(){
 //       COUT(4) << "begin camera creation" << std::endl;