fix: game can tie and also refactored element.cpp
This commit is contained in:
@@ -1,21 +1,5 @@
|
||||
#include <iostream>
|
||||
#include "elements.hpp"
|
||||
|
||||
Point::Point() {
|
||||
m_row = 0;
|
||||
m_col = 0;
|
||||
}
|
||||
|
||||
void Point::assign(int row, int col) {
|
||||
m_row = row;
|
||||
m_col = col;
|
||||
}
|
||||
|
||||
void Point::to_string() {
|
||||
std::cout << "(" << m_row << ", " << m_col << ")" << std::endl;
|
||||
}
|
||||
|
||||
|
||||
void Player::check_line(Tile (&tile_list)[9]) {
|
||||
for(int i = 0; i <= 6; i += 3) {
|
||||
if(tile_list[i].m_symbol == tile_list[i+1].m_symbol && tile_list[i+1].m_symbol == tile_list[i+2].m_symbol) {
|
||||
|
||||
+15
-8
@@ -3,7 +3,6 @@
|
||||
#include "window.hpp"
|
||||
#include "input.hpp"
|
||||
#include "elements.hpp"
|
||||
#include "globals.hpp"
|
||||
|
||||
int main() {
|
||||
Input input;
|
||||
@@ -11,12 +10,14 @@ int main() {
|
||||
Player player_one('x', true);
|
||||
Player player_two('o', false);
|
||||
bool running = true;
|
||||
int count = 0;
|
||||
|
||||
Tile tile_list[9] = {
|
||||
Tile(0, 0), Tile(0, 2), Tile(0, 4),
|
||||
Tile(2, 0), Tile(2, 2), Tile(2, 4),
|
||||
Tile(4, 0), Tile(4, 2), Tile(4, 4)
|
||||
};
|
||||
|
||||
Border border_list[16] = {
|
||||
Border(0, 1, '|'), Border(0, 3, '|'),
|
||||
Border(1, 0, '-'), Border(1, 1, '+'), Border(1, 2, '-'), Border(1, 3, '+'), Border(1, 4, '-'),
|
||||
@@ -28,16 +29,22 @@ int main() {
|
||||
std::thread input_thread(&Input::get_input, &input, std::ref(running), std::ref(tile_list), std::ref(player_one), std::ref(player_two));
|
||||
|
||||
while (running) {
|
||||
if(player_one.m_win) {
|
||||
running = false;
|
||||
std::cout << "Player 1 wins!" << std::endl;
|
||||
} else if(player_two.m_win) {
|
||||
running = false;
|
||||
std::cout << "Player 2 wins!" << std::endl;
|
||||
}
|
||||
window.terminate(tile_list, running);
|
||||
window.update_display(tile_list, border_list);
|
||||
player_one.check_line(tile_list);
|
||||
player_two.check_line(tile_list);
|
||||
if(player_one.m_win) {
|
||||
running = false;
|
||||
std::cout << "Game Over! Player 1 wins!" << std::endl;
|
||||
} else if(player_two.m_win) {
|
||||
running = false;
|
||||
std::cout << "Game Over! Player 2 wins!" << std::endl;
|
||||
}
|
||||
if(player_one.m_turn) {
|
||||
std::cout << "Current Player: " << player_one.m_symbol << std::endl;
|
||||
} if(player_two.m_turn) {
|
||||
std::cout << "Current Player: " << player_two.m_symbol << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
input_thread.join();
|
||||
|
||||
+16
-1
@@ -3,6 +3,22 @@
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
|
||||
void Window::terminate(Tile (&tile_list)[9], bool &running) {
|
||||
if(tile_list[0]._delete && tile_list[0].m_symbol != ' '
|
||||
&& tile_list[1]._delete && tile_list[1].m_symbol != ' '
|
||||
&& tile_list[2]._delete && tile_list[2].m_symbol != ' '
|
||||
&& tile_list[3]._delete && tile_list[3].m_symbol != ' '
|
||||
&& tile_list[4]._delete && tile_list[4].m_symbol != ' '
|
||||
&& tile_list[5]._delete && tile_list[5].m_symbol != ' '
|
||||
&& tile_list[6]._delete && tile_list[6].m_symbol != ' '
|
||||
&& tile_list[7]._delete && tile_list[7].m_symbol != ' '
|
||||
&& tile_list[8]._delete && tile_list[8].m_symbol != ' ') {
|
||||
std::cout << "Game Over! Tie" << std::endl;
|
||||
running = false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void Window::update_display(Tile (&tile_list)[9], Border (&border_list)[16]) {
|
||||
for(std::array<char, COL> &row : m_board) { row.fill('.'); }
|
||||
|
||||
@@ -13,7 +29,6 @@ void Window::update_display(Tile (&tile_list)[9], Border (&border_list)[16]) {
|
||||
m_board[border_list[i].m_pos.m_row][border_list[i].m_pos.m_col] = border_list[i].m_symbol;
|
||||
}
|
||||
|
||||
// Refresh and draw screen
|
||||
std::cout << "\033[H" << std::flush;
|
||||
for(std::array<char, COL> &row : m_board) {
|
||||
for(char &col : row) {
|
||||
|
||||
Reference in New Issue
Block a user