2048 mostly finish

2048/Game2048.cpp

 #include <iostream>
 #include <vector>
+#include <cstdlib>
 #include "Display.h"
 #include "Movement.h"
 #include "Game2048.h"
@@ -13,23 +14,20 @@ Game2048::Game2048(int gameSize,int& highScore) {  // this initialize a board
     score = 0;
     board = new vector<vector<int>>(gameSize, vector<int>(gameSize,0));
 }
-
+/*
 void Game2048::playGame(){
-    *board = { {4,0,0,2}, {4,2,0,0}, {4,4,0,0}, {4,4,0,0}};
-    movement.right(*board, score);
-    display.showGame(*board, score, highScore);
-    movement.left(*board, score);
-    display.showGame(*board, score, highScore);
-    movement.up(*board, score);
-    display.showGame(*board, score, highScore);
-    movement.right(*board, score);
-    display.showGame(*board, score, highScore);
-    movement.down(*board, score);
-    display.showGame(*board, score, highScore);
+    char choise;
+    while(true){
+        randomNumber();
+        Draw();
+        cin << choise;
+        Shift(choise);
+        
+    }
     
     delete board;
 }
-
+*/
 void Game2048::Shift(char input){
     switch(input){
         
@@ -46,6 +44,37 @@ void Game2048::Shift(char input){
             movement.right(*board, score);
             break;
     }
-        
+}
+
+bool Game2048::addNumber(){
+    int num = rand() % 5;
+    int numX;
+    int numY;
+    bool pass = true;
+    bool success = false;
+    
+    if (num != 4) {
+        num = 2;
+    }
+    for (vector<int> line: *board){
+        for(int value: line){
+            if (value == 0) {
+                success = true;
+            }
+        }
+    }
+    if (!success){
+        return success;
+    }
+    while(pass){
+        numX = rand() % board->size();
+        numY = rand() % board->size();
+        if (board->at(numX).at(numY) == 0){
+            board->at(numX).at(numY) = num;
+            pass = false;
+        }
+    }
+
     
+   return success; 
 }
\ No newline at end of file

2048/Game2048.h

@@ -7,11 +7,12 @@ using namespace std;
 
 class Game2048 {
     public:
-        Game2048(int gameSize, int& highScore);
+        Game2048(int gameSize, int& highScore); // remove the pass by reference in high score
         void playGame();
         void Draw() {display.showGame(*board, score, highScore);}
         void Shift(char input);
         void testInit(){*board = { {4,0,0,2}, {4,2,0,0}, {4,4,0,0}, {4,4,0,0}};}
+        bool addNumber();
 
     
 

2048/Movement.cpp

@@ -80,10 +80,4 @@ void Movement::transition(vector<vector<int>>& board){  //this is to prevent  va
             }
         }
     }
-}
-
-
-/*void Movement::randomNumber(vector<vector<int>>& board){
-    
-}
-*/
\ No newline at end of file
+}
\ No newline at end of file

2048/Movement.h

@@ -11,7 +11,6 @@ class Movement {
         void down(vector<vector<int>>& board, int& score);
         void right(vector<vector<int>>& board, int& score);
         void left(vector<vector<int>>& board, int& score);
-        void randomNumber(vector<vector<int>>& board);
     private:
         void transition (vector<vector<int>>& board); //no values are added twice
         void transfer(int& num1, int& num2){ // to move the number if the next slot is empty

2048/mainTest.cpp

@@ -3,13 +3,14 @@
 #include "Game2048.h"
 using namespace std; 
 
-
-// int main() {
+/*
+ int main() {
     
-//     int highScore = 2048;
-//     Game2048 game(4,highScore);
-//     game.playGame();
+     int highScore = 2048;
+     Game2048 game(4,highScore);
+     game.playGame();
     
-//     return 0; 
-// } 
+     return 0; 
+} 
 
+*/
\ No newline at end of file

GameEngine/2048GameState.cpp

@@ -76,6 +76,9 @@ void C2048GameState::Update(CGameEngine* game)
     cout << "  2048GameState Update" << endl;
     
     game2048->Shift(input);
+    if (!game2048->addNumber()) {
+        game->Quit();
+    }
 }
 
 void C2048GameState::Draw(CGameEngine* game)