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

new reflection code

Browse source
This commit is contained in:
Bryce Hutchings 2002-05-27 06:54:06 +00:00
parent 1c0e6f7f2e
commit d95c1fe209
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reaction/game/g_weapon.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.62 2002/05/27 06:54:06 niceass
// new reflection code
//
// Revision 1.61 2002/05/25 10:40:31 makro // Revision 1.61 2002/05/25 10:40:31 makro
// Loading screen // Loading screen
// //
@ -561,7 +564,7 @@ void Bullet_Fire (gentity_t *ent, float spread, int damage, int MOD ) {
//} else if ((tr.surfaceFlags & SURF_METALSTEPS) || (tr.surfaceFlags & SURF_METAL2) || (tr.surfaceFlags & SURF_HARDMETAL)) { //} else if ((tr.surfaceFlags & SURF_METALSTEPS) || (tr.surfaceFlags & SURF_METAL2) || (tr.surfaceFlags & SURF_HARDMETAL)) {
} else if (IsMetalMat(Material)) { } else if (IsMetalMat(Material)) {
tent = G_TempEntity( tr.endpos, EV_BULLET_HIT_METAL ); tent = G_TempEntity( tr.endpos, EV_BULLET_HIT_METAL );
tent->s.eventParm = DirToByte( tr.plane.normal ); tent->s.eventParm = ReflectVectorByte( forward, tr.plane.normal );
tent->s.otherEntityNum = ent->s.number; tent->s.otherEntityNum = ent->s.number;
//} else if ( tr.surfaceFlags & SURF_GLASS) { //} else if ( tr.surfaceFlags & SURF_GLASS) {
} else if ( Material == MAT_GLASS ) { } else if ( Material == MAT_GLASS ) {
@ -1753,7 +1756,7 @@ void Weapon_SSG3000_Fire (gentity_t *ent) {
else else
tent[unlinked] = G_TempEntity( trace.endpos, EV_BULLET_HIT_WALL ); tent[unlinked] = G_TempEntity( trace.endpos, EV_BULLET_HIT_WALL );
tent[unlinked]->s.eventParm = DirToByte( trace.plane.normal ); tent[unlinked]->s.eventParm = ReflectVectorByte( forward, trace.plane.normal );
tent[unlinked]->s.otherEntityNum = ent->s.number; tent[unlinked]->s.otherEntityNum = ent->s.number;
} }
@ -1833,7 +1836,7 @@ void Weapon_SSG3000_Fire (gentity_t *ent) {
else else
tentWall = G_TempEntity( trace.endpos, EV_BULLET_HIT_WALL ); tentWall = G_TempEntity( trace.endpos, EV_BULLET_HIT_WALL );
tentWall->s.eventParm = DirToByte( trace.plane.normal ); tentWall->s.eventParm = ReflectVectorByte( forward, trace.plane.normal );
tentWall->s.otherEntityNum = ent->s.number; tentWall->s.otherEntityNum = ent->s.number;
if ( traceEnt && traceEnt->s.eType == ET_PRESSURE ) if ( traceEnt && traceEnt->s.eType == ET_PRESSURE )
@ -2496,8 +2499,7 @@ void G_StartKamikaze( gentity_t *ent ) {
if (ent->client) { if (ent->client) {
// //
explosion->activator = ent; explosion->activator = ent;
//
ent->s.eFlags &= ~EF_KAMIKAZE;
// nuke the guy that used it // nuke the guy that used it
G_Damage( ent, ent, ent, NULL, NULL, 100000, DAMAGE_NO_PROTECTION, MOD_KAMIKAZE ); G_Damage( ent, ent, ent, NULL, NULL, 100000, DAMAGE_NO_PROTECTION, MOD_KAMIKAZE );
} }