More conversion

Quake/gl_draw.cpp

@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //extern unsigned char d_15to8table[65536]; //johnfitz -- never used
 
-cvar_t		scr_conalpha = {"scr_conalpha", "0.5", CVAR_ARCHIVE}; //johnfitz
+convar		scr_conalpha = {"scr_conalpha", "0.5", {.archive = true}}; //johnfitz
 
 qpic_t		*draw_disc;
 qpic_t		*draw_backtile;
@@ -400,7 +400,7 @@ Draw_Init -- johnfitz -- rewritten
 */
 void Draw_Init (void)
 {
-	Cvar_RegisterVariable (&scr_conalpha);
+	scr_conalpha.inscribe();
 
 	// clear scrap and allocate gltextures
 	memset(scrap_allocated, 0, sizeof(scrap_allocated));
@@ -703,7 +703,7 @@ void GL_SetCanvas (canvastype newcanvas)
 		glViewport (glx, gly, glwidth, glheight);
 		break;
 	case CANVAS_MENU:
-		s = q_min((float)glwidth / 320.0f, (float)glheight / 200.0f);
+		s = std::min((float)glwidth / 320.0f, (float)glheight / 200.0f);
 		s = CLAMP (1.0f, scr_menuscale.value, s);
 		// ericw -- doubled width to 640 to accommodate long keybindings
 		glOrtho (0, 640, 200, 0, -99999, 99999);