Anew hope

src/include/GameBoard.h

@@ -4,7 +4,7 @@
 #include "TileFactory.h"
 
 
-template<class T, class J, unsigned int N> class GameBoard
+template<class T, class J, unsigned int N, unsigned int M> class GameBoard
 {
     private:
             std::map<string,J> pMap;
@@ -13,7 +13,19 @@ template<class T, class J, unsigned int N> class GameBoard
     public:
         enum Move {UP, DOWN, LEFT, RIGHT};
         /** Default constructor */
-        GameBoard():tf(TileFactory.get()){}
+        GameBoard():tf(TileFactory.get(n*m)){
+            std::vector<const T&> a;
+            for(int i =0; i< N;i++){
+                a = std::vector<const T&>;
+                tVec.push(a);
+            }
+
+            for(int i = 0; i<N;i++){
+                for(int j =0); j<M;++){
+                    tVec[]
+                }
+            }
+        }
         /** Default destructor */
         virtual ~GameBoard() {}
         /** Copy constructor
@@ -82,14 +94,7 @@ template<class T, class J, unsigned int N> class GameBoard
             }catch (...) {
                  add(tf.next(), x, y);
             }
-<<<<<<< HEAD
-=======
-            catch ( ... ) {
-                add(tf.next(), x, y);
-            }
->>>>>>> bb93509898a631b4e5e63991d86aef511ba5c30b
 
-        }
 
     protected:
     private:

src/include/Player.h

@@ -1,6 +1,6 @@
 #ifndef PLAYER_H
 #define PLAYER_H
-
+#include <string>
 
 class Player
 {
@@ -13,7 +13,7 @@ class Player
                unsigned int _spice,
                unsigned int _cart,
                unsigned int _food,
-               string name);
+               std::string _name);
 
         bool canAct() const; // returns true if food > 0
         bool pay( Player& player );
@@ -49,14 +49,14 @@ class Player
         void Setfood(unsigned int val);
         void Addfood(unsigned int val);
 
-        string getName() { return name; }
+       std::string getName() { return name; }
 
         unsigned int Getusedcartspace();
         unsigned int Addusedcartspace(unsigned int val);
 
     protected:
     private:
-        string name;
+        std::string name;
         int x;
         int y;
         unsigned int gold;

src/include/Tile.h

@@ -12,7 +12,7 @@ class Tile
         /** Default destructor */
         virtual ~Tile();
 
-        bool operator == (const Tile &t);
+        bool operator == (const Tile &t)const;
 
         virtual bool action(Player& player){ return false;}
 

src/include/sdf.h

@@ -0,0 +1,16 @@
+#ifndef SDF_H
+#define SDF_H
+
+
+class sdf
+{
+    public:
+        /** Default constructor */
+        sdf();
+        /** Default destructor */
+        virtual ~sdf();
+    protected:
+    private:
+};
+
+#endif // SDF_H

src/src/Player.cpp

@@ -17,15 +17,17 @@ Player::Player(unsigned int _gold,
                unsigned int _jewel,
                unsigned int _spice,
                unsigned int _cart,
-               unsigned int _food)
+               unsigned int _food,
+               std::string _name)
                :
                 gold(_gold),
                 ruby(_ruby),
                 fabric(_fabric),
                 jewel(_jewel),
                 spice(_spice),
                 cart(_cart),
-                food(_food)
+                food(_food),
+                name(_name)
 {
     //ctor
 }
@@ -58,7 +60,7 @@ void Player::eat() {
     }
 }
 
-bool Player::canAct() {
+bool Player::canAct() const{
     if(food > 0) {
         return true;
     }

src/src/Tile.cpp

@@ -8,4 +8,8 @@ Tile::Tile()
 Tile::~Tile()
 {
     //dtor
-}
+}
+
+bool Tile::operator==(const Tile &t)const{
+    return this == &t;
+}

src/src/TileFactory.cpp

@@ -95,5 +95,6 @@ TileFactory::~TileFactory()
 }
 
 Tile* TileFactory::next(){
-    return 0;//tiles.pop_back();
+    Tile * tile = tiles.back();
+    return tile;
 }

src/src/sdf.cpp

@@ -0,0 +1,11 @@
+#include "sdf.h"
+
+sdf::sdf()
+{
+    //ctor
+}
+
+sdf::~sdf()
+{
+    //dtor
+}