Changeset 668 for code/branches/FICN/src/orxonox/core

Timestamp:

Dec 22, 2007, 4:35:17 PM (17 years ago)

Author:

rgrieder

Message:

• updated weapon system file names
• some code style modifications in a few other files
• removed some compiler warnings

Location:

code/branches/FICN/src/orxonox/core

Files:

• ArgReader.cc (modified) (1 diff)
• Identifier.cc (modified) (1 diff)

code/branches/FICN/src/orxonox/core/ArgReader.cc

@@ -83 +83 @@
     if(argpos != 0)
     {
-      floating = atof(arguments_[argpos]);
+      floating = (float)atof(arguments_[argpos]);
     }
     else

code/branches/FICN/src/orxonox/core/Identifier.cc

@@ -100 +100 @@
             COUT(1) << "Aborting...";
             abort();
+            return NULL;
         }
     }