wl_game.c: Removed DrawAllPlayBorderSides and DrawAllPlayBorder, and

replaced them with the actual function they were calling.

wl_menu.c, wl_game.c: now viewsize 20 is allowed (width = 320, so no more
border).

src/wl_def.h

@@ -748,9 +748,9 @@ void ClearMemory (void);
 void PlayDemo(int demonumber);
 int PlayDemoFromFile(char *demoname);
 void RecordDemo (void);
-void DrawAllPlayBorder (void);
+void DrawPlayBorder (void);
 void	DrawHighScores(void);
-void DrawAllPlayBorderSides (void);
+void DrawPlayBorderSides (void);
 
 #define	PlaySoundLocTile(s,tx,ty)	PlaySoundLocGlobal(s,(((long)(tx) << TILESHIFT) + (1L << (TILESHIFT - 1))),(((long)ty << TILESHIFT) + (1L << (TILESHIFT - 1))))
 #define	PlaySoundLocActor(s,ob)		PlaySoundLocGlobal(s,(ob)->x,(ob)->y)

src/wl_game.c

@@ -602,42 +602,20 @@ void SetupGameLevel()
 
 void DrawPlayBorderSides()
 {
-	int	xl,yl;
-
+	int xl, yl;
+	
 	xl = 160-viewwidth/2;
 	yl = (200-STATUSLINES-viewheight)/2;
 
-	VW_Bar (0,0,xl-1,200-STATUSLINES,127);
-	VW_Bar (xl+viewwidth+1,0,xl-2,200-STATUSLINES,127);
-
-	VW_Vlin (yl-1,yl+viewheight,xl-1,0);
-	VW_Vlin (yl-1,yl+viewheight,xl+viewwidth,125);
-}
-
-
-/*
-===================
-=
-= DrawAllPlayBorderSides
-=
-===================
-*/
-
-void DrawAllPlayBorderSides()
-{
-	DrawPlayBorderSides();
-}
+	if (xl == 0) {
+		return;
+	} else {
+		VW_Bar(0,0,xl-1,200-STATUSLINES,127);
+		VW_Bar(xl+viewwidth+1,0,xl-2,200-STATUSLINES,127);
 
-/*
-===================
-=
-= DrawPlayBorder
-=
-===================
-*/
-void DrawAllPlayBorder()
-{
-	DrawPlayBorder();
+		VW_Vlin(yl-1,yl+viewheight,xl-1,0);
+		VW_Vlin(yl-1,yl+viewheight,xl+viewwidth,125);
+	}
 }
 
 /*
@@ -652,17 +630,21 @@ void DrawPlayBorder()
 {
 	int xl, yl;
 
-	VW_Bar (0,0,320,200-STATUSLINES,127);
-
+	VW_Bar(0,0,320,200-STATUSLINES+1,127);
+		
 	xl = 160-viewwidth/2;
 	yl = (200-STATUSLINES-viewheight)/2;
-	VW_Bar (xl,yl,viewwidth,viewheight,0);
-
-	VW_Hlin (xl-1,xl+viewwidth,yl-1,0);
-	VW_Hlin (xl-1,xl+viewwidth,yl+viewheight,125);
-	VW_Vlin (yl-1,yl+viewheight,xl-1,0);
-	VW_Vlin (yl-1,yl+viewheight,xl+viewwidth,125);
-	VW_Plot (xl-1,yl+viewheight,124);
+	VW_Bar(xl,yl,viewwidth,viewheight+1,0);
+
+	if (xl == 0) {
+		VW_Hlin(0,viewwidth-1,viewheight,125);
+	} else {	
+		VW_Hlin(xl-1,xl+viewwidth,yl-1,0);
+		VW_Hlin(xl-1,xl+viewwidth,yl+viewheight,125);
+		VW_Vlin(yl-1,yl+viewheight,xl-1,0);
+		VW_Vlin(yl-1,yl+viewheight,xl+viewwidth,125);
+		VW_Plot(xl-1,yl+viewheight,124);
+	}
 }
 
 /*

src/wl_menu.c

@@ -539,7 +539,7 @@ int CP_CheckQuick(unsigned scancode)
 				pickquick = gamestate.lives = 0;
 			}
 
-			DrawAllPlayBorder();
+			DrawPlayBorder();
 			WindowH=200;
 			fontnumber=0;
 			MainMenu[savegame].active = 0;
@@ -624,7 +624,7 @@ int CP_CheckQuick(unsigned scancode)
 				if (Confirm(string))
 					CP_LoadGame(1);
 
-				DrawAllPlayBorder();
+				DrawPlayBorder();
 				fontnumber=0;
 			}
 			else
@@ -694,7 +694,7 @@ int CP_CheckQuick(unsigned scancode)
 				Quit(NULL);
 			}
 
-			DrawAllPlayBorder();
+			DrawPlayBorder();
 			WindowH=200;
 			fontnumber=0;
 			return 1;
@@ -2463,8 +2463,8 @@ void CP_ChangeView(void)
 		case dir_North:
 		case dir_East:
 			newview++;
-			if (newview>19)
-				newview=19;
+			if (newview>20)
+				newview=20;
 			ShowViewSize(newview);
 			VW_UpdateScreen();
 			SD_PlaySound(HITWALLSND);

src/wl_play.c

@@ -602,7 +602,7 @@ void CheckKeys()
 
 		IN_Ack();
 		godmode ^= 1;
-		DrawAllPlayBorderSides();
+		DrawPlayBorderSides();
 		IN_ClearKeysDown();
 		return;
 	}
@@ -638,7 +638,7 @@ void CheckKeys()
 		IN_ClearKeysDown();
 		IN_Ack();
 
-		DrawAllPlayBorder ();
+		DrawPlayBorder ();
 	}
 
 	//
@@ -655,7 +655,7 @@ void CheckKeys()
 	 IN_ClearKeysDown();
 	 IN_Ack();
 
-	 DrawAllPlayBorderSides ();
+	 DrawPlayBorderSides ();
 	 DebugOk=1;
 	}
 
@@ -676,7 +676,7 @@ void CheckKeys()
 		IN_ClearKeysDown();
 		IN_Ack();
 
-		DrawAllPlayBorder();
+		DrawPlayBorder();
 	}
 
 	if (Paused) {
@@ -706,7 +706,7 @@ void CheckKeys()
 		ClearSplitVWB ();
 		US_ControlPanel(scan);
 	
-		DrawAllPlayBorderSides ();
+		DrawPlayBorderSides ();
 		VW_UpdateScreen();
 		
 		if (scan == sc_F9)