rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 07:42:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc fixes

Browse source
This commit is contained in:
Richard Allen 2002-05-30 18:22:20 +00:00
parent 74da0008b9
commit 0042ba64b6
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reaction/cgame/cg_event.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.61 2002/05/30 18:22:20 jbravo
// Misc fixes
//
// Revision 1.60 2002/05/28 01:46:58 jbravo
// Added stomach gibbing
//
@ -113,6 +116,9 @@ void CG_BreakBreakable(centity_t *cent, int eParam, int number);
#ifdef MISSIONPACK // bk001205
#include "../../ui/menudef.h"
#endif
void CG_LaunchGib (vec3_t origin, vec3_t velocity, qhandle_t hModel);
//==========================================================================
/*
@ -1579,7 +1585,7 @@ also called by CG_CheckPlayerstateEvents
void CG_EntityEvent( centity_t *cent, vec3_t position ) {
entityState_t *es;
int event;
vec3_t dir, viewDir;
vec3_t dir; //, viewDir;
const char *s;
int clientNum;
clientInfo_t *ci;

5
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.85 2002/05/30 18:22:20 jbravo
// Misc fixes
//
// Revision 1.84 2002/05/28 01:46:58 jbravo
// Added stomach gibbing
//
@ -1545,7 +1548,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
}
// never gib in a nodrop
if (g_RQ3_gib.integer >0 && (self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer) || meansOfDeath == MOD_SUICIDE) {
if (g_RQ3_gib.integer > 0 && ((self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer) || meansOfDeath == MOD_SUICIDE)) {
// gib death
GibEntity( self, killer );
} else {

4
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.98 2002/05/30 18:22:20 jbravo
// Misc fixes
//
// Revision 1.97 2002/05/23 04:53:41 blaze
// some func_breakable fixes. Explosives respawn on new rounds now .
//
@ -1030,6 +1033,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->uniqueWeapons = 0;
break;
default:
G_Printf("%s had an illegal teamplay weapon %i!\n", ent->client->pers.netname, ent->client->teamplayWeapon);
break;
}