remove va from commdef.h and fix the consequences

This commit is contained in:
Bill Currie 2000-10-21 07:34:56 +00:00
parent 63fc732758
commit d295f183ba
22 changed files with 28 additions and 7 deletions

View file

@ -62,7 +62,4 @@ extern qboolean host_initialized; /* True if into command execution. */
extern double realtime; /* Not bounded in any way, changed at extern double realtime; /* Not bounded in any way, changed at
start of every frame, never reset */ 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 // _COMMDEF_H

View file

@ -34,6 +34,7 @@
#include "msg.h" #include "msg.h"
#include "client.h" #include "client.h"
#include "commdef.h" #include "commdef.h"
#include "va.h"
void void
Cvar_Info(cvar_t *var) Cvar_Info(cvar_t *var)

View file

@ -38,6 +38,7 @@
#include "cmd.h" #include "cmd.h"
#include "console.h" #include "console.h"
#include "qendian.h" #include "qendian.h"
#include "va.h"
#include "quakefs.h" #include "quakefs.h"
#include "quakedef.h" #include "quakedef.h"
#include "pmove.h" #include "pmove.h"

View file

@ -38,6 +38,7 @@
#include "cvar.h" #include "cvar.h"
#include "sizebuf.h" #include "sizebuf.h"
#include "msg.h" #include "msg.h"
#include "va.h"
#include "client.h" #include "client.h"
#include "commdef.h" #include "commdef.h"
#include "cmd.h" #include "cmd.h"

View file

@ -38,6 +38,7 @@
#include "bothdefs.h" #include "bothdefs.h"
#include "console.h" #include "console.h"
#include "msg.h" #include "msg.h"
#include "va.h"
#include "pmove.h" #include "pmove.h"
#include "sbar.h" #include "sbar.h"
#include "teamplay.h" #include "teamplay.h"

View file

@ -32,12 +32,15 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include <string.h>
#include "cl_slist.h" #include "cl_slist.h"
#include "bothdefs.h" #include "bothdefs.h"
#include "console.h" #include "console.h"
#include "commdef.h" #include "commdef.h"
#include "quakefs.h" #include "quakefs.h"
#include <string.h> #include "va.h"
server_entry_t *slist; server_entry_t *slist;

View file

@ -29,6 +29,10 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include <stdarg.h>
#include <string.h>
#include "input.h" #include "input.h"
#include "sys.h" #include "sys.h"
#include "console.h" #include "console.h"
@ -38,11 +42,9 @@
#include "commdef.h" #include "commdef.h"
#include "qargs.h" #include "qargs.h"
#include "cmd.h" #include "cmd.h"
#include "va.h"
#include "screen.h" #include "screen.h"
#include <stdarg.h>
#include <string.h>
int con_ormask; int con_ormask;
console_t con_main; console_t con_main;
console_t con_chat; console_t con_chat;

View file

@ -58,6 +58,7 @@
#include "commdef.h" #include "commdef.h"
#include "context_x11.h" #include "context_x11.h"
#include "dga_check.h" #include "dga_check.h"
#include "va.h"
#include "qargs.h" #include "qargs.h"
#include "qtypes.h" #include "qtypes.h"
#include "vid.h" #include "vid.h"

View file

@ -38,6 +38,7 @@
#include "keys.h" #include "keys.h"
#include "menu.h" #include "menu.h"
#include "vid.h" #include "vid.h"
#include "va.h"
#include "draw.h" #include "draw.h"
#include "cmd.h" #include "cmd.h"
#include "screen.h" #include "screen.h"

View file

@ -30,6 +30,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include "pr_comp.h" #include "pr_comp.h"
#include "va.h"
#include "progs.h" #include "progs.h"
#include "console.h" #include "console.h"
#include "server.h" #include "server.h"

View file

@ -40,6 +40,7 @@
#include "qendian.h" #include "qendian.h"
#include "info.h" #include "info.h"
#include "server.h" #include "server.h"
#include "va.h"
#include "qargs.h" #include "qargs.h"
#include <stdlib.h> #include <stdlib.h>

View file

@ -38,6 +38,7 @@
#include "cmd.h" #include "cmd.h"
#include "client.h" #include "client.h"
#include "bothdefs.h" #include "bothdefs.h"
#include "va.h"
#include "msg.h" #include "msg.h"
#include <stdlib.h> #include <stdlib.h>

View file

@ -35,6 +35,7 @@
#include "client.h" #include "client.h"
#include "console.h" #include "console.h"
#include "commdef.h" #include "commdef.h"
#include "va.h"
#include <string.h> #include <string.h>

View file

@ -38,6 +38,7 @@
#include "sys.h" #include "sys.h"
#include "pmove.h" #include "pmove.h"
#include "compat.h" #include "compat.h"
#include "va.h"
#include "quakefs.h" #include "quakefs.h"
#include "bothdefs.h" #include "bothdefs.h"
#include "qendian.h" #include "qendian.h"

View file

@ -30,6 +30,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include "server.h" #include "server.h"
#include "va.h"
#include "crc.h" #include "crc.h"
#include "msg.h" #include "msg.h"
#include "world.h" #include "world.h"

View file

@ -29,6 +29,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include "va.h"
#include "server.h" #include "server.h"
#include "crc.h" #include "crc.h"
#include "console.h" #include "console.h"

View file

@ -62,6 +62,7 @@
#endif #endif
#include "qtypes.h" #include "qtypes.h"
#include "va.h"
#include "quakedef.h" #include "quakedef.h"
#include "qendian.h" #include "qendian.h"
#include "glquake.h" #include "glquake.h"

View file

@ -32,6 +32,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "quakedef.h" #include "quakedef.h"
#include "va.h"
#include "winquake.h" #include "winquake.h"
#include "sys.h" #include "sys.h"
#include "d_local.h" #include "d_local.h"

View file

@ -33,6 +33,7 @@
#include <SDL.h> #include <SDL.h>
#include "client.h" #include "client.h"
#include "va.h"
#include "console.h" #include "console.h"
#include "cvar.h" #include "cvar.h"
#include "draw.h" #include "draw.h"

View file

@ -41,6 +41,7 @@
#include "console.h" #include "console.h"
#include "cvar.h" #include "cvar.h"
#include "draw.h" #include "draw.h"
#include "va.h"
#include "glquake.h" #include "glquake.h"
#include "input.h" #include "input.h"
#include "joystick.h" #include "joystick.h"

View file

@ -30,6 +30,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include "quakedef.h" #include "quakedef.h"
#include "va.h"
#include "winquake.h" #include "winquake.h"
#include "sys.h" #include "sys.h"
#include "resource.h" #include "resource.h"

View file

@ -64,6 +64,7 @@
#include "input.h" #include "input.h"
#include "draw.h" #include "draw.h"
#include "console.h" #include "console.h"
#include "va.h"
#include "client.h" #include "client.h"
#include "input.h" #include "input.h"
#include "context_x11.h" #include "context_x11.h"