rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes and cleanups

This commit is contained in:
Richard Allen 2002-05-27 17:47:19 +00:00
parent 157a88d6cb
commit cd9b6e0e31
5 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
reaction/cgame/cg_event.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.58 2002/05/27 17:47:19 jbravo
// Fixes and cleanups
//
// Revision 1.57 2002/05/26 05:15:36 niceass
// pressure
//
@ -2158,18 +2161,19 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
case EV_MISSILE_MISS:
DEBUGNAME("EV_MISSILE_MISS");
ByteToDir( es->eventParm, dir );
CG_MissileHitWall( es->weapon, 0, position, dir, viewDir, IMPACTSOUND_DEFAULT, 0 );
// JBravo: removing arg 5 after NA's changes on the next 4 CG_MissileHitWall calls.
CG_MissileHitWall( es->weapon, 0, position, dir, IMPACTSOUND_DEFAULT, 0 );
break;
case EV_MISSILE_MISS_METAL:
DEBUGNAME("EV_MISSILE_MISS_METAL");
ByteToDir( es->eventParm, dir );
CG_MissileHitWall( es->weapon, 0, position, dir, viewDir, IMPACTSOUND_METAL, 0 );
CG_MissileHitWall( es->weapon, 0, position, dir, IMPACTSOUND_METAL, 0 );
break;
case EV_KNIFE_MISS:
DEBUGNAME("EV_KNIFE_MISS");
ByteToDir( es->eventParm, dir );
CG_MissileHitWall( es->weapon, 0, position, dir, viewDir, IMPACTSOUND_METAL, RQ3_WPMOD_KNIFESLASH );
CG_MissileHitWall( es->weapon, 0, position, dir, IMPACTSOUND_METAL, RQ3_WPMOD_KNIFESLASH );
break;
case EV_RAILTRAIL:
@ -2180,7 +2184,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
//CG_RailTrail( ci, es->origin2, es->pos.trBase );
if ( es->eventParm != 255 ) {
ByteToDir( es->eventParm, dir );
CG_MissileHitWall( es->weapon, es->clientNum, position, dir, viewDir, IMPACTSOUND_DEFAULT, 0 );
CG_MissileHitWall( es->weapon, es->clientNum, position, dir, IMPACTSOUND_DEFAULT, 0 );
}
break;
@ -2593,9 +2597,10 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
// don't play gib sound when using the kamikaze because it interferes
// with the kamikaze sound, downside is that the gib sound will also
// not be played when someone is gibbed while just carrying the kamikaze
if ( !(es->eFlags & EF_KAMIKAZE) ) {
trap_S_StartSound( NULL, es->number, CHAN_BODY, cgs.media.gibSound );
}
// JBravo: EF_KAMIKAZE is no more
// if ( !(es->eFlags & EF_KAMIKAZE) ) {
trap_S_StartSound( NULL, es->number, CHAN_BODY, cgs.media.gibSound );
// }
CG_GibPlayer( cent->lerpOrigin );
break;
case EV_BREAK_GLASS1:

8
reaction/cgame/cg_info.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.23 2002/05/27 17:47:19 jbravo
// Fixes and cleanups
//
// Revision 1.22 2002/05/26 06:17:27 makro
// Loading screen again
//
@ -412,7 +415,8 @@ void CG_DrawInformation( void ) {
}
trap_R_SetColor(colorDkGrey);
for (bar; bar < 10; bar++) {
// JBravo: added = 0 to the bar on two lines
for (bar = 0; bar < 10; bar++) {
CG_DrawPic(SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, percentBox);
}
} else {
@ -420,7 +424,7 @@ void CG_DrawInformation( void ) {
CG_FillRect( SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, colorWhite);
}
for (bar; bar < 10; bar++) {
for (bar = 0; bar < 10; bar++) {
CG_FillRect( SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, colorDkGrey);
}
}

7
reaction/cgame/cg_scoreboard.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.28 2002/05/27 17:47:19 jbravo
// Fixes and cleanups
//
// Revision 1.27 2002/05/27 07:00:09 niceass
// misc changes
//
@ -217,10 +220,10 @@ CG_TeamScoreboard
static int CG_TeamplayScoreboard(void)
{
clientInfo_t *ci;
int i, subs;
int i; // subs;
int Reds, Blues, Spectators, Refs;
int RedSubs, BlueSubs;
// int RedSubs, BlueSubs;
float Alpha;
score_t *Score;

5
reaction/cgame/cg_weapons.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.74 2002/05/27 17:47:19 jbravo
// Fixes and cleanups
//
// Revision 1.73 2002/05/27 06:58:40 niceass
// removed reflection stuff. Silencer stuff added
//
@ -4091,4 +4094,4 @@ void CG_ReloadWeapon (centity_t *cent, int reloadStage)
CG_Error("CG_ReloadWeapon: Reload stage > 2\n");
break;
}
}
}

5
reaction/game/q_math.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.7 2002/05/27 17:47:19 jbravo
// Fixes and cleanups
//
// Revision 1.6 2002/05/27 06:55:02 niceass
// reflection byte function for sparks
//
@ -1310,4 +1313,4 @@ int ReflectVectorByte(vec3_t dir, vec3_t plane) {
VectorMA( dir, -2*dot, plane, final );
return DirToByte(final);
}
}