qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Other minor changes for uquake, nothing visible

This commit is contained in:
Joseph Carter 2000-02-03 20:27:25 +00:00
parent 9c399a04e5
commit c0dc03a8ff
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/quakefs.c
View File

@ -786,8 +786,10 @@ void COM_Gamedir (char *dir)
// //
Cache_Flush (); Cache_Flush ();
#ifdef QUAKEWORLD
if (!strcmp(dir, GAMENAME) || !strcmp(dir, "qw")) if (!strcmp(dir, GAMENAME) || !strcmp(dir, "qw"))
return; return;
#endif
snprintf(com_gamedir, sizeof(com_gamedir), "%s/%s", com_basedir, dir); snprintf(com_gamedir, sizeof(com_gamedir), "%s/%s", com_basedir, dir);

2
common/quakefs.h
View File

@ -1,4 +1,5 @@
/* /*
quakefs.h - quake virtual filesystem definitions
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors Please see the file "AUTHORS" for a list of contributors
@ -19,7 +20,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// comndef.h -- general definitions
#ifndef _QUAKEFS_H #ifndef _QUAKEFS_H
#define _QUAKEFS_H #define _QUAKEFS_H

3
uquake/host_cmd.c
View File

@ -1,4 +1,5 @@
/* /*
host_cmd.c
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
Portions Copyright (C) 1999,2000 Nelson Rush. Portions Copyright (C) 1999,2000 Nelson Rush.
@ -19,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "quakedef.h" #include <quakedef.h>
#include <qtypes.h> #include <qtypes.h>
#include <cvar.h> #include <cvar.h>
#include <net.h> #include <net.h>

20
uquake/quakedef.h
View File

@ -1,4 +1,5 @@
/* /*
quakedef.h - primary header for client
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
@ -17,7 +18,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// quakedef.h -- primary header for client
#ifndef _UQUAKE_QUAKEDEF_H #ifndef _UQUAKE_QUAKEDEF_H
#define _UQUAKE_QUAKEDEF_H #define _UQUAKE_QUAKEDEF_H
@ -146,14 +146,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//MED 01/04/97 added hipnotic defines //MED 01/04/97 added hipnotic defines
//=========================================== //===========================================
//hipnotic added defines //hipnotic added defines
#define HIT_PROXIMITY_GUN_BIT 16 #define HIT_PROXIMITY_GUN_BIT 16
#define HIT_MJOLNIR_BIT 7 #define HIT_MJOLNIR_BIT 7
#define HIT_LASER_CANNON_BIT 23 #define HIT_LASER_CANNON_BIT 23
#define HIT_PROXIMITY_GUN (1<<HIT_PROXIMITY_GUN_BIT) #define HIT_WETSUIT_BIT 25
#define HIT_MJOLNIR (1<<HIT_MJOLNIR_BIT) #define HIT_EMPATHY_SHIELDS_BIT 26
#define HIT_LASER_CANNON (1<<HIT_LASER_CANNON_BIT) #define HIT_PROXIMITY_GUN (1<<HIT_PROXIMITY_GUN_BIT)
#define HIT_WETSUIT (1<<(23+2)) #define HIT_MJOLNIR (1<<HIT_MJOLNIR_BIT)
#define HIT_EMPATHY_SHIELDS (1<<(23+3)) #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)
//=========================================== //===========================================