Refactoring Code

src/characters.cpp

@@ -44,6 +44,7 @@ int Game::yHeadRandom() {
 		return yRandom;
 	}
 }
+
 // Inisialization Start Position
 void Game::startPosition() {
 	xBody.resize(1000);
@@ -82,7 +83,6 @@ void Game::resetSnake() {
 
 	bool checkingCollison;
 
-
 	// ensure there are no more collisions between the head and the body after the game over
 	do {
 		startPosition();

src/main.cpp

@@ -28,14 +28,6 @@ int main() {
 		}
 
 		Map->Menu();
-		//Map->chooseSkin();
-	//	Map->buySkin();
-		//Map->vSkin();
-		//Map->showSuccessPopUp();
-		//Map->showConfirmPopUp();
-		//Map->render();
-//		Map->GameOver();
-	//	Map->ShowPopUpGameOver();
 	}
 
 	catch(const char* error) {

src/menu.cpp

@@ -65,7 +65,7 @@ void Game::Menu() {
 				} else if(highlight == 1) {
 					buySkin();
 				} else if(highlight == 2) {
-					ShowBestScore();
+					ShowHighestScore();
 				} else if(highlight == 3) {
 					chooseSkin();
 				} else {

src/money.cpp

@@ -1,6 +1,6 @@
 /* #########################################
  *	
- *	File: shop.cpp
+ *	File: menu.cpp
  *
  *	Author : Bagus Koko Wibawanto
  *
@@ -18,7 +18,6 @@ void Game::showCoin() {
 	werase(CoinMap);
 	box(CoinMap, 0, 0);
 	noecho();
-	//moneyString = std::to_string(money);
 
 	mvwprintw(CoinMap, 1, 4, "[ $      ");
 	mvwprintw(CoinMap, 1, 9, moneyString.c_str());
@@ -39,12 +38,25 @@ int Game::rewardMoney() {
 		reward = 2;
 	} else if(point < 40) {
 		reward = 3;
-	} else {
+	} else if(point < 50) {
 		reward = 4;
+	} else if(point < 60) {
+		reward = 5;
+	} else if(point < 70) {
+		reward = 6;
+	} else if(point < 80) {
+		reward = 7;
+	} else if(point < 90) {
+		reward = 8;
+	} else if(point < 100) {
+		reward = 9;
+	} else {
+		reward = 10;
 	}
 	return reward;
 }
 
+// Payment Process
 bool Game::PayProcess(int moneyCurrent, int cost) {
 	bool success;
 	int resultMoney;

src/popup.cpp

@@ -32,7 +32,6 @@ bool Game::ShowPopUpGameOver() {
       case 'q':
         exit = true;
         removeScoreWindow();
-        //GameOver();
         break;
       default:
         break;

src/removewindow.cpp

@@ -1,6 +1,6 @@
 /* #########################################
  *	
- *	File: control.cpp
+ *	File: removewindow.cpp
  *
  *	Author : Bagus Koko Wibawanto
  *
@@ -31,9 +31,9 @@ void Game::removeSuccessWindow() {
 }
 
 void Game::removeHighScoreWindow() {
-	werase(BestScoreWindow);
-	wrefresh(BestScoreWindow);
-	box(BestScoreWindow, 0, 0);
+	werase(HighestScoreWindow);
+	wrefresh(HighestScoreWindow);
+	box(HighestScoreWindow, 0, 0);
 }
 
 void Game::removeShopWindow() {

src/score.cpp

@@ -27,25 +27,25 @@ void Game::UpdateScore(WINDOW* Score, int pointNow) {
 }
 
 // Show Best Score
-void Game::ShowBestScore() {
+void Game::ShowHighestScore() {
 	removeMenuWindow();
 	refresh();
 	curs_set(FALSE);
 	noecho();
-	box(BestScoreWindow, 0, 0);
-	wrefresh(BestScoreWindow);
-	keypad(BestScoreWindow, TRUE);
+	box(HighestScoreWindow, 0, 0);
+	wrefresh(HighestScoreWindow);
+	keypad(HighestScoreWindow, TRUE);
 	readData();
 	bool exit = false;
 
 	while(exit != true) {
-		mvwprintw(BestScoreWindow, 0, 0, "[ q ]");
-		mvwprintw(BestScoreWindow, 0, 6, "[ r ]");
-		mvwprintw(BestScoreWindow, 2, 7, "High Score");
-		mvwprintw(BestScoreWindow, 4, 11, highScoreString.c_str());
+		mvwprintw(HighestScoreWindow, 0, 0, "[ q ]");
+		mvwprintw(HighestScoreWindow, 0, 6, "[ r ]");
+		mvwprintw(HighestScoreWindow, 2, 7, "High Score");
+		mvwprintw(HighestScoreWindow, 4, 11, highScoreString.c_str());
 		refresh();
 
-		int choice = wgetch(BestScoreWindow);
+		int choice = wgetch(HighestScoreWindow);
 
 		switch(choice) {
 			case 'q':
@@ -58,6 +58,6 @@ void Game::ShowBestScore() {
 				break;
 		}
 
-		box(BestScoreWindow, 0, 0);
+		box(HighestScoreWindow, 0, 0);
 	}
 }

src/shop.cpp

@@ -1,6 +1,6 @@
 /* #########################################
  *	
- *	File: skin.cpp
+ *	File: shop.cpp
  *
  *	Author : Bagus Koko Wibawanto
  *

src/skin.cpp

@@ -26,7 +26,6 @@ bool Game::chooseSkin() {
         int xMenuWindow[5] = {7, 7, 7, 7, 7};
         SkinPreview();
         wrefresh(SkinMenuWindow);
-        //wrefresh(ShadowMap);
         readDataCollectionSkin();
 
         while(exit != true) {
@@ -47,7 +46,7 @@ bool Game::chooseSkin() {
                 mvwprintw(SkinMenuWindow, 18, 15, "Press Space To Select");
 
                for(int i = 0; i < 4; i++) {
-                       if(i == highlight) {
+                       if(i == highlightSkinMenu) {
                                wattron(SkinMenuWindow, A_REVERSE);
                                if(skinCollection[i] == "Qi" || skinCollection[i] == "Ziro" || skinCollection[i] == "Ate" || skinCollection[i] == "The G") {
                                        mvwprintw(SkinMenuWindow, yMenuWindow[i], xMenuWindow[i], skinCollection[i].c_str());
@@ -62,7 +61,7 @@ bool Game::chooseSkin() {
                 readDataSkin();
 
                 // Show Detail Selected Skin
-               if(skinSelected == highlight) {
+               if(skinSelected == highlightSkinMenu) {
                        for(int i = 0; i < skinCollectionCount; i++) {
                                if(skinCollection[i] == "Qi" || skinCollection[i] == "Ziro" || skinCollection[i] == "Ate" || skinCollection[i] == "The G") {
                                        ensureSkinCollectionHaveValue.at(i) = "True";
@@ -87,21 +86,21 @@ bool Game::chooseSkin() {
 
                 switch(choice) {
                         case KEY_UP:
-                                if(highlight == 0) {
-                                        highlight = 0;
+                                if(highlightSkinMenu == 0) {
+                                        highlightSkinMenu = 0;
                                         break;
                                 }
-                                highlight--;
+                                highlightSkinMenu--;
                                 break;
                         case KEY_DOWN:
-                                if(highlight == skinCollectionCount - 1) {
-                                        highlight = skinCollectionCount - 1;
+                                if(highlightSkinMenu == skinCollectionCount - 1) {
+                                        highlightSkinMenu = skinCollectionCount - 1;
                                         break;
                                 }
-                                highlight++;
+                                highlightSkinMenu++;
                                 break;
                         case ' ':
-                                skinSelected = highlight;
+                                skinSelected = highlightSkinMenu;
                                 saveDataSkin();
                                 break;
                         case 'q':
@@ -111,12 +110,6 @@ bool Game::chooseSkin() {
                         default:
                                 break;
                 }
-
-          //werase(Map);
-          //box(Map, 0, 0);
-          //refresh();
-          //wrefresh(Map);
-
         }
 
         // At below, change head snake that use when playing game
@@ -136,13 +129,13 @@ bool Game::chooseSkin() {
 bool Game::SkinPreview() {
         werase(SkinPreviewWindow);
         box(SkinPreviewWindow, 0, 0);
-        if(highlight == 0) {
+        if(highlightSkinMenu == 0) {
                 mvwprintw(SkinPreviewWindow, 2, 6, "Q+++");
-        } else if(highlight == 1) {
+        } else if(highlightSkinMenu == 1) {
                 mvwprintw(SkinPreviewWindow, 2, 6, "0+++");
-        } else if(highlight == 2) {
+        } else if(highlightSkinMenu == 2) {
                 mvwprintw(SkinPreviewWindow, 2, 6, "@+++");
-        } else if(highlight == 3) {
+        } else if(highlightSkinMenu == 3) {
                 mvwprintw(SkinPreviewWindow, 2, 6, "G+++");
         }