Changeset 1059 for code/trunk/src

Timestamp:

Apr 14, 2008, 2:19:42 PM (16 years ago)

Author:

rgrieder

Message:

• updated VC++ files
• 3 tiny bugfixes

Location:

code/trunk/src

Files:

• core/CommandExecutor.cc (modified) (1 diff)
• core/Identifier.cc (modified) (1 diff)
• core/XMLPort.h (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)

code/trunk/src/core/CommandExecutor.cc

@@ -196 +196 @@
 //            return KeybindMode::onPress;
         }
+        // FIXME: Had to insert a return statement
+        return (KeybindMode)0;
     }
 

code/trunk/src/core/Identifier.cc

@@ -155 +155 @@
     bool Identifier::isA(const Identifier* identifier) const
     {
-        return (identifier == this || (this->parents_.find(identifier) != this->children_->end()));
+        return (identifier == this || (this->parents_.find(identifier) != this->parents_.end()));
     }
 

code/trunk/src/core/XMLPort.h

@@ -96 +96 @@
     class _CoreExport XMLPortParamContainer
     {
+    public:
         enum ParseResult
         {

code/trunk/src/orxonox/CMakeLists.txt

@@ -43 +43 @@
   audio
   network
-#  loader
 )