Changeset 12067 for code/branches/wagnis_HS18/src/modules/wagnis

Timestamp:

Oct 31, 2018, 11:27:04 AM (6 years ago)

Author:

kunzro

Message:

XML and CMake updated, Gameboard is working

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• WagnisGameboard.cc (modified) (2 diffs)
• WagnisProvince.cc (modified) (2 diffs)
• WagnisProvince.h (modified) (2 diffs)

code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc

@@ -1 @@
-
-
-
-
-
-
 #include "WagnisGameboard.h"
 #include "core/CoreIncludes.h"
@@ -29 +23 @@
     //XML Port
     void WagnisGameboard::XMLPort(Element& xmlelement,XMLPort::Mode mode){
+        SUPER(WagnisGameboard, XMLPort, xmlelement, mode);
 
-        XMLPortObject(WagnisGameboard, WagnisProvince, "Province", addProvince, getProvince, xmlelement, mode);
+        XMLPortObject(WagnisGameboard, WagnisProvince, "Provinces", addProvince, getProvince, xmlelement, mode);
     }
     //XML add province
     //Adds a Province to the Gameboard
     void WagnisGameboard::addProvince(WagnisProvince* province){
+        orxout() << "added" << endl;
+        orxout() << province->getID() << endl;
         this->provs.push_back(province);
     }

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

@@ -1 @@
-
-
-
-
-
-
 #include "WagnisProvince.h"
 #include "core/CoreIncludes.h"
@@ -30 +24 @@
     //XML Port
     void WagnisProvince::XMLPort(Element& xmlelement,XMLPort::Mode mode){
+        SUPER(WagnisProvince, XMLPort, xmlelement, mode);
+
         XMLPortParam(WagnisProvince, "ID", setID, getID, xmlelement, mode);
         XMLPortParam(WagnisProvince, "continent", setContinent, getContinent, xmlelement, mode);

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

@@ -7 +7 @@
 #define Wagnis_Province_h
 
-#include "OrxonoxPrereqs.h"
+#include "WagnisPrereqs.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -16 +16 @@
 namespace orxonox
 {
-    class WagnisProvince : public MovableEntity
+    class _WagnisExport WagnisProvince : public MovableEntity
     {
     public: