diff --git a/include/chase.h b/include/chase.h new file mode 100644 index 0000000..d58412f --- /dev/null +++ b/include/chase.h @@ -0,0 +1,38 @@ +/* + chase.h + + @description@ + + Copyright (C) 1996-1997 Id Software, Inc. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ +*/ + +#ifndef __chase_h +#define __chase_h + +extern cvar_t *chase_active; + +void Chase_Init (void); +void Chase_Reset (void); +void Chase_Update (void); + +#endif __chase_h diff --git a/include/cmd.h b/include/cmd.h index 6b0468a..4720084 100644 --- a/include/cmd.h +++ b/include/cmd.h @@ -130,4 +130,8 @@ void Cmd_Print (char *text); // used by command functions to send output to either the graphics console or // passed as a print message to the client +#define MAX_COM_TOKEN 1024 +extern char com_token[MAX_COM_TOKEN]; +char *COM_Parse (char *data); + #endif __cmd_h diff --git a/include/crc.h b/include/crc.h index b7421ad..f462f38 100644 --- a/include/crc.h +++ b/include/crc.h @@ -26,7 +26,13 @@ $Id$ */ +#ifndef __crc_h +#define __crc_h + +#include "qtypes.h" void CRC_Init(unsigned short *crcvalue); void CRC_ProcessByte(unsigned short *crcvalue, byte data); unsigned short CRC_Value(unsigned short crcvalue); + +#endif // __crc_h diff --git a/include/host.h b/include/host.h new file mode 100644 index 0000000..09f1595 --- /dev/null +++ b/include/host.h @@ -0,0 +1,73 @@ +/* + host.h + + @description@ + + Copyright (C) 1996-1997 Id Software, Inc. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ +*/ + +#ifndef __host_h +#define __host_h + +#include "qtypes.h" +#include "cvar.h" + +typedef struct +{ + char *basedir; + char *cachedir; // for development over ISDN lines + int argc; + char **argv; + void *membase; + int memsize; +} quakeparms_t; + +extern quakeparms_t host_parms; + +extern cvar_t *sys_ticrate; +extern cvar_t *sys_nostdout; +extern cvar_t *developer; + +extern cvar_t *pausable; + +extern qboolean host_initialized; // true if into command execution +extern double host_frametime; +extern byte *host_basepal; +extern byte *host_colormap; +extern int host_framecount; // incremented every frame, never reset +extern double realtime; // not bounded in any way, changed at + // start of every frame, never reset + +void Host_ClearMemory (void); +void Host_ServerFrame (void); +void Host_InitCommands (void); +void Host_Init (quakeparms_t *parms); +void Host_Shutdown(void); +void Host_Error (char *error, ...); +void Host_EndGame (char *message, ...); +void Host_Frame (float time); +void Host_Quit_f (void); +void Host_ClientCommands (char *fmt, ...); +void Host_ShutdownServer (qboolean crash); + +#endif // __host_h diff --git a/include/keys.h b/include/keys.h index 53863a5..1dab447 100644 --- a/include/keys.h +++ b/include/keys.h @@ -26,6 +26,10 @@ $Id$ */ +#ifndef __keys_h +#define __keys_h + +#include "qtypes.h" // // these are the key numbers that should be passed to Key_Event @@ -140,3 +144,4 @@ void Key_WriteBindings (FILE *f); void Key_SetBinding (int keynum, char *binding); void Key_ClearStates (void); +#endif // __keys_h diff --git a/include/mathlib.h b/include/mathlib.h index 0ece951..d64380a 100644 --- a/include/mathlib.h +++ b/include/mathlib.h @@ -48,6 +48,13 @@ extern int nanmask; #define VectorAdd(a,b,c) {c[0]=a[0]+b[0];c[1]=a[1]+b[1];c[2]=a[2]+b[2];} #define VectorCopy(a,b) {b[0]=a[0];b[1]=a[1];b[2]=a[2];} +// up / down +#define PITCH 0 +// left / right +#define YAW 1 +// fall over +#define ROLL 2 + void VectorMA (vec3_t veca, float scale, vec3_t vecb, vec3_t vecc); vec_t _DotProduct (vec3_t v1, vec3_t v2); diff --git a/include/qdefs.h b/include/qdefs.h index 900d849..258ebcb 100644 --- a/include/qdefs.h +++ b/include/qdefs.h @@ -39,6 +39,7 @@ #define NUM_CSHIFTS 4 #define MAX_MODELS 256 #define MAX_SOUNDS 256 +#define MAX_SCOREBOARD 16 #define MAX_SCOREBOARDNAME 32 #define MAX_STYLESTRING 64 #define MAX_EDICTS 600 // FIXME: ouch! ouch! ouch! diff --git a/include/screen.h b/include/screen.h index b369d57..275ba5c 100644 --- a/include/screen.h +++ b/include/screen.h @@ -26,6 +26,11 @@ $Id$ */ +#ifndef __screen_h +#define __screen_h + +#include "qtypes.h" +#include "cvar.h" void SCR_Init (void); void SCR_InitCvars (void); @@ -64,3 +69,5 @@ extern int scr_copyeverything; extern qboolean block_drawing; void SCR_UpdateWholeScreen (void); + +#endif // __screen_h diff --git a/include/server.h b/include/server.h index d21f2f6..dc72514 100644 --- a/include/server.h +++ b/include/server.h @@ -32,7 +32,6 @@ #include #include "gcc_attr.h" -#include "commdef.h" #include "net.h" #include "cvar.h" #include "protocol.h" diff --git a/include/commdef.h b/include/va.h similarity index 58% rename from include/commdef.h rename to include/va.h index 9e40593..3aacee9 100644 --- a/include/commdef.h +++ b/include/va.h @@ -1,5 +1,5 @@ /* - commdef.h + va.h Definitions common to client and server. @@ -27,43 +27,16 @@ $Id$ */ -#ifndef _COMMDEF_H -#define _COMMDEF_H +#ifndef __va_h +#define __va_h #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "cvar.h" #include "gcc_attr.h" -/* The host system specifies the base of the directory tree, the - command line parms passed to the program, and the amount of memory - available for the program to use. -*/ - -typedef struct -{ - char *basedir; - char *cachedir; // for development over ISDN lines - int argc; - char **argv; - void *membase; - int memsize; -} quakeparms_t; - -/* Host */ -extern quakeparms_t host_parms; - -extern cvar_t *sys_nostdout; -extern cvar_t *developer; - -extern qboolean host_initialized; /* True if into command execution. */ -//extern double host_frametime; -extern double realtime; /* Not bounded in any way, changed at - start of every frame, never reset */ - char *va(char *format, ...) __attribute__((format(printf,1,2))); // does a varargs printf into a temp buffer -#endif // _COMMDEF_H +#endif // __va_h diff --git a/include/world.h b/include/world.h index 7388a29..4dd2855 100644 --- a/include/world.h +++ b/include/world.h @@ -26,6 +26,11 @@ $Id$ */ +#ifndef __world_h +#define __world_h + +#include "qtypes.h" +#include "progs.h" typedef struct { @@ -84,3 +89,5 @@ trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, e // shouldn't be considered solid objects // passedict is explicitly excluded from clipping checks (normally NULL) + +#endif // __world_h diff --git a/source/cd_audio.c b/source/cd_audio.c index 5b26456..1590e7e 100644 --- a/source/cd_audio.c +++ b/source/cd_audio.c @@ -31,7 +31,6 @@ #endif #include -#include "quakedef.h" #include "dosisms.h" #define ADDRESS_MODE_HSG 0 diff --git a/source/cd_null.c b/source/cd_null.c index de38869..45ea204 100644 --- a/source/cd_null.c +++ b/source/cd_null.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" void CDAudio_Play(byte track, qboolean looping) { diff --git a/source/cd_win.c b/source/cd_win.c index 2f544d0..50c4293 100644 --- a/source/cd_win.c +++ b/source/cd_win.c @@ -31,7 +31,6 @@ #endif #include -#include "quakedef.h" extern HWND mainwindow; diff --git a/source/cl_cam.c b/source/cl_cam.c index 6a8b29f..81cddad 100644 --- a/source/cl_cam.c +++ b/source/cl_cam.c @@ -30,7 +30,9 @@ # include "config.h" #endif -#include "quakedef.h" +#include "mathlib.h" +#include "client.h" +#include "world.h" qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, trace_t *trace); diff --git a/source/cl_demo.c b/source/cl_demo.c index 377a71b..588e6eb 100644 --- a/source/cl_demo.c +++ b/source/cl_demo.c @@ -30,7 +30,15 @@ # include "config.h" #endif -#include "quakedef.h" +#include + +#include "qendian.h" +#include "va.h" +#include "host.h" +#include "msg.h" +#include "client.h" +#include "sys.h" +#include "console.h" void CL_FinishTimeDemo (void); diff --git a/source/cl_input.c b/source/cl_input.c index 23476de..35b4511 100644 --- a/source/cl_input.c +++ b/source/cl_input.c @@ -30,7 +30,12 @@ # include "config.h" #endif -#include "quakedef.h" +#include + +#include "msg.h" +#include "host.h" +#include "console.h" +#include "client.h" /* =============================================================================== @@ -164,7 +169,7 @@ void IN_UseUp (void) {KeyUp(&in_use);} void IN_JumpDown (void) {KeyDown(&in_jump);} void IN_JumpUp (void) {KeyUp(&in_jump);} -void IN_Impulse (void) {in_impulse=Q_atoi(Cmd_Argv(1));} +void IN_Impulse (void) {in_impulse=atoi(Cmd_Argv(1));} /* =============== @@ -299,7 +304,7 @@ void CL_BaseMove (usercmd_t *cmd) CL_AdjustAngles (); - Q_memset (cmd, 0, sizeof(*cmd)); + memset (cmd, 0, sizeof(*cmd)); if (in_strafe.state & 1) { diff --git a/source/cl_main.c b/source/cl_main.c index 82d4fb7..81f1b68 100644 --- a/source/cl_main.c +++ b/source/cl_main.c @@ -30,7 +30,17 @@ # include "config.h" #endif -#include "quakedef.h" +#include "msg.h" +#include "cvar.h" +#include "client.h" +#include "chase.h" +#include "input.h" +#include "host.h" +#include "va.h" +#include "host.h" +#include "server.h" +#include "console.h" +#include "screen.h" // we need to declare some mouse variables here, because the menu system // references them even when on a unix system. diff --git a/source/cl_parse.c b/source/cl_parse.c index 48e3907..6606a3a 100644 --- a/source/cl_parse.c +++ b/source/cl_parse.c @@ -30,7 +30,17 @@ # include "config.h" #endif -#include "quakedef.h" +#include + +#include "client.h" +#include "host.h" +#include "msg.h" +#include "console.h" +#include "cdaudio.h" +#include "sys.h" +#include "sbar.h" +#include "screen.h" +#include "server.h" char *svc_strings[] = { @@ -833,8 +843,8 @@ void CL_ParseServerMessage (void) i = MSG_ReadByte (); if (i >= MAX_LIGHTSTYLES) Sys_Error ("svc_lightstyle > MAX_LIGHTSTYLES"); - Q_strcpy (cl_lightstyle[i].map, MSG_ReadString()); - cl_lightstyle[i].length = Q_strlen(cl_lightstyle[i].map); + strcpy (cl_lightstyle[i].map, MSG_ReadString()); + cl_lightstyle[i].length = strlen(cl_lightstyle[i].map); break; case svc_sound: diff --git a/source/cl_tent.c b/source/cl_tent.c index 2bd3aa2..78ef5f0 100644 --- a/source/cl_tent.c +++ b/source/cl_tent.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" int num_temp_entities; entity_t cl_temp_entities[MAX_TEMP_ENTITIES]; diff --git a/source/cmd.c b/source/cmd.c index 7ba3888..821e531 100644 --- a/source/cmd.c +++ b/source/cmd.c @@ -33,6 +33,7 @@ #include #include "cmd.h" +#include "host.h" #include "client.h" #include "msg.h" #include "quakefs.h" diff --git a/source/common.c b/source/common.c index 33c3972..8c2dfa1 100644 --- a/source/common.c +++ b/source/common.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #define NUM_SAFE_ARGVS 7 diff --git a/source/conproc.c b/source/conproc.c index 103a080..bda37e0 100644 --- a/source/conproc.c +++ b/source/conproc.c @@ -32,7 +32,6 @@ #include #include "conproc.h" -#include "quakedef.h" HANDLE heventDone; HANDLE hfileBuffer; diff --git a/source/console.c b/source/console.c index e2517bc..4092c0b 100644 --- a/source/console.c +++ b/source/console.c @@ -37,7 +37,6 @@ #include #endif #include -#include "quakedef.h" int con_linewidth; diff --git a/source/crc.c b/source/crc.c index 7f85533..b58d076 100644 --- a/source/crc.c +++ b/source/crc.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "crc.h" // this is a 16 bit, non-reflected CRC using the polynomial 0x1021 diff --git a/source/cvar.c b/source/cvar.c index dfa90b3..43ee288 100644 --- a/source/cvar.c +++ b/source/cvar.c @@ -33,11 +33,9 @@ # include #endif -//#include "commdef.h" -#include "quakedef.h" #include "cvar.h" #include "console.h" -//#include "qargs.h" +#include "server.h" #include "cmd.h" #include diff --git a/source/d_edge.c b/source/d_edge.c index a140629..54e4775 100644 --- a/source/d_edge.c +++ b/source/d_edge.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" static int miplevel; diff --git a/source/d_fill.c b/source/d_fill.c index 4e58db9..54b1596 100644 --- a/source/d_fill.c +++ b/source/d_fill.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" /* diff --git a/source/d_init.c b/source/d_init.c index d973c09..00eebfb 100644 --- a/source/d_init.c +++ b/source/d_init.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" #define NUM_MIPS 4 diff --git a/source/d_modech.c b/source/d_modech.c index ac454e8..53f4a0b 100644 --- a/source/d_modech.c +++ b/source/d_modech.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" int d_vrectx, d_vrecty, d_vrectright_particle, d_vrectbottom_particle; diff --git a/source/d_part.c b/source/d_part.c index ed38403..b7ce484 100644 --- a/source/d_part.c +++ b/source/d_part.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" diff --git a/source/d_polyse.c b/source/d_polyse.c index 2b25fec..6d24d8e 100644 --- a/source/d_polyse.c +++ b/source/d_polyse.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" diff --git a/source/d_scan.c b/source/d_scan.c index 22670ad..24c7235 100644 --- a/source/d_scan.c +++ b/source/d_scan.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" diff --git a/source/d_sky.c b/source/d_sky.c index 62e898c..d2024c4 100644 --- a/source/d_sky.c +++ b/source/d_sky.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" diff --git a/source/d_sprite.c b/source/d_sprite.c index 5b26f03..eeaee40 100644 --- a/source/d_sprite.c +++ b/source/d_sprite.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" static int sprite_height; diff --git a/source/d_surf.c b/source/d_surf.c index 54074ce..8ffdbf9 100644 --- a/source/d_surf.c +++ b/source/d_surf.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" #include "r_local.h" diff --git a/source/d_vars.c b/source/d_vars.c index 07f9da1..a20b6fb 100644 --- a/source/d_vars.c +++ b/source/d_vars.c @@ -32,7 +32,6 @@ #ifndef USE_INTEL_ASM -#include "quakedef.h" // all global and static refresh variables are collected in a contiguous block // to avoid cache conflicts. diff --git a/source/d_zpoint.c b/source/d_zpoint.c index 5caf484..d838d3c 100644 --- a/source/d_zpoint.c +++ b/source/d_zpoint.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" diff --git a/source/dga_check.c b/source/dga_check.c index 2ffb3ba..137acdf 100644 --- a/source/dga_check.c +++ b/source/dga_check.c @@ -32,7 +32,6 @@ # include "config.h" #endif -#include #include #include diff --git a/source/draw.c b/source/draw.c index c1aa13d..3c89b53 100644 --- a/source/draw.c +++ b/source/draw.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" typedef struct { vrect_t rect; diff --git a/source/gl_draw.c b/source/gl_draw.c index 1a9a3aa..49cebcf 100644 --- a/source/gl_draw.c +++ b/source/gl_draw.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #define GL_COLOR_INDEX8_EXT 0x80E5 diff --git a/source/gl_mesh.c b/source/gl_mesh.c index 8f54a9c..386a181 100644 --- a/source/gl_mesh.c +++ b/source/gl_mesh.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" /* ================================================================= diff --git a/source/gl_model.c b/source/gl_model.c index 07355f3..d667db9 100644 --- a/source/gl_model.c +++ b/source/gl_model.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" model_t *loadmodel; char loadname[32]; // for hunk tags diff --git a/source/gl_refrag.c b/source/gl_refrag.c index b19eb64..1bcf345 100644 --- a/source/gl_refrag.c +++ b/source/gl_refrag.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" mnode_t *r_pefragtopnode; diff --git a/source/gl_rlight.c b/source/gl_rlight.c index 73ad0fe..5fce4cc 100644 --- a/source/gl_rlight.c +++ b/source/gl_rlight.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" int r_dlightframecount; diff --git a/source/gl_rmain.c b/source/gl_rmain.c index 4b44e58..1d4c1d6 100644 --- a/source/gl_rmain.c +++ b/source/gl_rmain.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" entity_t r_worldentity; diff --git a/source/gl_rmisc.c b/source/gl_rmisc.c index 23079fe..839acc7 100644 --- a/source/gl_rmisc.c +++ b/source/gl_rmisc.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" diff --git a/source/gl_rsurf.c b/source/gl_rsurf.c index c70d0c2..2a73037 100644 --- a/source/gl_rsurf.c +++ b/source/gl_rsurf.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" int skytexturenum; diff --git a/source/gl_screen.c b/source/gl_screen.c index 125a300..e8668f3 100644 --- a/source/gl_screen.c +++ b/source/gl_screen.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" /* diff --git a/source/gl_test.c b/source/gl_test.c index fb7ca5a..d6af665 100644 --- a/source/gl_test.c +++ b/source/gl_test.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #ifdef GLTEST diff --git a/source/gl_vidlinux.c b/source/gl_vidlinux.c index 2d89d3c..a7090b5 100644 --- a/source/gl_vidlinux.c +++ b/source/gl_vidlinux.c @@ -45,7 +45,6 @@ #include "vgakeyboard.h" #include "vgamouse.h" -#include "quakedef.h" #include "GL/fxmesa.h" #define WARP_WIDTH 320 diff --git a/source/gl_vidlinuxglx.c b/source/gl_vidlinuxglx.c index 95d4cd9..2e2a259 100644 --- a/source/gl_vidlinuxglx.c +++ b/source/gl_vidlinuxglx.c @@ -40,7 +40,6 @@ #include -#include "quakedef.h" #include diff --git a/source/gl_vidnt.c b/source/gl_vidnt.c index 1085d76..b93d0ed 100644 --- a/source/gl_vidnt.c +++ b/source/gl_vidnt.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "winquake.h" #include "resource.h" #include diff --git a/source/gl_warp.c b/source/gl_warp.c index a5ccacc..f69e010 100644 --- a/source/gl_warp.c +++ b/source/gl_warp.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" extern model_t *loadmodel; diff --git a/source/host.c b/source/host.c index 6abd791..c4f6b8b 100644 --- a/source/host.c +++ b/source/host.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" /* diff --git a/source/host_cmd.c b/source/host_cmd.c index 7c99136..9b33de2 100644 --- a/source/host_cmd.c +++ b/source/host_cmd.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" int current_skill; diff --git a/source/in_dos.c b/source/in_dos.c index 09a0e50..f1cf6f5 100644 --- a/source/in_dos.c +++ b/source/in_dos.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "dosisms.h" #define AUX_FLAG_FREELOOK 0x00000001 diff --git a/source/in_null.c b/source/in_null.c index 938f87f..56e188c 100644 --- a/source/in_null.c +++ b/source/in_null.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" void IN_Init (void) { diff --git a/source/in_sun.c b/source/in_sun.c index 90adaa6..20ea941 100644 --- a/source/in_sun.c +++ b/source/in_sun.c @@ -44,7 +44,6 @@ #include #include -#include "quakedef.h" // diff --git a/source/in_win.c b/source/in_win.c index 05c023b..8ce1c82 100644 --- a/source/in_win.c +++ b/source/in_win.c @@ -31,7 +31,6 @@ #endif #include -#include "quakedef.h" #include "winquake.h" #include "dosisms.h" diff --git a/source/keys.c b/source/keys.c index 94cbc14..c0e251e 100644 --- a/source/keys.c +++ b/source/keys.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" /* diff --git a/source/mathlib.c b/source/mathlib.c index 72dd076..5eb70f0 100644 --- a/source/mathlib.c +++ b/source/mathlib.c @@ -31,9 +31,9 @@ #endif #include -#include "quakedef.h" -void Sys_Error (char *error, ...); +#include "mathlib.h" +#include "sys.h" vec3_t vec3_origin = {0,0,0}; int nanmask = 255<<23; diff --git a/source/menu.c b/source/menu.c index 6cee69d..68e8a05 100644 --- a/source/menu.c +++ b/source/menu.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #ifdef _WIN32 #include "winquake.h" diff --git a/source/model.c b/source/model.c index e880a32..eb2095d 100644 --- a/source/model.c +++ b/source/model.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" model_t *loadmodel; diff --git a/source/net_bsd.c b/source/net_bsd.c index 4f4f9ef..e9120e6 100644 --- a/source/net_bsd.c +++ b/source/net_bsd.c @@ -30,8 +30,7 @@ # include "config.h" #endif -#include "quakedef.h" - +#include "net.h" #include "net_loop.h" #include "net_dgrm.h" diff --git a/source/net_bw.c b/source/net_bw.c index 7018072..6eee3bb 100644 --- a/source/net_bw.c +++ b/source/net_bw.c @@ -34,7 +34,6 @@ #include #include -#include "quakedef.h" #include "dosisms.h" diff --git a/source/net_dgrm.c b/source/net_dgrm.c index 0793c56..4c9408a 100644 --- a/source/net_dgrm.c +++ b/source/net_dgrm.c @@ -30,9 +30,19 @@ # include "config.h" #endif +#include + +#include "sys.h" +#include "keys.h" +#include "client.h" +#include "server.h" #include "qendian.h" #include "msg.h" #include "qargs.h" +#include "screen.h" +#include "console.h" +#include "net.h" +#include "qdefs.h" // This is enables a simple IP banning mechanism #define BAN_TEST @@ -67,7 +77,6 @@ unsigned long inet_addr(const char *cp); #endif #endif // BAN_TEST -#include "quakedef.h" #include "net_dgrm.h" // these two macros are to make the code more readable diff --git a/source/net_dos.c b/source/net_dos.c index 1a44c7e..6b27fe5 100644 --- a/source/net_dos.c +++ b/source/net_dos.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "net_loop.h" #include "net_dgrm.h" diff --git a/source/net_ipx.c b/source/net_ipx.c index da8b7a0..c157346 100644 --- a/source/net_ipx.c +++ b/source/net_ipx.c @@ -34,7 +34,6 @@ #include #include -#include "quakedef.h" #include "dosisms.h" #include "net_ipx.h" diff --git a/source/net_loop.c b/source/net_loop.c index d37f6d2..1101bc9 100644 --- a/source/net_loop.c +++ b/source/net_loop.c @@ -30,8 +30,12 @@ # include "config.h" #endif -#include "quakedef.h" +#include "net.h" #include "net_loop.h" +#include "client.h" +#include "console.h" +#include "sys.h" +#include "server.h" qboolean localconnectpending = false; qsocket_t *loop_client = NULL; diff --git a/source/net_main.c b/source/net_main.c index 321322c..5927872 100644 --- a/source/net_main.c +++ b/source/net_main.c @@ -30,10 +30,15 @@ # include "config.h" #endif -#include "quakedef.h" +#include + +#include "net.h" #include "net_vcr.h" #include "qargs.h" #include "sizebuf.h" +#include "console.h" +#include "sys.h" +#include "server.h" qsocket_t *net_activeSockets = NULL; qsocket_t *net_freeSockets = NULL; diff --git a/source/net_mp.c b/source/net_mp.c index f4010e7..421b019 100644 --- a/source/net_mp.c +++ b/source/net_mp.c @@ -31,7 +31,6 @@ #endif #include -#include "quakedef.h" #include "mpdosock.h" short flat_selector; diff --git a/source/net_none.c b/source/net_none.c index 89579f1..ddf6134 100644 --- a/source/net_none.c +++ b/source/net_none.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "net_loop.h" diff --git a/source/net_ser.c b/source/net_ser.c index 5184f4f..8d1bc59 100644 --- a/source/net_ser.c +++ b/source/net_ser.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "net_ser.h" #include "dosisms.h" #include "crc.h" diff --git a/source/net_vcr.c b/source/net_vcr.c index a6ba2c2..25a8199 100644 --- a/source/net_vcr.c +++ b/source/net_vcr.c @@ -30,9 +30,10 @@ # include "config.h" #endif -#include "quakedef.h" +#include "net.h" #include "net_vcr.h" - +#include "sys.h" +#include "server.h" extern int vcrFile; // This is the playback portion of the VCR. It reads the file produced diff --git a/source/net_win.c b/source/net_win.c index 826e66f..9883fa6 100644 --- a/source/net_win.c +++ b/source/net_win.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "net_loop.h" #include "net_dgrm.h" diff --git a/source/net_wins.c b/source/net_wins.c index 4f871d7..d430afb 100644 --- a/source/net_wins.c +++ b/source/net_wins.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "winquake.h" #define MAXHOSTNAMELEN 256 diff --git a/source/net_wipx.c b/source/net_wipx.c index e16c28a..54c2753 100644 --- a/source/net_wipx.c +++ b/source/net_wipx.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "winquake.h" #include #include "net_wipx.h" diff --git a/source/nonintel.c b/source/nonintel.c index 983c07e..ebe821e 100644 --- a/source/nonintel.c +++ b/source/nonintel.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" diff --git a/source/pr_cmds.c b/source/pr_cmds.c index 54b9211..6bd4a4f 100644 --- a/source/pr_cmds.c +++ b/source/pr_cmds.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #define RETURN_EDICT(e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(e)) diff --git a/source/pr_edict.c b/source/pr_edict.c index da98755..e5b4780 100644 --- a/source/pr_edict.c +++ b/source/pr_edict.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" dprograms_t *progs; dfunction_t *pr_functions; diff --git a/source/pr_exec.c b/source/pr_exec.c index d030213..4f70001 100644 --- a/source/pr_exec.c +++ b/source/pr_exec.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" /* diff --git a/source/r_aclip.c b/source/r_aclip.c index 20636d2..838e05a 100644 --- a/source/r_aclip.c +++ b/source/r_aclip.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" diff --git a/source/r_alias.c b/source/r_alias.c index 10cd688..c67b9fd 100644 --- a/source/r_alias.c +++ b/source/r_alias.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" // FIXME: shouldn't be needed (is needed for patch // right now, but that should move) diff --git a/source/r_bsp.c b/source/r_bsp.c index 80599ca..e8db186 100644 --- a/source/r_bsp.c +++ b/source/r_bsp.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" // diff --git a/source/r_draw.c b/source/r_draw.c index 26570d5..640a06c 100644 --- a/source/r_draw.c +++ b/source/r_draw.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" // FIXME: shouldn't need to include this diff --git a/source/r_edge.c b/source/r_edge.c index 35da673..9d808f2 100644 --- a/source/r_edge.c +++ b/source/r_edge.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #if 0 diff --git a/source/r_efrag.c b/source/r_efrag.c index f6cacd3..f1d84a0 100644 --- a/source/r_efrag.c +++ b/source/r_efrag.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" mnode_t *r_pefragtopnode; diff --git a/source/r_light.c b/source/r_light.c index 66994c7..883585d 100644 --- a/source/r_light.c +++ b/source/r_light.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" int r_dlightframecount; diff --git a/source/r_main.c b/source/r_main.c index 5ad6ba9..4380122 100644 --- a/source/r_main.c +++ b/source/r_main.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" //define PASSAGES diff --git a/source/r_misc.c b/source/r_misc.c index 01a0043..2ad25e0 100644 --- a/source/r_misc.c +++ b/source/r_misc.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" diff --git a/source/r_part.c b/source/r_part.c index 6ce76ff..1e9c0cf 100644 --- a/source/r_part.c +++ b/source/r_part.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #define MAX_PARTICLES 2048 // default max # of particles at one diff --git a/source/r_sky.c b/source/r_sky.c index 642edcb..ab5c65f 100644 --- a/source/r_sky.c +++ b/source/r_sky.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" #include "d_local.h" diff --git a/source/r_sprite.c b/source/r_sprite.c index 02edc9b..bcff0c2 100644 --- a/source/r_sprite.c +++ b/source/r_sprite.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" static int clip_current; diff --git a/source/r_surf.c b/source/r_surf.c index 8500da3..161e2df 100644 --- a/source/r_surf.c +++ b/source/r_surf.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" drawsurf_t r_drawsurf; diff --git a/source/r_vars.c b/source/r_vars.c index 5ae79d4..dc8134a 100644 --- a/source/r_vars.c +++ b/source/r_vars.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #ifndef USE_INTEL_ASM diff --git a/source/sbar.c b/source/sbar.c index 4e153cd..7cc7731 100644 --- a/source/sbar.c +++ b/source/sbar.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" int sb_updates; // if >= vid.numpages, no update needed diff --git a/source/screen.c b/source/screen.c index 9b9b304..a4081bc 100644 --- a/source/screen.c +++ b/source/screen.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" // only the refresh window will be updated unless these variables are flagged diff --git a/source/snd_dma.c b/source/snd_dma.c index dac9cef..42456b4 100644 --- a/source/snd_dma.c +++ b/source/snd_dma.c @@ -39,7 +39,7 @@ #include "console.h" #include "client.h" #include "qargs.h" -#include "quakedef.h" +#include "host.h" #ifdef _WIN32 #include "winquake.h" diff --git a/source/snd_dos.c b/source/snd_dos.c index 76c58e2..4878aa2 100644 --- a/source/snd_dos.c +++ b/source/snd_dos.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "dosisms.h" int BLASTER_GetDMAPos(void); diff --git a/source/snd_gus.c b/source/snd_gus.c index 06f72c6..90ee699 100644 --- a/source/snd_gus.c +++ b/source/snd_gus.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "dosisms.h" //============================================================================= diff --git a/source/snd_mix.c b/source/snd_mix.c index 6ee8ac0..038c095 100644 --- a/source/snd_mix.c +++ b/source/snd_mix.c @@ -30,7 +30,7 @@ # include "config.h" #endif -#include "quakedef.h" +#include "sound.h" #ifdef _WIN32 #include "winquake.h" diff --git a/source/snd_next.c b/source/snd_next.c index a80a3f2..5892657 100644 --- a/source/snd_next.c +++ b/source/snd_next.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" extern int desired_speed; extern int desired_bits; diff --git a/source/snd_null.c b/source/snd_null.c index 3f834f5..7fc6020 100644 --- a/source/snd_null.c +++ b/source/snd_null.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" cvar_t *bgmvolume; cvar_t *volume; diff --git a/source/snd_oss.c b/source/snd_oss.c index 4cd8f68..a81bbd9 100644 --- a/source/snd_oss.c +++ b/source/snd_oss.c @@ -40,7 +40,6 @@ #include #include #include -#include "quakedef.h" int audio_fd; int snd_inited; diff --git a/source/snd_sun.c b/source/snd_sun.c index 2bc9fda..7d8a26a 100644 --- a/source/snd_sun.c +++ b/source/snd_sun.c @@ -41,7 +41,6 @@ #include #include #include -#include "quakedef.h" int audio_fd; int snd_inited; diff --git a/source/snd_win.c b/source/snd_win.c index e72ce3c..4be327a 100644 --- a/source/snd_win.c +++ b/source/snd_win.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "winquake.h" #define iDirectSoundCreate(a,b,c) pDirectSoundCreate(a,b,c) diff --git a/source/sv_main.c b/source/sv_main.c index 4ea603e..904925c 100644 --- a/source/sv_main.c +++ b/source/sv_main.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" server_t sv; server_static_t svs; diff --git a/source/sv_move.c b/source/sv_move.c index c845c70..30d356e 100644 --- a/source/sv_move.c +++ b/source/sv_move.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #define STEPSIZE 18 diff --git a/source/sv_phys.c b/source/sv_phys.c index ec8959c..85a1cfc 100644 --- a/source/sv_phys.c +++ b/source/sv_phys.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" /* diff --git a/source/sv_user.c b/source/sv_user.c index a99a513..3e7a49b 100644 --- a/source/sv_user.c +++ b/source/sv_user.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" edict_t *sv_player; diff --git a/source/sys_dos.c b/source/sys_dos.c index 4001ac6..53b145d 100644 --- a/source/sys_dos.c +++ b/source/sys_dos.c @@ -48,7 +48,6 @@ #include #include -#include "quakedef.h" #include "dosisms.h" #define MINIMUM_WIN_MEMORY 0x800000 diff --git a/source/sys_null.c b/source/sys_null.c index 2bcc57b..4577dcd 100644 --- a/source/sys_null.c +++ b/source/sys_null.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "errno.h" /* diff --git a/source/sys_sun.c b/source/sys_sun.c index 38f46f7..b3aeab6 100644 --- a/source/sys_sun.c +++ b/source/sys_sun.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "errno.h" #include #include diff --git a/source/sys_unix.c b/source/sys_unix.c index d79cf62..af95ded 100644 --- a/source/sys_unix.c +++ b/source/sys_unix.c @@ -40,13 +40,14 @@ #include #include #include +#include #include "sys.h" #include "qargs.h" #include "cvar.h" #include "server.h" +#include "host.h" -#include "quakedef.h" qboolean isDedicated; diff --git a/source/sys_unixd.c b/source/sys_unixd.c index 95ace3a..0b8364d 100644 --- a/source/sys_unixd.c +++ b/source/sys_unixd.c @@ -48,7 +48,6 @@ #include #include -#include "quakedef.h" qboolean isDedicated; diff --git a/source/sys_win.c b/source/sys_win.c index efa6a53..5b1d9af 100644 --- a/source/sys_win.c +++ b/source/sys_win.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "winquake.h" #include "errno.h" #include "resource.h" diff --git a/source/sys_wind.c b/source/sys_wind.c index 3a2fbfd..30112af 100644 --- a/source/sys_wind.c +++ b/source/sys_wind.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "winquake.h" #include "errno.h" #include diff --git a/source/vid_dos.c b/source/vid_dos.c index ffb04e1..3e1172d 100644 --- a/source/vid_dos.c +++ b/source/vid_dos.c @@ -38,7 +38,6 @@ #include #include -#include "quakedef.h" #include "d_local.h" #include "dosisms.h" #include "vid_dos.h" diff --git a/source/vid_ext.c b/source/vid_ext.c index ba8f03c..11cc789 100644 --- a/source/vid_ext.c +++ b/source/vid_ext.c @@ -33,7 +33,6 @@ #include #include -#include "quakedef.h" #include "d_local.h" #include "dosisms.h" #include "vid_dos.h" diff --git a/source/vid_ggi.c b/source/vid_ggi.c index b3edf51..7c4ca5b 100644 --- a/source/vid_ggi.c +++ b/source/vid_ggi.c @@ -39,7 +39,6 @@ #include #include -#include "quakedef.h" #include "d_local.h" diff --git a/source/vid_null.c b/source/vid_null.c index 12772af..4c75d89 100644 --- a/source/vid_null.c +++ b/source/vid_null.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "d_local.h" viddef_t vid; // global video state diff --git a/source/vid_sunx.c b/source/vid_sunx.c index 30a8a05..f7d1a4d 100644 --- a/source/vid_sunx.c +++ b/source/vid_sunx.c @@ -45,7 +45,6 @@ #include #include -#include "quakedef.h" #include "d_local.h" cvar_t *m_filter; diff --git a/source/vid_sunxil.c b/source/vid_sunxil.c index 62a6e77..608bd80 100644 --- a/source/vid_sunxil.c +++ b/source/vid_sunxil.c @@ -47,7 +47,6 @@ #include #include -#include "quakedef.h" #include "d_local.h" #define MIN_WIDTH 320 diff --git a/source/vid_svgalib.c b/source/vid_svgalib.c index e25e5ed..1593410 100644 --- a/source/vid_svgalib.c +++ b/source/vid_svgalib.c @@ -44,7 +44,6 @@ #include "vgakeyboard.h" #include "vgamouse.h" -#include "quakedef.h" #include "d_local.h" #define stringify(m) { #m, m } diff --git a/source/vid_vga.c b/source/vid_vga.c index 22f302b..61cd6d9 100644 --- a/source/vid_vga.c +++ b/source/vid_vga.c @@ -32,7 +32,6 @@ #include -#include "quakedef.h" #include "d_local.h" #include "dosisms.h" #include "vid_dos.h" diff --git a/source/vid_win.c b/source/vid_win.c index 1e7d086..bc6ce07 100644 --- a/source/vid_win.c +++ b/source/vid_win.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "winquake.h" #include "d_local.h" #include "resource.h" diff --git a/source/vid_x11.c b/source/vid_x11.c index c9e4075..08723b9 100644 --- a/source/vid_x11.c +++ b/source/vid_x11.c @@ -46,7 +46,6 @@ #include #include -#include "quakedef.h" #include "d_local.h" cvar_t *_windowed_mouse; diff --git a/source/view.c b/source/view.c index 6366e81..16bfe95 100644 --- a/source/view.c +++ b/source/view.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include "quakedef.h" #include "r_local.h" /* diff --git a/source/vregset.c b/source/vregset.c index 2451df4..d851e59 100644 --- a/source/vregset.c +++ b/source/vregset.c @@ -33,7 +33,6 @@ #include #include -#include "quakedef.h" #include "vregset.h" //#define outportb loutportb diff --git a/source/wad.c b/source/wad.c index 36ff477..40e04f2 100644 --- a/source/wad.c +++ b/source/wad.c @@ -30,8 +30,10 @@ # include "config.h" #endif -#include "quakedef.h" - +#include "qendian.h" +#include "wad.h" +#include "sys.h" +#include "quakefs.h" int wad_numlumps; lumpinfo_t *wad_lumps; byte *wad_base; diff --git a/source/world.c b/source/world.c index 215040b..ea92cad 100644 --- a/source/world.c +++ b/source/world.c @@ -30,7 +30,11 @@ # include "config.h" #endif -#include "quakedef.h" +#include "world.h" +#include "model.h" +#include "server.h" +#include "sys.h" +#include "console.h" /* diff --git a/source/zone.c b/source/zone.c index a45ae04..4e9f1df 100644 --- a/source/zone.c +++ b/source/zone.c @@ -30,7 +30,13 @@ # include "config.h" #endif -#include "quakedef.h" +#include + +#include "qargs.h" +#include "sys.h" +#include "zone.h" +#include "cmd.h" +#include "console.h" #define DYNAMIC_SIZE 0xc000 @@ -158,7 +164,7 @@ Z_CheckHeap (); // DEBUG buf = Z_TagMalloc (size, 1); if (!buf) Sys_Error ("Z_Malloc: failed on allocation of %i bytes",size); - Q_memset (buf, 0, size); + memset (buf, 0, size); return buf; } @@ -432,7 +438,7 @@ void *Hunk_AllocName (int size, char *name) h->size = size; h->sentinal = HUNK_SENTINAL; - Q_strncpy (h->name, name, 8); + strncpy (h->name, name, 8); return (void *)(h+1); } @@ -523,7 +529,7 @@ void *Hunk_HighAllocName (int size, char *name) memset (h, 0, size); h->size = size; h->sentinal = HUNK_SENTINAL; - Q_strncpy (h->name, name, 8); + strncpy (h->name, name, 8); return (void *)(h+1); } @@ -593,9 +599,9 @@ void Cache_Move ( cache_system_t *c) { // Con_Printf ("cache_move ok\n"); - Q_memcpy ( new+1, c+1, c->size - sizeof(cache_system_t) ); + memcpy ( new+1, c+1, c->size - sizeof(cache_system_t) ); new->user = c->user; - Q_memcpy (new->name, c->name, sizeof(new->name)); + memcpy (new->name, c->name, sizeof(new->name)); Cache_Free (c->user); new->user->data = (void *)(new+1); } @@ -936,7 +942,7 @@ void Memory_Init (void *buf, int size) if (p) { if (p < com_argc-1) - zonesize = Q_atoi (com_argv[p+1]) * 1024; + zonesize = atoi (com_argv[p+1]) * 1024; else Sys_Error ("Memory_Init: you must specify a size in KB after -zone"); }