From 004003ccb0991036ece9395d2287cd5c4ffe211a Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 7 Feb 2000 00:43:02 +0000 Subject: [PATCH] merge qw_common/common.h and uquake/common.h into common/common.h --- {qw_common => common}/common.h | 24 ++++- uquake/common.h | 165 --------------------------------- 2 files changed, 23 insertions(+), 166 deletions(-) rename {qw_common => common}/common.h (86%) delete mode 100644 uquake/common.h diff --git a/qw_common/common.h b/common/common.h similarity index 86% rename from qw_common/common.h rename to common/common.h index 1632d84..d29d989 100644 --- a/qw_common/common.h +++ b/common/common.h @@ -44,6 +44,8 @@ typedef struct sizebuf_s } sizebuf_t; #include +void SZ_Alloc (sizebuf_t *buf, int startsize); +void SZ_Free (sizebuf_t *buf); void SZ_Clear (sizebuf_t *buf); void *SZ_GetSpace (sizebuf_t *buf, int length); void SZ_Write (sizebuf_t *buf, void *data, int length); @@ -67,6 +69,19 @@ void InsertLinkAfter (link_t *l, link_t *after); // FIXME: remove this mess! #define STRUCT_FROM_LINK(l,t,m) ((t *)((byte *)l - (int)&(((t *)0)->m))) +//============================================================================ +// Pak 3 loading support: +/* +pack_t *COM_LoadQ3PackFile (char *packfile); +uint_t COM_pak3_getlen(unzFile *pak); +int COM_pak3_open(unzFile *pak, const char *path); +uint_t COM_pak3_readfile(unzFile *pak, const char *path, uint_t bufsize, byte_t *buf); +int COM_pak3_read(unzFile *pak, void *buf, uint_t size, uint_t nmemb); +int COM_pak3_checkfile(unzFile *pak, const char *path); +*/ + + +// End Pak3 support. //============================================================================ #ifndef NULL @@ -140,9 +155,12 @@ extern int com_argc; extern char **com_argv; int COM_CheckParm (char *parm); +#ifdef QUAKEWORLD void COM_AddParm (char *parm); - void COM_Init (void); +#else +void COM_Init (char *path); +#endif void COM_InitArgv (int argc, char **argv); char *COM_SkipPath (char *pathname); @@ -159,6 +177,10 @@ char *va(char *format, ...); #include extern qboolean standard_quake, rogue, hipnotic; +byte *COM_LoadStackFile (char *path, void *buffer, int bufsize); +byte *COM_LoadTempFile (char *path); +byte *COM_LoadHunkFile (char *path); +void COM_LoadCacheFile (char *path, struct cache_user_s *cu); char *Info_ValueForKey (char *s, char *key); void Info_RemoveKey (char *s, char *key); diff --git a/uquake/common.h b/uquake/common.h deleted file mode 100644 index bc6b198..0000000 --- a/uquake/common.h +++ /dev/null @@ -1,165 +0,0 @@ -/* -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 the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// comndef.h -- general definitions - -#ifndef _COMMON_H -#define _COMMON_H - -#include -#include - -//============================================================================ - -typedef struct sizebuf_s -{ - qboolean allowoverflow; // if false, do a Sys_Error - qboolean overflowed; // set to true if the buffer size failed - byte *data; - int maxsize; - int cursize; -} sizebuf_t; - -void SZ_Alloc (sizebuf_t *buf, int startsize); -void SZ_Free (sizebuf_t *buf); -void SZ_Clear (sizebuf_t *buf); -void *SZ_GetSpace (sizebuf_t *buf, int length); -void SZ_Write (sizebuf_t *buf, void *data, int length); -void SZ_Print (sizebuf_t *buf, char *data); // strcats onto the sizebuf - -//============================================================================ - -typedef struct link_s -{ - struct link_s *prev, *next; -} link_t; - - -void ClearLink (link_t *l); -void RemoveLink (link_t *l); -void InsertLinkBefore (link_t *l, link_t *before); -void InsertLinkAfter (link_t *l, link_t *after); - -// (type *)STRUCT_FROM_LINK(link_t *link, type, member) -// ent = STRUCT_FROM_LINK(link,entity_t,order) -// FIXME: remove this mess! -#define STRUCT_FROM_LINK(l,t,m) ((t *)((byte *)l - (int)&(((t *)0)->m))) - -//============================================================================ -// Pak 3 loading support: -/* -pack_t *COM_LoadQ3PackFile (char *packfile); -uint_t COM_pak3_getlen(unzFile *pak); -int COM_pak3_open(unzFile *pak, const char *path); -uint_t COM_pak3_readfile(unzFile *pak, const char *path, uint_t bufsize, byte_t *buf); -int COM_pak3_read(unzFile *pak, void *buf, uint_t size, uint_t nmemb); -int COM_pak3_checkfile(unzFile *pak, const char *path); -*/ - - -// End Pak3 support. -//============================================================================ - -#ifndef NULL -#define NULL ((void *)0) -#endif - -#define Q_MAXCHAR ((char)0x7f) -#define Q_MAXSHORT ((short)0x7fff) -#define Q_MAXINT ((int)0x7fffffff) -#define Q_MAXLONG ((int)0x7fffffff) -#define Q_MAXFLOAT ((int)0x7fffffff) - -#define Q_MINCHAR ((char)0x80) -#define Q_MINSHORT ((short)0x8000) -#define Q_MININT ((int)0x80000000) -#define Q_MINLONG ((int)0x80000000) -#define Q_MINFLOAT ((int)0x7fffffff) - -//============================================================================ - -extern short (*BigShort) (short l); -extern short (*LittleShort) (short l); -extern int (*BigLong) (int l); -extern int (*LittleLong) (int l); -extern float (*BigFloat) (float l); -extern float (*LittleFloat) (float l); - -//============================================================================ - -void MSG_WriteChar (sizebuf_t *sb, int c); -void MSG_WriteByte (sizebuf_t *sb, int c); -void MSG_WriteShort (sizebuf_t *sb, int c); -void MSG_WriteLong (sizebuf_t *sb, int c); -void MSG_WriteFloat (sizebuf_t *sb, float f); -void MSG_WriteString (sizebuf_t *sb, char *s); -void MSG_WriteCoord (sizebuf_t *sb, float f); -void MSG_WriteAngle (sizebuf_t *sb, float f); - -extern int msg_readcount; -extern qboolean msg_badread; // set if a read goes beyond end of message - -void MSG_BeginReading (void); -int MSG_ReadChar (void); -int MSG_ReadByte (void); -int MSG_ReadShort (void); -int MSG_ReadLong (void); -float MSG_ReadFloat (void); -char *MSG_ReadString (void); - -float MSG_ReadCoord (void); -float MSG_ReadAngle (void); - -//============================================================================ - -extern char com_token[1024]; -extern qboolean com_eof; - -char *COM_Parse (char *data); - - -extern int com_argc; -extern char **com_argv; - -int COM_CheckParm (char *parm); -void COM_Init (char *path); -void COM_InitArgv (int argc, char **argv); - -char *COM_SkipPath (char *pathname); -void COM_StripExtension (char *in, char *out); -void COM_FileBase (char *in, char *out); -void COM_DefaultExtension (char *path, char *extension); - -char *va(char *format, ...); -// does a varargs printf into a temp buffer - - -//============================================================================ - -extern int com_filesize; -struct cache_user_s; - -byte *COM_LoadStackFile (char *path, void *buffer, int bufsize); -byte *COM_LoadTempFile (char *path); -byte *COM_LoadHunkFile (char *path); -void COM_LoadCacheFile (char *path, struct cache_user_s *cu); - -extern qboolean standard_quake, rogue, hipnotic; - -#endif // _COMMON_H