qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-27 13:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix GGI

Browse source
This commit is contained in:
Joseph Carter 2000-05-21 09:36:35 +00:00
parent af032b8d55
commit 925cb60afa
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/sv_main.c
View file

@ -1877,10 +1877,10 @@ void SV_Init (quakeparms_t *parms)
host_initialized = true; host_initialized = true;
Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); // Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
Con_Printf ("%4.1f megabyte heap\n",parms->memsize/ (1024*1024.0)); Con_Printf ("%4.1f megabyte heap\n",parms->memsize/ (1024*1024.0));
Con_Printf ("\nServer Version %s (Build %04d)\n\n", QW_VERSION, build_number()); Con_Printf ("\nQuakeForge Version %s (Build %04d)\n\n", VERSION, build_number());
Con_Printf ("======== %s Initialized ========\n", PROGRAM); Con_Printf ("======== %s Initialized ========\n", PROGRAM);
@ -1894,3 +1894,4 @@ void SV_Init (quakeparms_t *parms)
if (sv.state == ss_dead) if (sv.state == ss_dead)
SV_Error ("Couldn't spawn a server"); SV_Error ("Couldn't spawn a server");
} }

34
source/vid_ggi.c
View file

@ -41,8 +41,32 @@
#include <string.h> #include <string.h>
#include <ggi/ggi.h> #include <ggi/ggi.h>
#include "sys.h" #include "bothdefs.h" // needed by: common.h, net.h, client.h
#include "quakedef.h" #include "quakedef.h"
#include "bspfile.h" // needed by: glquake.h
#include "vid.h"
#include "sys.h"
#include "zone.h" // needed by: client.h, gl_model.h
#include "mathlib.h" // needed by: protocol.h, render.h, client.h,
// modelgen.h, glmodel.h
#include "wad.h"
#include "draw.h"
#include "cvar.h"
#include "net.h" // needed by: client.h
#include "protocol.h" // needed by: client.h
#include "cmd.h"
#include "keys.h"
#include "sbar.h"
#include "sound.h"
#include "render.h" // needed by: client.h, gl_model.h, glquake.h
#include "client.h" // need cls in this file
#include "model.h" // needed by: glquake.h
#include "console.h"
#include "qendian.h"
#include "qargs.h"
#include "compat.h"
#include "d_local.h" #include "d_local.h"
extern viddef_t vid; // global video state extern viddef_t vid; // global video state
@ -266,22 +290,22 @@ void VID_Init(unsigned char *pal)
{ {
if (pnum >= com_argc-2) if (pnum >= com_argc-2)
Sys_Error("VID: -winsize <width> <height>\n"); Sys_Error("VID: -winsize <width> <height>\n");
vid.width = Q_atoi(com_argv[pnum+1]); vid.width = atoi(com_argv[pnum+1]);
vid.height = Q_atoi(com_argv[pnum+2]); vid.height = atoi(com_argv[pnum+2]);
if (!vid.width || !vid.height) if (!vid.width || !vid.height)
Sys_Error("VID: Bad window width/height\n"); Sys_Error("VID: Bad window width/height\n");
} }
if ((pnum=COM_CheckParm("-width"))) { if ((pnum=COM_CheckParm("-width"))) {
if (pnum >= com_argc-1) if (pnum >= com_argc-1)
Sys_Error("VID: -width <width>\n"); Sys_Error("VID: -width <width>\n");
vid.width = Q_atoi(com_argv[pnum+1]); vid.width = atoi(com_argv[pnum+1]);
if (!vid.width) if (!vid.width)
Sys_Error("VID: Bad window width\n"); Sys_Error("VID: Bad window width\n");
} }
if ((pnum=COM_CheckParm("-height"))) { if ((pnum=COM_CheckParm("-height"))) {
if (pnum >= com_argc-1) if (pnum >= com_argc-1)
Sys_Error("VID: -height <height>\n"); Sys_Error("VID: -height <height>\n");
vid.height = Q_atoi(com_argv[pnum+1]); vid.height = atoi(com_argv[pnum+1]);
if (!vid.height) if (!vid.height)
Sys_Error("VID: Bad window height\n"); Sys_Error("VID: Bad window height\n");
} }