Changeset 9900 for code/branches/presentationHS13/src/modules/weapons/weaponmodes

Timestamp:

Dec 16, 2013, 1:33:09 PM (11 years ago)

Author:

smerkli

Message:

Merged the invaders branch of Florian

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (2 diffs)

code/branches/presentationHS13/src/modules/weapons/weaponmodes/HsW01.h

@@ -59 +59 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-        private:
+        protected:
             /**
             @brief Set the mesh.
@@ -109 +109 @@
                 { return this->delay_; }
 
-            void shot();
+            virtual void shot();
             void muzzleflash();