From 5c92b35c6e638308d8b9882c9319e109740afcdb Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 21 Oct 2000 21:14:12 +0000 Subject: [PATCH] fix width and height name issues --- source/vid_sgl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/vid_sgl.c b/source/vid_sgl.c index c316ba4..76a0e90 100644 --- a/source/vid_sgl.c +++ b/source/vid_sgl.c @@ -347,7 +347,7 @@ VID_Init (unsigned char *palette) if ((i = COM_CheckParm ("-conwidth")) != 0) vid.conwidth = atoi(com_argv[i+1]); else - vid.conwidth = width; + vid.conwidth = scr_width; vid.conwidth &= 0xfff8; // make it a multiple of eight if (vid.conwidth < 320) @@ -386,13 +386,13 @@ VID_Init (unsigned char *palette) SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 1); - if (SDL_SetVideoMode (width, height, 8, flags) == NULL) { + if (SDL_SetVideoMode (scr_width, scr_height, 8, flags) == NULL) { Sys_Error ("Couldn't set video mode: %s\n", SDL_GetError ()); SDL_Quit (); } - vid.height = vid.conheight = min (vid.conheight, height); - vid.width = vid.conwidth = min (vid.conwidth, width); + vid.height = vid.conheight = min (vid.conheight, scr_height); + vid.width = vid.conwidth = min (vid.conwidth, scr_width); vid.aspect = ((float) vid.height / (float) vid.width) * (320.0 / 240.0); vid.numpages = 2; @@ -412,7 +412,7 @@ VID_Init (unsigned char *palette) VID_Init8bitPalette(); Con_Printf ("Video mode %dx%d initialized.\n", - width, height); + scr_width, scr_height); vid_initialized = true; #ifdef WIN32