Changeset 1502 for code/trunk/src/orxonox/objects/weapon

Timestamp:

Jun 1, 2008, 3:54:20 PM (17 years ago)

Author:

rgrieder

Message:

• @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
• merged network branch back to trunk
• I had to omit the changes from last evening concerning the line endings
• might not work yet because of the line endings
• @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines

Location:

code/trunk/src/orxonox/objects/weapon

Files:

• AmmunitionDump.h (modified) (1 diff)
• BulletManager.h (modified) (1 diff)

code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -60 +60 @@
 
   protected:
-    inline bool create() { return true; }
+    inline bool create() { return Synchronisable::create(); }
     void registerAllVariables();
 

code/trunk/src/orxonox/objects/weapon/BulletManager.h

@@ -60 +60 @@
 
   protected:
-    inline bool create() { return true; }
+    inline bool create() { return Synchronisable::create(); }
     void registerAllVariables();