Changeset 10961 for code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.h

Timestamp:

Dec 9, 2015, 2:45:58 PM (10 years ago)

Author:

maxima

Message:

Merged presentation and fabiens branch. Had to modify hoverHUD and invaderHUD, because the text of the healthbar wasn't correctly displayed and the weapon settings of the hovership.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/modules/weapons/munitions/LaserMunition.h (modified) (2 diffs)

code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.h

@@ -36 +36 @@
 
 #include "weapons/WeaponsPrereqs.h"
-#include "ReplenishingMunition.h"
+#include "weaponsystem/ReplenishingMunition.h"
 
 namespace orxonox
@@ -53 +53 @@
             LaserMunition(Context* context);
             virtual ~LaserMunition() {}
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     };
 }