Merge branch 'main' of https://gitea.codersquack.nl/thorium1256/minesweeper
This commit is contained in:
commit
b1af7b4f41
44
src/main.cpp
44
src/main.cpp
@ -8,6 +8,15 @@
|
|||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "Board.h"
|
#include "Board.h"
|
||||||
|
#ifndef _WIN32
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
struct winsize w;
|
||||||
|
void handleSIGWINCH(int sig)
|
||||||
|
{
|
||||||
|
ioctl(STDIN_FILENO, TIOCGWINSZ, &w);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#define MAX_TIME 60
|
#define MAX_TIME 60
|
||||||
|
|
||||||
@ -33,8 +42,16 @@ void startGame(Board &board)
|
|||||||
|
|
||||||
while (gameRunning)
|
while (gameRunning)
|
||||||
{
|
{
|
||||||
|
|
||||||
usleep((1000 / MAX_TIME) * 1000);
|
usleep((1000 / MAX_TIME) * 1000);
|
||||||
|
#ifndef _WIN32
|
||||||
|
if((w.ws_row < boardSize.x + 3 )||( w.ws_col < boardSize.y + 2)) {
|
||||||
|
mvprintw(w.ws_col/2, w.ws_row/2, "Your terminal is too small:");
|
||||||
|
mvprintw(w.ws_col / 2 + 1, w.ws_row/2, "Current size: %dx%d", w.ws_row, w.ws_col);
|
||||||
|
mvprintw(w.ws_col / 2 + 2, w.ws_row/2, "Min size: %dx%d", boardSize.x + 3, boardSize.y + 2);
|
||||||
|
refresh();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
if (board.isGameOver() || board.isGameWon())
|
if (board.isGameOver() || board.isGameWon())
|
||||||
{
|
{
|
||||||
gameRunning = false;
|
gameRunning = false;
|
||||||
@ -161,6 +178,9 @@ void startGame(Board &board)
|
|||||||
break;
|
break;
|
||||||
case 'q':
|
case 'q':
|
||||||
exit(0);
|
exit(0);
|
||||||
|
echo();
|
||||||
|
cbreak();
|
||||||
|
endwin();
|
||||||
break;
|
break;
|
||||||
case 'z':
|
case 'z':
|
||||||
if (!somethingHasBeenDone)
|
if (!somethingHasBeenDone)
|
||||||
@ -255,12 +275,18 @@ void startGame(Board &board)
|
|||||||
mvprintw(1, 8, "%s", tim);
|
mvprintw(1, 8, "%s", tim);
|
||||||
attroff(COLOR_PAIR(3));
|
attroff(COLOR_PAIR(3));
|
||||||
refresh();
|
refresh();
|
||||||
while ((c = getch()) != 'q')
|
while (true)
|
||||||
{
|
{
|
||||||
|
c = getch();
|
||||||
if (c == 'r')
|
if (c == 'r')
|
||||||
{
|
{
|
||||||
Board newBoard(boardSize.x, boardSize.y, board.getMineCount());
|
Board newBoard(boardSize.x, boardSize.y, board.getMineCount());
|
||||||
startGame(newBoard);
|
startGame(newBoard);
|
||||||
|
} else if(c == 'q') {
|
||||||
|
exit(0);
|
||||||
|
echo();
|
||||||
|
cbreak();
|
||||||
|
endwin();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -279,12 +305,18 @@ void startGame(Board &board)
|
|||||||
attroff(COLOR_PAIR(3));
|
attroff(COLOR_PAIR(3));
|
||||||
refresh();
|
refresh();
|
||||||
int c;
|
int c;
|
||||||
while ((c = getch()) != 'q')
|
while (true)
|
||||||
{
|
{
|
||||||
|
c = getch();
|
||||||
if (c == 'r')
|
if (c == 'r')
|
||||||
{
|
{
|
||||||
Board newBoard(boardSize.x, boardSize.y, board.getMineCount());
|
Board newBoard(boardSize.x, boardSize.y, board.getMineCount());
|
||||||
startGame(newBoard);
|
startGame(newBoard);
|
||||||
|
} else if(c == 'q') {
|
||||||
|
exit(0);
|
||||||
|
echo();
|
||||||
|
cbreak();
|
||||||
|
endwin();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -292,12 +324,14 @@ void startGame(Board &board)
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
signal(SIGWINCH, handleSIGWINCH);
|
||||||
setlocale(LC_ALL, "");
|
setlocale(LC_ALL, "");
|
||||||
initscr();
|
initscr();
|
||||||
noecho();
|
noecho();
|
||||||
cbreak();
|
cbreak();
|
||||||
keypad(stdscr, TRUE);
|
keypad(stdscr, TRUE);
|
||||||
nodelay(stdscr, TRUE);
|
nodelay(stdscr, TRUE);
|
||||||
|
ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
|
||||||
|
|
||||||
start_color();
|
start_color();
|
||||||
init_pair(1, COLOR_BLUE, COLOR_BLACK);
|
init_pair(1, COLOR_BLUE, COLOR_BLACK);
|
||||||
@ -328,9 +362,9 @@ int main()
|
|||||||
attroff(A_REVERSE);
|
attroff(A_REVERSE);
|
||||||
mvprintw(3, 2, choice == 1 ? "" : "Intermediate (16x16, 40 mines)");
|
mvprintw(3, 2, choice == 1 ? "" : "Intermediate (16x16, 40 mines)");
|
||||||
attron(A_REVERSE);
|
attron(A_REVERSE);
|
||||||
mvprintw(4, 2, choice == 2 ? "Expert (16x30, 99 mines)" : "");
|
mvprintw(4, 2, choice == 2 ? "Expert (30x16, 99 mines)" : "");
|
||||||
attroff(A_REVERSE);
|
attroff(A_REVERSE);
|
||||||
mvprintw(4, 2, choice == 2 ? "" : "Expert (16x30, 99 mines)");
|
mvprintw(4, 2, choice == 2 ? "" : "Expert (30x16, 99 mines)");
|
||||||
refresh();
|
refresh();
|
||||||
|
|
||||||
int ch = getch();
|
int ch = getch();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user