More common controls

abakh · Feb 2, 2022 · 2199c6e · 2199c6e
1 parent aaf092d
commit 2199c6e
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 34 deletions.
diff --git a/battleship.c b/battleship.c
@@ -267,7 +267,7 @@ void set_the_board(bool side){
 				++px;
 			if( input=='\n'||input==KEY_ENTER )
 				break;
-			if( input=='q' )
+			if( (input=='q'||input==27) )
 				sigint_handler(EXIT_SUCCESS);
 		}
 
@@ -603,7 +603,7 @@ int main(int argc,char** argv){
 			input=getch();
 			if(input == KEY_F(1) || input=='?' )
 				help(turn);
-			if(input == KEY_F(2) )
+			if((input==KEY_F(2)||input=='!') )
 				gameplay(turn);
 			if(input == KEY_MOUSE)
 				mouseinput(1);
@@ -615,7 +615,7 @@ int main(int argc,char** argv){
 				--px;
 			if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<19)
 				++px;
-			if( input=='q')
+			if( (input=='q'||input==27))
 				sigint_handler(EXIT_SUCCESS);
 			if( input=='\n' || input==KEY_ENTER){
 				byte r=shoot(turn,py,px-10);

diff --git a/checkers.c b/checkers.c
@@ -661,7 +661,7 @@ int main(int argc,char** argv){
 		input=getch();
 		if( input == KEY_F(1) || input=='?' )
 			help();
-		if( input == KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( input == KEY_MOUSE )
 			mouseinput();
@@ -673,7 +673,7 @@ int main(int argc,char** argv){
 			--px;
 		if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<7)
 			++px;
-		if( input=='q'){
+		if( (input=='q'||input==27)){
 			result=2;
 			goto End;
 		}

diff --git a/fifteen.c b/fifteen.c
@@ -246,7 +246,7 @@ int main(int argc, char** argv){
 		input = getch();
 		if( input==KEY_F(1) || input=='?' )
 			help();
-		if( input==KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( input==KEY_MOUSE )
 			mouseinput();
@@ -258,7 +258,7 @@ int main(int argc, char** argv){
 			--px;
 		if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<size-1)
 			++px;
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if(input=='\n'||input==KEY_ENTER){
 			slide_multi(board,py,px);

diff --git a/fisher.c b/fisher.c
@@ -353,7 +353,7 @@ int main(int argc,char** argv){
 		}
 		if(input=='?' || input==KEY_F(1))
 			help();
-		if(input=='q')
+		if((input=='q'||input==27))
 			break;
 		if(!hooknum)
 			break;	

diff --git a/jewels.c b/jewels.c
@@ -319,7 +319,7 @@ int main(int argc,char** argv){
                                 getch();
                                 halfdelay(DELAY);
                         }
-                        else if(input=='q')
+                        else if((input=='q'||input==27))
                                 goto Lose;
                         else if(input==' ')
                                 while( (falls=fall()) )

diff --git a/memoblocks.c b/memoblocks.c
@@ -220,7 +220,7 @@ int main(int argc,char** argv){
 		input = getch();
 		if( input==KEY_F(1) || input=='?' )
 			help();
-		if( input==KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( input==KEY_MOUSE )
 			mouseinput();
@@ -232,7 +232,7 @@ int main(int argc,char** argv){
 			--px;
 		if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<size2-1)
 			++px;
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if(input=='\n' || input==KEY_ENTER){
 			if(fy!=-1 && board[py][px]==board[fy][fx] && !(fy==py && fx==px) )

diff --git a/miketron.c b/miketron.c
@@ -439,7 +439,7 @@ int main(int argc,char** argv){
 		}
 		if( input == KEY_F(1) || input=='?' )
 			help();
-		if( input == KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		halfspeed=!halfspeed;
 		if( (input=='k' || (input==KEY_UP||input=='w')) ){
@@ -454,7 +454,7 @@ int main(int argc,char** argv){
 			direction=LEFT;
 		else if( (input=='l' || (input==KEY_RIGHT||input=='d')) )
 			direction=RIGHT;
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if(input=='e'){
 			for(int b=0;b<6;++b){

diff --git a/mines.c b/mines.c
@@ -360,7 +360,7 @@ int main(int argc, char** argv){
 		}	
 		if( input==KEY_F(1) || input=='?' )
 			help();
-		if( input==KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( input==KEY_MOUSE )
 			mouseinput(sy,sx);
@@ -372,7 +372,7 @@ int main(int argc, char** argv){
 			--px;
 		if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<wid-1)
 			++px;
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if(input=='x' && getch()=='y' && getch()=='z' && getch()=='z' && getch()=='y' ){
 			if(first_click){

diff --git a/muncher.c b/muncher.c
@@ -353,7 +353,7 @@ int main(int argc, char** argv){
 		input = getch();
 		if( input == KEY_F(1) || input=='?' )
 			help();
-		if( input==KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( (input=='k' || (input==KEY_UP||input=='w')) && py>0 ){
 			direction=UP;
@@ -369,7 +369,7 @@ int main(int argc, char** argv){
 			direction=RIGHT;
 		if( input=='e')
 			epilepsy=1;
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if( input=='p'){
 			nocbreak();

diff --git a/nbsdgames.c b/nbsdgames.c
@@ -282,7 +282,7 @@ int menu(char* entries,char* title){
 	if(input=='\n'){
 		return chosen;
 	}
-	if(input=='q'){
+	if((input=='q'||input==27)){
 		return -1;
 	}
 	goto Refresh;

diff --git a/pipes.c b/pipes.c
@@ -387,7 +387,7 @@ int main(int argc, char** argv){
 			if(!flow)
 				tstart += time(NULL)-now;
 		}
-		if( input == KEY_F(2) ){
+		if( (input==KEY_F(2)||input=='!') ){
 			gameplay();
 			if(!flow)
 				tstart += time(NULL)-now;
@@ -436,13 +436,13 @@ int main(int argc, char** argv){
 			flow=1;
 		if( score < -1000)
 			goto End;
-		if( input=='q'){
+		if( (input=='q'||input==27)){
 			nocbreak();
 			cbreak();
 			curs_set(1);
 			mvprintw(len+2,0,"Do you want to see the high scores?(y/n)");
 			input=getch();
-			if(input == 'N' || input=='n' || input =='q')
+			if(input == 'N' || input=='n' || (input=='q'||input==27))
 				sigint_handler(EXIT_SUCCESS);
 
 			show_scores(save_score());

diff --git a/rabbithole.c b/rabbithole.c
@@ -272,7 +272,7 @@ int main(int argc,char** argv){
 			if(sx< -(wid*2+1))
 				sx=-(wid*2+1);
 		}
-		if( input == KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( input == KEY_F(1) || input=='?' )
 			help();
@@ -284,7 +284,7 @@ int main(int argc,char** argv){
 			--px;
 		if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<wid-1 && (board[py][px]&RIGHT) )
 			++px;
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if( board[py][px] & CARROT ){
 			++carrots_found;

diff --git a/redsquare.c b/redsquare.c
@@ -579,7 +579,7 @@ int main(int argc,char** argv){
 
 		if( input==KEY_F(1) || input=='?' )
 			help();
-		if( input==KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		prey=py;
 		prex=px;
@@ -610,7 +610,7 @@ int main(int argc,char** argv){
 			mk_square(board);
 		}
 		DidntMove:
-		if( input=='q'){
+		if( (input=='q'||input==27)){
 			sigint_handler(0);
 		}
 		if( input=='p'){
@@ -630,7 +630,7 @@ int main(int argc,char** argv){
 		if( input=='?' || input==KEY_F(1)){
 			help();
 		}
-		if( input=='!' || input==KEY_F(2)){
+		if( input=='!' || (input==KEY_F(2)||input=='!')){
 			gameplay();
 		}
 	}

diff --git a/reversi.c b/reversi.c
@@ -395,7 +395,7 @@ int main(int argc , char** argv){
 			input=getch();
 			if( input==KEY_F(1) || input=='?' )
 				help();
-			if( input==KEY_F(2) )
+			if( (input==KEY_F(2)||input=='!') )
 				gameplay();
 			if( input==KEY_MOUSE )
 				mouseinput();
@@ -407,7 +407,7 @@ int main(int argc , char** argv){
 				--px;
 			if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<7)
 				++px;
-			if( input=='q'){
+			if( (input=='q'||input==27)){
 				resign=1;
 				goto End;
 			}

diff --git a/snakeduel.c b/snakeduel.c
@@ -706,7 +706,7 @@ int main(int argc, char** argv){
 		input = getch();
 		if( input == KEY_F(1) || input=='?' )
 			help();
-		if( input==KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( (input=='k' || (input==KEY_UP||input=='w')) && p.y>0 && p.direction != DOWN ){
 			p.direction=UP;
@@ -720,7 +720,7 @@ int main(int argc, char** argv){
 		if( (input=='l' || (input==KEY_RIGHT||input=='d')) && p.x<wid-1 && p.direction != LEFT){
 			p.direction=RIGHT;
 		}
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if( input=='p'){
 			nocbreak();

diff --git a/sos.c b/sos.c
@@ -399,7 +399,7 @@ int main(int argc, char** argv){
 		}
 		if( input==KEY_F(1) || input=='?')
 			help();
-		if( input==KEY_F(2) )
+		if( (input==KEY_F(2)||input=='!') )
 			gameplay();
 		if( input==KEY_MOUSE )
 			mouseinput(sy,sx);
@@ -411,7 +411,7 @@ int main(int argc, char** argv){
 			--px;
 		if( (input=='l' || (input==KEY_RIGHT||input=='d')) && px<wid-1)
 			++px;
-		if( input=='q')
+		if( (input=='q'||input==27))
 			sigint_handler(0);
 		if(!board[py][px] && (input=='s'||input=='S'||input=='o'||input=='O') ){
 			if(input=='s'||input=='S')

diff --git a/sudoku.c b/sudoku.c
@@ -490,7 +490,7 @@ int main(int argc,char** argv){
 		}
 		if(input == KEY_F(1))
 			help();
-		if(input == KEY_F(2))
+		if((input==KEY_F(2)||input=='!'))
 			gameplay();
 		if(input == KEY_MOUSE)
 			mouseinput(sy,sx);
@@ -508,7 +508,7 @@ int main(int argc,char** argv){
 			else if(input<=CHAR_MAX && sgn2int(input) && sgn2int(input)<=s )
 				game[py][px]=input;
 		}
-		if( (input=='q' && size<= 5) || input=='Q')
+		if( ((input=='q'||input==27) && size<= 5) || input=='Q')
 			sigint_handler(EXIT_SUCCESS);
 		if(input=='n'&& size <= 4)
 			goto Start;