summaryrefslogtreecommitdiff
path: root/src/Model/Grid.cpp
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-04 16:55:32 +0200
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-04 16:55:32 +0200
commit1570bc62105de67871e98599506f7bee6f1b400d (patch)
tree4c3db08b701958442bae22f20ba43d95037ad926 /src/Model/Grid.cpp
parent8488827025f25743ef18eca8c55cfdff5767341b (diff)
parenta1c9b58c29746793f00520d46e1397abe2b0e711 (diff)
Merge branch 'develop'HEADmaster
apply SFML develop change
Diffstat (limited to 'src/Model/Grid.cpp')
-rw-r--r--src/Model/Grid.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Model/Grid.cpp b/src/Model/Grid.cpp
index cc0fe60..64d8048 100644
--- a/src/Model/Grid.cpp
+++ b/src/Model/Grid.cpp
@@ -11,6 +11,7 @@ Grid::Grid(): m_size(4), m_grid(4){
m_grid.at(i).push_back(0);
}
}
+ //m_grid.at(3).at(0)=2048;
}
//Destructor
@@ -345,3 +346,8 @@ std::vector<int> Grid::getCol(int col){
return colVect;
}
+
+
+std::vector<std::vector<int> > Grid::getGrid(){
+ return m_grid;
+}