renaming

include/element.hpp

@@ -22,9 +22,9 @@ struct Point {
 };
 
 int get_score();
-void determine_index_zero_pos(Point* (*board)[COL], Point** segments);
+void determine_index_zero_pos(Point* (*board)[COL], Point** buffer);
-void move_tail_indicies(Point** segments);
+void move_tail_indicies(Point** buffer);
-void on_fruit_eaten(Point* (*board)[COL], Point** segments);
+void on_fruit_eaten(Point* (*board)[COL], Point** buffer);
-bool segment_overlap(Point** segments);
+bool segment_overlap(Point** buffer);
 
 #endif // ELEMENT_HPP

include/window.hpp

@@ -8,7 +8,7 @@ struct Window {
 	Point* m_board[ROW][COL] = {};
 	void clear_display();
 	void draw_display(int milliseconds);
-	void update_display(Point* segments[]);
+	void update_display(Point** buffer);
 };
 
 #endif // WINDOW_HPP

src/element.cpp

@@ -1,6 +1,7 @@
 #include "element.hpp"
 #include <cstdlib>
 #include <ctime>
+
 int _score = 0;
 
 int get_score() {
@@ -12,78 +13,78 @@ void Point::set_new_point(int row, int col) {
 	m_col = col;
 }
 
-void determine_index_zero_pos(Point* (*board)[COL], Point** segments) {
+void determine_index_zero_pos(Point* (*board)[COL], Point** buffer) {
-	Point new_point = { segments[0]->m_row, segments[0]->m_col, '.' }; 
+	Point new_point = { buffer[0]->m_row, buffer[0]->m_col, '.' }; 
 
-	if(segments[1] == nullptr) {
+	if(buffer[1] == nullptr) {
-		segments[1] = new Point { segments[0]->m_row, segments[0]->m_col, '.' };
+		buffer[1] = new Point { buffer[0]->m_row, buffer[0]->m_col, '.' };
 	} else {
-		segments[1]->set_new_point(segments[0]->m_row, segments[0]->m_col);
+		buffer[1]->set_new_point(buffer[0]->m_row, buffer[0]->m_col);
 	}
 
-	if (segments[0]->m_dir == LEFT) {
+	if (buffer[0]->m_dir == LEFT) {
 		if (new_point.m_col <= 0) new_point.m_col = COL - 1;
 		else new_point.m_col--;
-	} else if (segments[0]->m_dir == RIGHT) {
+	} else if (buffer[0]->m_dir == RIGHT) {
 		if (new_point.m_col >= COL - 1) new_point.m_col = 0;
 		else new_point.m_col++;
-	} else if (segments[0]->m_dir == UP) {
+	} else if (buffer[0]->m_dir == UP) {
 		if (new_point.m_row <= 0) new_point.m_row = ROW - 1;
 		else new_point.m_row--;
-	} else if (segments[0]->m_dir == DOWN) {
+	} else if (buffer[0]->m_dir == DOWN) {
 		if (new_point.m_row >= ROW - 1) new_point.m_row = 0;
 		else new_point.m_row++;
 	}
-	segments[0]->set_new_point(new_point.m_row, new_point.m_col);
+	buffer[0]->set_new_point(new_point.m_row, new_point.m_col);
 }
 
-void move_tail_indicies(Point** segments) {
+void move_tail_indicies(Point** buffer) {
-	Point* previous_head = segments[1];
+	Point* previous_head = buffer[1];
-	int new_row = segments[1]->m_row;
+	int new_row = buffer[1]->m_row;
-	int new_col = segments[1]->m_col;
+	int new_col = buffer[1]->m_col;
 	Point* last_point = nullptr;
 	for(int i = (ROW * COL) - 1; i > 3; i--) {
-		if(segments[i] == nullptr) {
+		if(buffer[i] == nullptr) {
-			last_point = segments[i - 1];
+			last_point = buffer[i - 1];
 			continue;
 		}
-		segments[i] = segments[i - 1];
+		buffer[i] = buffer[i - 1];
 	}
-	segments[3] = last_point;
+	buffer[3] = last_point;
-	if(segments[3] != nullptr) {
+	if(buffer[3] != nullptr) {
-		segments[3]->set_new_point(new_row, new_col);
+		buffer[3]->set_new_point(new_row, new_col);
 	}
 }
 
-void _append_tail(Point *(*board)[COL], Point** segments) {
+void _append_tail(Point *(*board)[COL], Point** buffer) {
 	for(int i = (ROW * COL) - 1; i >= 3; i--) {
-		segments[i] = segments[i - 1];
+		buffer[i] = buffer[i - 1];
 	}
-	Point* old_tail = segments[4];
+	Point* old_tail = buffer[4];
 	if(old_tail != nullptr) {
-		segments[3] = new Point { old_tail->m_row, old_tail->m_col, '@' };
+		buffer[3] = new Point { old_tail->m_row, old_tail->m_col, '@' };
 	} else {
-		segments[3] = new Point {};
+		buffer[3] = new Point {};
 	}
 }
 
-void on_fruit_eaten(Point* (*board)[COL], Point** segments) {
+void on_fruit_eaten(Point* (*board)[COL], Point** buffer) {
 	int row, col;
-	if(segments[2]->m_row == segments[0]->m_row && segments[2]->m_col == segments[0]->m_col) {
+	if(buffer[2]->m_row == buffer[0]->m_row && buffer[2]->m_col == buffer[0]->m_col) {
 		do {
 			row = (rand() % ROW);
 			col = (rand() % COL);
 		} while (board[row][col] != nullptr);
-		segments[2]->set_new_point(row, col);
+		buffer[2]->set_new_point(row, col);
-		_append_tail(board, segments);
+		_append_tail(board, buffer);
 		_score++;
 	}
 }
 
-bool segment_overlap(Point** segments) {
+bool segment_overlap(Point** buffer) {
 	for(int i = (ROW * COL) - 1; i > 3; i--) {
-		if(segments[i] == nullptr) continue;
+		if(buffer[i] == nullptr) continue;
-		if(segments[i]->m_row == segments[0]->m_row && segments[i]->m_col == segments[0]->m_col) {
+		if(buffer[i]->m_row == buffer[0]->m_row && buffer[i]->m_col == buffer[0]->m_col) {
 			return true;
 		}
 	}

src/main.cpp

@@ -11,35 +11,35 @@ int main () {
 	Input input;
 	bool running = true;
 
-	Point* segments[(ROW * COL) + 3] = {}; // 2 for head, 1 for fruit, rest for tail
+	Point* buffer[(ROW * COL) + 3] = {}; // 2 for head, 1 for fruit, rest for tail
-	segments[0] = new Point { ROW / 2, COL / 2, '*' }; // Head
+	buffer[0] = new Point { ROW / 2, COL / 2, '*' }; // Head
-	segments[2] = new Point { (rand() % ROW), (rand() % COL), 'o' }; // Fruit
+	buffer[2] = new Point { (rand() % ROW), (rand() % COL), 'o' }; // Fruit
 
-	std::thread input_thread([&] { input.get_input(segments[0]->m_dir, running); } ); 
+	std::thread input_thread([&] { input.get_input(buffer[0]->m_dir, running); } ); 
 
 	while (running) {
-		on_fruit_eaten(window.m_board, segments);
+		on_fruit_eaten(window.m_board, buffer);
-		determine_index_zero_pos(window.m_board, segments);
+		determine_index_zero_pos(window.m_board, buffer);
-		move_tail_indicies(segments);
+		move_tail_indicies(buffer);
 
 		for(int i = (ROW * COL) - 1; i > 3; i--) {
-			if(segments[i] == nullptr) break;
+			if(buffer[i] == nullptr) break;
 			std::cout << "You win! Score: " << get_score() << std::endl;
 			running = false;
 		}
-		if(segment_overlap(segments)) {
+		if(segment_overlap(buffer)) {
 			std::cout << "You died! Score: " << get_score() << std::endl;
 			running = false;
 		}
 		window.clear_display();
-		window.update_display(segments);
+		window.update_display(buffer);
 		window.draw_display(200);
 	}
 
 	input_thread.join();
-	for(int i = (ROW * COL) - 1; i > 0; i--) {
+	for(int i = ((ROW * COL) + 3) - 1; i > 0; i--) {
-		if(segments[i] == nullptr) continue;
+		if(buffer[i] == nullptr) continue;
-		delete segments[i];
+		delete buffer[i];
 	}
 	return 0;
 }

src/window.cpp

@@ -23,12 +23,12 @@ void Window::draw_display(int milliseconds) {
 	std::this_thread::sleep_for(std::chrono::milliseconds((int) (milliseconds))); // 1000 / fps; 200ms = 5fps
 }
 
-void Window::update_display(Point* segments[]) {
+void Window::update_display(Point** buffer) {
-	m_board[segments[0]->m_row][segments[0]->m_col] = segments[0];
+	m_board[buffer[0]->m_row][buffer[0]->m_col] = buffer[0];
-	m_board[segments[2]->m_row][segments[2]->m_col] = segments[2];
+	m_board[buffer[2]->m_row][buffer[2]->m_col] = buffer[2];
 	for(int i = 3; i < ROW * COL; i++) {
-		if(segments[i] != nullptr) {
+		if(buffer[i] != nullptr) {
-			m_board[segments[i]->m_row][segments[i]->m_col] = segments[i];
+			m_board[buffer[i]->m_row][buffer[i]->m_col] = buffer[i];
 		}
 	}
 }