Changeset 12130 for code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc

Timestamp:

Nov 28, 2018, 11:17:41 PM (5 years ago)

Author:

stadlero

Message:

changed gametype from Deathmatch to Wagnis in Wagnis.oxw + some wip in Wagnis.cc

File:

• code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc (modified) (5 diffs)

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

@@ -12 +12 @@
     WagnisGameboard::WagnisGameboard(Context* context) : StaticEntity(context){
         RegisterObject(WagnisGameboard);
+        this->connections_string = "";
     }
+    WagnisGameboard::~WagnisGameboard(){}
 
-    WagnisGameboard::~WagnisGameboard(){
-        for(WagnisProvince* prov:this->provs){
-            prov->destroy();
-        }
-    }
     void WagnisGameboard::XMLPort(Element& xmlelement,XMLPort::Mode mode){
         SUPER(WagnisGameboard, XMLPort, xmlelement, mode);
@@ -63 +60 @@
     //Syntax: 32=7-8-4  , 2=33+5+7+1+4
     void WagnisGameboard::initializeNeighbors(){
+        
         std::string str = this->connections_string;
         orxout() << "inizializing started" << endl;
@@ -69 +67 @@
         unsigned int n = 0;
         while(n < str.size()){
-            orxout() << "test1" << endl;
             int tmp = parse_int(str,n);
-            n = tmp | 0x0000FFFF;
-            int origin_ID = tmp / (2<<16);
+            n = tmp & 0x0000FFFF;
+            int origin_ID = tmp >> 16;
             if(n == str.size() || str[n] != '='){
                 orxout() << "Error while parsing neighbors-string: '=' expected at position: "<< n << endl;
@@ -81 +78 @@
                 n++;
                 tmp = parse_int(str,n);
-                n = tmp | 0x0000FFFF;
-                other_ID = tmp / (2<<16);
+                n = tmp & 0x0000FFFF;
+                other_ID = tmp >> 16;
 
                 for(WagnisProvince* orig:this->provs){
@@ -96 +93 @@
                     break;
                 }
-            }while(n < str.size() && str[n] == '+');
+            }while((n < str.size()) && (str[n] == '+'));
             if(n == str.size()) return;
-            while(n < str.size() && str[n] == ' ') n++;
+            while((n < str.size()) && (str[n] == ' ')) n++;
             if(n == str.size()) return;
             if(str[n] != ','){