Changeset 12124 for code

Timestamp:

Nov 28, 2018, 11:50:16 AM (6 years ago)

Author:

stadlero

Message:

Wagnis class wip

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• Wagnis.cc (modified) (2 diffs)
• Wagnis.h (modified) (4 diffs)
• WagnisGameboard.cc (modified) (1 diff)
• WagnisGameboard.h (modified) (2 diffs)
• WagnisPlayer.h (modified) (2 diffs)
• WagnisPrereqs.h (modified) (1 diff)

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

@@ -14 +14 @@
     RegisterObject(Wagnis);
     this->gameBoard = nullptr;
+    this->gameStage = NOT_READY;
+
+    int n = 3;
+    for(int i = 1;i <= n;i++){
+        WagnisPlayer* p = new WagnisPlayer(context);
+        p->gameBoard = this->gameBoard;
+        this->players.push_back(p);
+    }
 }
 //Destructor
@@ -21 +29 @@
 //Runs the game
 void Wagnis::start(){
-    
+    //SUPER(Wagnis,start);
+    this->createGame();
+}
+
+//Tick
+void Wagnis::tick(float dt){
+    SUPER(Wagnis,tick,dt);
 }
 
 //Creates and links all needed classes
-void createGame(){
+void Wagnis::createGame(){\
+    orxout() << "Game creation started";
 
+    if(!findGameBoard()){
+        orxout() << "Error: GameBoard not found";
+    }
+
+    this->gameBoard->initializeNeighbors();
+    orxout() << "Game creation finished";
 }
 
+//Finds the pointer to the gameBoard
+bool Wagnis::findGameBoard(){
+    for (WagnisGameboard* gb : ObjectList<WagnisGameboard>()){
+        this->gameBoard = gb;
+        orxout()<<"Gameboard pointer found and added";
+        return true;
+    }
+    return false;
+}
 
 

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

@@ -5 +5 @@
 #define Wagnis_h
 
-
+#include "WagnisPrereqs.h"
 #include "WagnisGameboard.h"
 #include "WagnisProvince.h"
+#include "WagnisPlayer.h"
 #include "gametypes/Deathmatch.h"
 
@@ -28 +29 @@
 
 
-enum GameStage { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
-
 namespace orxonox
 {
@@ -38 +37 @@
         virtual ~Wagnis();
         void start();
+        void tick(float);
 
 
@@ -44 +44 @@
 
         private:
+        GameStage gameStage;
+        std::vector<WagnisPlayer*> players;
         void createGame();
+        bool findGameBoard();
     };
 }

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

@@ -62 +62 @@
     //Parses the string and initializes the neigbors vector of all provinces according
     //Syntax: 32=7-8-4  , 2=33+5+7+1+4
-    void WagnisGameboard::initializeNeighbors(std::string str){
+    void WagnisGameboard::initializeNeighbors(){
+        std::string str = this->connections_string;
         orxout() << "inizializing started" << endl;
         orxout() << "String size:" << endl;

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

@@ -9 +9 @@
 #define Wagnis_Gameboard_h
 
+#include "WagnisPrereqs.h"
 #include "WagnisProvince.h"
 
@@ -35 +36 @@
         //XML end
         
-        void initializeNeighbors(std::string);
+        void initializeNeighbors();
 
 
-        
+
         std::string connections_string;
         std::vector<WagnisProvince*> provs;

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

@@ -7 +7 @@
 #define Wagnis_Player_h
 
+#include "WagnisPrereqs.h"
 #include "Wagnis.h"
 #include "OrxonoxPrereqs.h"
@@ -16 +17 @@
 #include <string>
 #include "infos/HumanPlayer.h"
-
-enum MoveType { ATTACK, MOVE, SET_TROOPS, SET_TROOPS_INITIAL };
 
 

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

@@ -66 +66 @@
 {
 
+    class Wagnis;
     class WagnisProvince;
+    class WagnisGameboard;
+    class WagnisPlayer;
+    enum GameStage { NOT_READY, CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
+    enum MoveType { ATTACK, MOVE, SET_TROOPS, SET_TROOPS_INITIAL };
 
 }