Changeset 7221 in orxonox.OLD for trunk/src/world_entities/space_ships/helicopter.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/space_ships/helicopter.cc (modified) (3 diffs)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -55 +55 @@
  * @param fileName the name of the File to load the helicopter from (absolute path)
  */
-Helicopter::Helicopter(const char* fileName)
+Helicopter::Helicopter(const std::string& fileName)
 {
   this->init();
@@ -62 +62 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName);
+    PRINTF(2)("Loading file %s failed for Helicopter.\n", fileName.c_str());
     return;
   }
@@ -110 +110 @@
   this->loadModel("models/ships/helicopter_#.obj", 1.0);
 
-  EventHandler::getInstance()->grabEvents(true);
+  //EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;