Changeset 12134 for code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h

Timestamp:

Dec 2, 2018, 10:47:00 PM (5 years ago)

Author:

stadlero

Message:

Troop count is visible in the HUD

File:

• code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h (modified) (3 diffs)

code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.h

@@ -11 +11 @@
 #include "core/XMLPort.h"
 #include "worldentities/pawns/Pawn.h"
-#include "graphics/Billboard.h"
+#include "tools/OgreBulletUtils.h"
 #include <vector>
+#include <OgreColourValue.h>
+#include "tools/ToolsPrereqs.h"
 
 
@@ -25 +27 @@
 
         virtual void XMLPort(Element&,XMLPort::Mode);
-        void addMarkerBillboard(Billboard*);
-        Billboard* getMarkerBillboard(unsigned int) const;
 
         void setOwner_ID(int);
@@ -39 +39 @@
 
         void addNeighbor(WagnisProvince*);
-        void setBillbardVisibility(bool);
 
 
         std::vector<WagnisProvince*> neighbors;
         int owner_ID;
-        int troops;
         int ID;
         int continent;
-        
-        Billboard* markerBillboard;
+
+        private:
+        int troops;
+
     };
 }