shithub: qk1

Download patch

ref: 35ef4f5f660d802a0cf766c44b192426e0c8e492
parent: 02611e064eceed8d8cda8cc4d6e60f8f1833ea72
author: Konstantinn Bonnet <[email protected]>
date: Sun Feb 22 05:09:12 EST 2015

remove -winsize, -width, -height

just resize the window with rio/rc or whatever.

--- a/README
+++ b/README
@@ -12,11 +12,11 @@
 	- cdaudio, networking: PORTME
 	- high resolutions work up to 4096x4096 (arbitrary limit in r_shared.h)
 		. by default, quake uses a 8MB heap, which will be insufficient for higher
-		resolutions → exit with "Hunk_Alloc: failed on ..."
+		resolutions → crash/exit with "Hunk_Alloc: failed on ..."
 			-> use -mem param, e.g.
 			% qk1 -mem 24
-		. resolutions under e.g. 320x240 don't work
-	- don't use -winsize, -width, -height; just resize the window (bugsbugsbugs)
+		. resolutions under around 328x160 don't work, possibly because
+		menu text isn't scaled down, or something
 	- mouse is grabbed using m_windowed cvar
 		. open console (~)
 		. type m_windowed 1 (can autocomplete w/ tab)
@@ -30,9 +30,6 @@
 	-nostdout
 	-mem %d
 	(-noudp)
-	(-winsize %d %d)
-	(-width %d)
-	(-height %d)
 
 
 port notes
@@ -46,6 +43,8 @@
 	so needs fixing
 	- vid_9.c: shitty, can probably improve performance a bit without screwing code
 	- *printf -> *print was stupid
+	- removed some of the command line parameters
+		. -winsize, -width, -height: just set the window dimensions with rio/rc
 
 
 todo/issues
--- a/vid_9.c
+++ b/vid_9.c
@@ -216,13 +216,7 @@
 
 void VID_Init (unsigned char *palette)
 {
-	int pnum;
-
 	ignorenext = 0;
-	//vid.width = 320;
-	//vid.height = 200;
-	vid.width = -1;
-	vid.height = -1;
 	vid.maxwarpwidth = WARP_WIDTH;
 	vid.maxwarpheight = WARP_HEIGHT;
 	vid.numpages = 2;
@@ -233,36 +227,10 @@
 
 	srand(getpid());
 
-	if(pnum = COM_CheckParm("-winsize")){
-		if(pnum >= com_argc-2)
-			Sys_Error("VID: -winsize <width> <height>\n");
-		vid.width = Q_atoi(com_argv[pnum+1]);
-		vid.height = Q_atoi(com_argv[pnum+2]);
-		if(!vid.width || !vid.height)
-			Sys_Error("VID: Bad window width/height\n");
-	}
-	if(pnum = COM_CheckParm("-width")){
-		if(pnum >= com_argc-1)
-			Sys_Error("VID: -width <width>\n");
-		vid.width = Q_atoi(com_argv[pnum+1]);
-		if(!vid.width)
-			Sys_Error("VID: Bad window width\n");
-	}
-	if(pnum = COM_CheckParm("-height")){
-		if(pnum >= com_argc-1)
-			Sys_Error("VID: -height <height>\n");
-		vid.height = Q_atoi(com_argv[pnum+1]);
-		if(!vid.height)
-			Sys_Error("VID: Bad window height\n");
-	}
-
 	if(initdraw(nil, nil, "quake") < 0)
 		Sys_Error("VID_Init:initdraw");
-
-	if(vid.width == -1)
-		vid.width = Dx(screen->r);
-	if(vid.height == -1)
-		vid.height = Dy(screen->r);
+	vid.width = Dx(screen->r);
+	vid.height = Dy(screen->r);
 	if(screen->chan == CMAP8)
 		VID_SetPalette(palette);
 	ResetFrameBuffer();