Merge branch 'master' of github.coventry.ac.uk:wlodarsb/Text-Based-Game

wlodarsb · Feb 14, 2019 · 5221e3b248bb93ce416549e14d8a3a95b434b889 · 5221e3b
2 parents 6ea4b51 + 031494a
commit 5221e3b248bb93ce416549e14d8a3a95b434b889
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/bin/main b/bin/main
diff --git a/classes/Game/CMakeFiles/game.dir/Game.cpp.o b/classes/Game/CMakeFiles/game.dir/Game.cpp.o
diff --git a/classes/Game/Game.cpp b/classes/Game/Game.cpp
@@ -10,7 +10,8 @@ Game::Game(bool cbreak_present)
 	GameWindow game_view(LINES * 1/3, COLS, 0, 0);
 	GameWindow hero_stats(LINES * 1/3, COLS, LINES * 1/3, 0);
 	GameWindow abilities(LINES * 1/3, COLS, LINES * 2/3, 0);
-
+	noecho();
+	curs_set(0);
 	if(cbreak_present)
 	{
 		cbreak();
@@ -23,7 +24,7 @@ Game::Game(bool cbreak_present)
 		game_view.Print("Hello world!");
 		game_view.Print("'cbreak' was not present.");
 	}
-	hero_stats.Print("Test window", true);
+	hero_stats.Print("Test window");
 	//abilities.Print("Another test", true);
 	vector<string> abil = {"Attack", "Defend", "Special 1", "Special 2", "Ultimate", "Transform"};
 	abilities.Menu(abil);

diff --git a/classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o b/classes/GameWindow/CMakeFiles/window.dir/GameWindow.cpp.o
diff --git a/classes/GameWindow/GameWindow.cpp b/classes/GameWindow/GameWindow.cpp
@@ -43,7 +43,7 @@ void GameWindow::Menu(vector<string> menus)
 				wattron(window, A_REVERSE);
 			}
 			//GameWindow::Print(menus[i].c_str(), i, 1);
-			mvwprintw(window, i + 1, 1, menus[i].c_str());
+			mvwprintw(window, 2*i + 1, 1, menus[i].c_str());
 			wattroff(window, A_REVERSE);
 		}
 		choice = wgetch(window);

diff --git a/obj/libgame.a b/obj/libgame.a
diff --git a/obj/libwindow.a b/obj/libwindow.a