mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-22 03:41:27 +00:00
random QW changes which should help with sbar stuff later on
This commit is contained in:
Joseph Carter
parent
9e47e221b6
commit
218d2fcb9b
9 changed files with 137 additions and 78 deletions
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
gl_draw.c - GL renderer draw routines
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
|
@ -20,20 +21,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
*/
|
||||
|
||||
// draw.c -- this is the only file outside the refresh that touches the
|
||||
// vid buffer
|
||||
|
||||
#include "qtypes.h"
|
||||
#include "quakedef.h"
|
||||
#include "cvar.h"
|
||||
#include "wad.h"
|
||||
#include "glquake.h"
|
||||
#include "console.h"
|
||||
#include "sbar.h"
|
||||
#include <qtypes.h>
|
||||
#include <quakedef.h>
|
||||
#include <cvar.h>
|
||||
#include <wad.h>
|
||||
#include <glquake.h>
|
||||
#include <console.h>
|
||||
#include <sbar.h>
|
||||
#include <sys.h>
|
||||
#include <cmd.h>
|
||||
#include <lib_replace.h>
|
||||
|
||||
#undef HIPFIX
|
||||
|
||||
extern unsigned char d_15to8table[65536];
|
||||
extern cvar_t crosshair, cl_crossx, cl_crossy, crosshaircolor;
|
||||
|
||||
|
|
@ -231,6 +231,7 @@ qpic_t *Draw_PicFromWad (char *name)
|
|||
p = W_GetLumpName (name);
|
||||
gl = (glpic_t *)p->data;
|
||||
|
||||
#ifndef HIPFIX
|
||||
// load little ones into the scrap
|
||||
if (p->width < 64 && p->height < 64)
|
||||
{
|
||||
|
|
@ -255,6 +256,7 @@ qpic_t *Draw_PicFromWad (char *name)
|
|||
pic_texels += p->width*p->height;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
gl->texnum = GL_LoadPicTexture (p);
|
||||
gl->sl = 0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
cl_main.c - client main loop
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
|
|
@ -20,7 +21,6 @@ along with this program; if not, write to the Free Software
|
|||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
// cl_main.c -- client main loop
|
||||
|
||||
/* Will have problems with isspace() when comiling w/ gcc on SGI without this */
|
||||
#ifdef sgi
|
||||
|
|
@ -34,22 +34,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#undef _LINT
|
||||
#endif
|
||||
|
||||
#include "quakedef.h"
|
||||
#include "winquake.h"
|
||||
#include "pmove_simple.h"
|
||||
#include "qtypes.h"
|
||||
#include "client.h"
|
||||
#include "menu.h"
|
||||
#include "console.h"
|
||||
#include "cvar.h"
|
||||
#include "mathlib.h"
|
||||
#include "keys.h"
|
||||
#include "sound.h"
|
||||
#include "input.h"
|
||||
#include "screen.h"
|
||||
#include "view.h"
|
||||
#include "sbar.h"
|
||||
#include "cdaudio.h"
|
||||
#include <quakedef.h>
|
||||
#include <winquake.h>
|
||||
#include <pmove_simple.h>
|
||||
#include <qtypes.h>
|
||||
#include <client.h>
|
||||
#include <menu.h>
|
||||
#include <console.h>
|
||||
#include <cvar.h>
|
||||
#include <mathlib.h>
|
||||
#include <keys.h>
|
||||
#include <sound.h>
|
||||
#include <input.h>
|
||||
#include <screen.h>
|
||||
#include <view.h>
|
||||
#include <sbar.h>
|
||||
#include <cdaudio.h>
|
||||
|
||||
#ifdef __sun
|
||||
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
||||
|
|
@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "winsock.h"
|
||||
#include <winsock.h>
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
cl_parse.c - parse a message received from the server
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
|
|
@ -20,18 +21,17 @@ along with this program; if not, write to the Free Software
|
|||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
// cl_parse.c -- parse a message received from the server
|
||||
|
||||
#include "qtypes.h"
|
||||
#include "quakedef.h"
|
||||
#include "model.h"
|
||||
#include "pmove.h"
|
||||
#include "console.h"
|
||||
#include "mathlib.h"
|
||||
#include "sound.h"
|
||||
#include "cdaudio.h"
|
||||
#include "sbar.h"
|
||||
#include "screen.h"
|
||||
#include <qtypes.h>
|
||||
#include <quakedef.h>
|
||||
#include <model.h>
|
||||
#include <pmove.h>
|
||||
#include <console.h>
|
||||
#include <mathlib.h>
|
||||
#include <sound.h>
|
||||
#include <cdaudio.h>
|
||||
#include <sbar.h>
|
||||
#include <screen.h>
|
||||
#include <cvars.h>
|
||||
|
||||
char *svc_strings[] =
|
||||
|
|
@ -558,6 +558,12 @@ void CL_ParseServerData (void)
|
|||
|
||||
cl.servercount = MSG_ReadLong ();
|
||||
|
||||
// gametype is always GAME_DEATHMATCH in QW
|
||||
cl.gametype = GAME_DEATHMATCH;
|
||||
|
||||
// maxclients is irrelivant in QW
|
||||
cl.maxclients = 0;
|
||||
|
||||
// game directory
|
||||
str = MSG_ReadString ();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
bothdefs.h - defs common to qw client and server
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
|
@ -20,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
*/
|
||||
|
||||
// defs common to client and server
|
||||
|
||||
|
||||
#ifndef _BOTHDEFS_H
|
||||
|
|
@ -142,6 +142,52 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#define IT_SIGIL3 (1<<30)
|
||||
#define IT_SIGIL4 (1<<31)
|
||||
|
||||
//
|
||||
// Rogue changed/added defines
|
||||
//
|
||||
|
||||
#define RIT_SHELLS 128
|
||||
#define RIT_NAILS 256
|
||||
#define RIT_ROCKETS 512
|
||||
#define RIT_CELLS 1024
|
||||
|
||||
#define RIT_AXE 2048
|
||||
|
||||
#define RIT_LAVA_NAILGUN 4096
|
||||
#define RIT_LAVA_SUPER_NAILGUN 8192
|
||||
#define RIT_MULTI_GRENADE 16384
|
||||
#define RIT_MULTI_ROCKET 32768
|
||||
#define RIT_PLASMA_GUN 65536
|
||||
|
||||
#define RIT_ARMOR1 8388608
|
||||
#define RIT_ARMOR2 16777216
|
||||
#define RIT_ARMOR3 33554432
|
||||
|
||||
#define RIT_LAVA_NAILS 67108864
|
||||
#define RIT_PLASMA_AMMO 134217728
|
||||
#define RIT_MULTI_ROCKETS 268435456
|
||||
|
||||
#define RIT_SHIELD 536870912
|
||||
#define RIT_ANTIGRAV 1073741824
|
||||
#define RIT_SUPERHEALTH 2147483648
|
||||
|
||||
|
||||
//
|
||||
// Hipnotic added defines
|
||||
//
|
||||
|
||||
#define HIT_PROXIMITY_GUN_BIT 16
|
||||
#define HIT_MJOLNIR_BIT 7
|
||||
#define HIT_LASER_CANNON_BIT 23
|
||||
#define HIT_WETSUIT_BIT 25
|
||||
#define HIT_EMPATHY_SHIELDS_BIT 26
|
||||
#define HIT_PROXIMITY_GUN (1<<HIT_PROXIMITY_GUN_BIT)
|
||||
#define HIT_MJOLNIR (1<<HIT_MJOLNIR_BIT)
|
||||
#define HIT_LASER_CANNON (1<<HIT_LASER_CANNON_BIT)
|
||||
#define HIT_WETSUIT (1<<HIT_WETSUIT_BIT)
|
||||
#define HIT_EMPATHY_SHIELDS (1<<HIT_EMPATHY_SHIELDS_BIT)
|
||||
|
||||
|
||||
//
|
||||
// print flags
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
common.c - misc functions used in client and server
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
|
|
@ -20,19 +21,18 @@ along with this program; if not, write to the Free Software
|
|||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
// common.c -- misc functions used in client and server
|
||||
|
||||
#include <ctype.h>
|
||||
#include "common.h"
|
||||
#include "crc.h"
|
||||
#include "sys.h"
|
||||
#include "cmd.h"
|
||||
#include "console.h"
|
||||
#include <common.h>
|
||||
#include <crc.h>
|
||||
#include <sys.h>
|
||||
#include <cmd.h>
|
||||
#include <console.h>
|
||||
|
||||
#ifdef SERVERONLY
|
||||
#include "qwsvdef.h"
|
||||
#include <qwsvdef.h>
|
||||
#else
|
||||
#include "quakedef.h"
|
||||
#include <quakedef.h>
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
common.h - general definitions
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
|
@ -19,14 +20,13 @@ 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 <bothdefs.h>
|
||||
#include <register_check.h>
|
||||
#include "qtypes.h"
|
||||
#include <qtypes.h>
|
||||
|
||||
#define MAX_INFO_STRING 196
|
||||
#define MAX_SERVERINFO_STRING 512
|
||||
|
|
@ -43,7 +43,7 @@ typedef struct sizebuf_s
|
|||
int cursize;
|
||||
} sizebuf_t;
|
||||
|
||||
#include "net.h"
|
||||
#include <net.h>
|
||||
void SZ_Clear (sizebuf_t *buf);
|
||||
void *SZ_GetSpace (sizebuf_t *buf, int length);
|
||||
void SZ_Write (sizebuf_t *buf, void *data, int length);
|
||||
|
|
@ -87,7 +87,7 @@ void InsertLinkAfter (link_t *l, link_t *after);
|
|||
|
||||
//============================================================================
|
||||
|
||||
#include "qendian.h"
|
||||
#include <qendian.h>
|
||||
|
||||
//============================================================================
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ void MSG_ReadDeltaUsercmd (struct usercmd_s *from, struct usercmd_s *cmd);
|
|||
|
||||
//============================================================================
|
||||
|
||||
#include "lib_replace.h"
|
||||
#include <lib_replace.h>
|
||||
|
||||
//============================================================================
|
||||
|
||||
|
|
@ -156,7 +156,7 @@ char *va(char *format, ...);
|
|||
|
||||
//============================================================================
|
||||
|
||||
#include "quakefs.h"
|
||||
#include <quakefs.h>
|
||||
|
||||
extern qboolean standard_quake, rogue, hipnotic;
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#define A2C_CLIENT_COMMAND 'B' // + command line
|
||||
#define S2M_SHUTDOWN 'C'
|
||||
|
||||
// game types sent by serverinfo
|
||||
// these determine which intermission screen plays
|
||||
#define GAME_COOP 0
|
||||
#define GAME_DEATHMATCH 1
|
||||
|
||||
//==================
|
||||
// note that there are some defs.qc that mirror to these numbers
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
quakedef.h - primary header for client
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
|
@ -19,15 +20,14 @@ along with this program; if not, write to the Free Software
|
|||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
// quakedef.h -- primary header for client
|
||||
|
||||
#ifndef _QW_COMMON_QUAKEDEF_H
|
||||
#define _QW_COMMON_QUAKEDEF_H
|
||||
|
||||
#include <common_quakedef.h>
|
||||
|
||||
#include "bothdefs.h"
|
||||
#include "pmove.h"
|
||||
#include <bothdefs.h>
|
||||
#include <pmove.h>
|
||||
|
||||
extern cvar_t password;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
sv_main.c - QW main server loop
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
|
|
@ -21,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
*/
|
||||
|
||||
#include "qwsvdef.h"
|
||||
#include <qwsvdef.h>
|
||||
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
|
|
@ -1666,8 +1667,8 @@ SV_Init
|
|||
void SV_Init (quakeparms_t *parms)
|
||||
{
|
||||
COM_InitArgv (parms->argc, parms->argv);
|
||||
COM_AddParm ("-game");
|
||||
COM_AddParm ("qw");
|
||||
// COM_AddParm ("-game");
|
||||
// COM_AddParm ("qw");
|
||||
|
||||
if (COM_CheckParm ("-minmemory"))
|
||||
parms->memsize = MINIMUM_MEMORY;
|
||||
|
|
|
|||
Loading…
Reference in a new issue