Changeset 12077 for code/branches

Timestamp:

Nov 7, 2018, 10:23:46 AM (6 years ago)

Author:

kunzro

Message:

gameboard string fixed

Location:

code/branches/wagnis_HS18

Files:

• data/levels/Wagnis.oxw (modified) (2 diffs)
• src/modules/wagnis/WagnisGameboard.cc (modified) (6 diffs)
• src/modules/wagnis/WagnisGameboard.h (modified) (2 diffs)

code/branches/wagnis_HS18/data/levels/Wagnis.oxw

@@ -48 +48 @@
     <SpawnPoint position="100, 45, 75" lookat="0, 45, 75" />
 
-<WagnisGameboard position="0,0,0" connections_string="1=2,2=1-1000,1000=2  ">
+<WagnisGameboard position="0,0,0" connections_string="1=2+1000, 2=1, 1000=1">
 
   <Provinces>
@@ -69 +69 @@
       </attached>
     </WagnisProvince>
+
 
   </Provinces>

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

@@ -38 +38 @@
         orxout() << province->getID() << endl;
         this->provs.push_back(province);
-        
-        if(province->getID() == 1000){
-            orxout() << "You added a province with ID 1000.\nThis is the magic debug number.\nThe function to initialize the neighbors of all provinces will be called:" << endl;
-            orxout() << "-----neighbors-----" << endl << endl;
-            initializeNeighbors(this->connections_string);
-        }
     }
     //XML get province
@@ -66 +60 @@
 
     //Parses the string and initializes the neigbors vector of all provinces according
-    //Syntax: 32=7-8-4  , 2=33-5-7-1-4
+    //Syntax: 32=7-8-4  , 2=33+5+7+1+4
     void WagnisGameboard::initializeNeighbors(std::string str){
         orxout() << "inizializing started" << endl;
@@ -79 +73 @@
             if(n == str.size() || str[n] != '='){
                 orxout() << "Error while parsing neighbors-string: '=' expected at position: "<< n << endl;
-                orxout() << "Correct syntax: 32=4-2-5-67, 54=8-1-12" << endl;
+                orxout() << "Correct syntax: 32=4+2+5+67, 54=8+1+12" << endl;
             }
             int other_ID;
@@ -100 +94 @@
                     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++;
@@ -106 +100 @@
             if(str[n] != ','){
                 orxout() << "Error while parsing neighbors-string: ',' expected at position: "<< n << endl;
-                orxout() << "Correct syntax: 32=4-2-5-67, 54=8-1-12" << endl;
+                orxout() << "Correct syntax: 32=4+2+5+67, 54=8+1+12" << endl;
             }
             n++;
@@ -123 +117 @@
         if(digit < 0 || digit > 9){
             orxout() << "Error while parsing neighbors-string: Digit expected at position: "<< n << endl;
-            orxout() << "Correct syntax: 32=4-2-5-67, 54=8-1-12" << endl;
+            orxout() << "Correct syntax: 32=4+2+5+67, 54=8+1+12" << endl;
         }
 

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

@@ -34 +34 @@
         std::string getConnections_string() const;
         //
-
+        std::string connections_string;
         void initializeNeighbors(std::string);
 
@@ -40 +40 @@
     private:
         std::vector<WagnisProvince*> provs;
-        std::string connections_string;
+        
         int parse_int(std::string,unsigned int);
     };