rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-03-27 12:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

some more breakables fixes(ssg chips)

Browse source
This commit is contained in:
Scott Brooks 2002-06-03 00:40:25 +00:00
parent 41a9c66013
commit 8551936133
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.87 2002/06/03 00:40:25 blaze
// some more breakables fixes(ssg chips)
//
// Revision 1.86 2002/05/31 17:32:11 jbravo
// HC gibs almost working :)
//
@ -1903,6 +1906,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
vec3_t bouncedir, impactpoint;
#endif
if (!targ->takedamage) {
return;
}

7
reaction/game/g_misc.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.53 2002/06/03 00:40:25 blaze
// some more breakables fixes(ssg chips)
//
// Revision 1.52 2002/06/02 22:04:38 blaze
// breakables act proper when triggered(explode if explosive, etc) also, spawnflags 8 will make the breakable so you cant kick it
//
@ -781,7 +784,7 @@ void G_BreakGlass( gentity_t *ent, gentity_t *inflictor, gentity_t *attacker, ve
//Elder: for the bit-shifting
int eParm;
int shiftCount = 0;
//Elder:
//eventParm can only transmit as a byte (8-bits/255)
//So if we receive a huge one, we can knock it down (shift-op)
@ -815,7 +818,7 @@ void G_BreakGlass( gentity_t *ent, gentity_t *inflictor, gentity_t *attacker, ve
//Elder: added + compacted
case MOD_KNIFE:
case MOD_KNIFE_THROWN:
case MOD_MP5:
case MOD_MP5:
case MOD_M4:
case MOD_M3:
case MOD_PISTOL:

6
reaction/game/g_weapon.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.64 2002/06/03 00:40:25 blaze
// some more breakables fixes(ssg chips)
//
// Revision 1.63 2002/06/02 22:04:38 blaze
// breakables act proper when triggered(explode if explosive, etc) also, spawnflags 8 will make the breakable so you cant kick it
//
@ -1700,7 +1703,7 @@ void Weapon_SSG3000_Fire (gentity_t *ent) {
if ( traceEnt && traceEnt->s.eType == ET_PRESSURE )
G_CreatePressure(trace.endpos, trace.plane.normal, traceEnt);
G_Damage (traceEnt, ent, ent, forward, trace.endpos, 0, 0, MOD_SNIPER);
return;
}
@ -1723,7 +1726,6 @@ void Weapon_SSG3000_Fire (gentity_t *ent) {
//not the case
if ( traceEnt->s.eType == ET_BREAKABLE )
{
//G_Printf("(%d) SSG: Hit a breakable\n", level.time);
hitBreakable = qtrue;
}