13 Commits
v1.27 ... v1.28

3 changed files with 20 additions and 11 deletions

View File

@@ -39,7 +39,7 @@ $(shell mkdir -p $(RLS_DIR))
$(shell mkdir -p $(BUILD_DIR)) $(shell mkdir -p $(BUILD_DIR))
# phony rules # phony rules
.PHONY := all debug release clean install uninstall .PHONY = all debug release clean install uninstall
all: release all: release

View File

@@ -37,7 +37,7 @@ $(shell if not exist $(RLS_DIR) mkdir $(RLS_DIR))
$(shell if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)) $(shell if not exist $(BUILD_DIR) mkdir $(BUILD_DIR))
# phony rules # phony rules
.PHONY := all debug release clean libraries_debug libraries_release both .PHONY = all debug release clean libraries_debug libraries_release both
all: release all: release

View File

@@ -44,10 +44,11 @@ void startGame(Board &board)
{ {
usleep((1000 / MAX_TIME) * 1000); usleep((1000 / MAX_TIME) * 1000);
#ifndef _WIN32 #ifndef _WIN32
if((w.ws_row < boardSize.x + 3 )||( w.ws_col < boardSize.y + 2)) { 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, w.ws_row / 2, "Your terminal is too small:");
mvprintw(w.ws_col / 2 + 2, w.ws_row/2, "Min size: %dx%d", boardSize.x + 3, boardSize.y + 2); 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(); refresh();
continue; continue;
} }
@@ -177,10 +178,10 @@ void startGame(Board &board)
cursorX = (cursorX < boardSize.x - 1) ? cursorX + 1 : 0; cursorX = (cursorX < boardSize.x - 1) ? cursorX + 1 : 0;
break; break;
case 'q': case 'q':
exit(0);
echo(); echo();
cbreak(); cbreak();
endwin(); endwin();
exit(0);
break; break;
case 'z': case 'z':
if (!somethingHasBeenDone) if (!somethingHasBeenDone)
@@ -282,11 +283,13 @@ void startGame(Board &board)
{ {
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); else if (c == 'q')
{
echo(); echo();
cbreak(); cbreak();
endwin(); endwin();
exit(0);
} }
}; };
} }
@@ -312,11 +315,13 @@ void startGame(Board &board)
{ {
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); else if (c == 'q')
{
echo(); echo();
cbreak(); cbreak();
endwin(); endwin();
exit(0);
} }
}; };
} }
@@ -324,14 +329,18 @@ void startGame(Board &board)
int main() int main()
{ {
#ifndef _WIN32
signal(SIGWINCH, handleSIGWINCH); signal(SIGWINCH, handleSIGWINCH);
#endif
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
initscr(); initscr();
noecho(); noecho();
cbreak(); cbreak();
keypad(stdscr, TRUE); keypad(stdscr, TRUE);
nodelay(stdscr, TRUE); nodelay(stdscr, TRUE);
#ifndef _WIN32
ioctl(STDOUT_FILENO, TIOCGWINSZ, &w); ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
#endif
start_color(); start_color();
init_pair(1, COLOR_BLUE, COLOR_BLACK); init_pair(1, COLOR_BLUE, COLOR_BLACK);