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

Misc fixes

Browse source
This commit is contained in:
Richard Allen 2002-05-01 21:14:59 +00:00
parent 2e8a4c301d
commit 8ee06b724a
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reaction/cgame/cg_draw.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.39 2002/05/01 21:14:59 jbravo
// Misc fixes
//
// Revision 1.38 2002/05/01 03:27:17 niceass // Revision 1.38 2002/05/01 03:27:17 niceass
// centerprint fix + prettier // centerprint fix + prettier
// //
@ -2415,6 +2418,10 @@ static void CG_DrawCrosshairNames( void ) {
if ( cg.renderingThirdPerson ) { if ( cg.renderingThirdPerson ) {
return; return;
} }
// JBravo: no names for zcam users.
if (cg.snap->ps.stats[STAT_RQ3] & RQ3_ZCAM) {
return;
}
// scan the known entities to see if the crosshair is sighted on one // scan the known entities to see if the crosshair is sighted on one
CG_ScanForCrosshairEntity(); CG_ScanForCrosshairEntity();
@ -2671,7 +2678,7 @@ static qboolean CG_DrawFollow( void ) {
if (team == TEAM_RED) { if (team == TEAM_RED) {
Com_sprintf (combinedName, sizeof(combinedName), "%sFollowing%s %s%s/%s%s", S_COLOR_RED, Com_sprintf (combinedName, sizeof(combinedName), "%sFollowing%s %s%s/%s%s", S_COLOR_RED,
S_COLOR_WHITE, cgs.clientinfo[cg.snap->ps.clientNum].name, S_COLOR_RED, S_COLOR_WHITE, cgs.clientinfo[cg.snap->ps.clientNum].name, S_COLOR_RED,
S_COLOR_MAGENTA, cg_RQ3_team2name.string); S_COLOR_MAGENTA, cg_RQ3_team1name.string);
} else { } else {
Com_sprintf (combinedName, sizeof(combinedName), "%sFollowing%s %s%s/%s%s", S_COLOR_RED, Com_sprintf (combinedName, sizeof(combinedName), "%sFollowing%s %s%s/%s%s", S_COLOR_RED,
S_COLOR_WHITE, cgs.clientinfo[cg.snap->ps.clientNum].name, S_COLOR_RED, S_COLOR_WHITE, cgs.clientinfo[cg.snap->ps.clientNum].name, S_COLOR_RED,

11
reaction/game/bg_pmove.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.69 2002/05/01 21:14:59 jbravo
// Misc fixes
//
// Revision 1.68 2002/04/26 05:29:38 niceass // Revision 1.68 2002/04/26 05:29:38 niceass
// PHYSICS, Take 2 // PHYSICS, Take 2
// //
@ -1698,15 +1701,15 @@ static void PM_FinishWeaponChange( void ) {
savedWeap = pm->ps->weapon; savedWeap = pm->ps->weapon;
if ( weapon < WP_NONE || weapon >= WP_NUM_WEAPONS ) { if ( weapon < WP_NONE || weapon >= WP_NUM_WEAPONS ) {
Com_Printf("BANDAGEBUG: (1) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon, // Com_Printf("BANDAGEBUG: (1) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon,
weapon); // weapon);
weapon = savedWeap; weapon = savedWeap;
// weapon = WP_NONE; // weapon = WP_NONE;
} }
if ( !( pm->ps->stats[STAT_WEAPONS] & ( 1 << weapon ) ) ) { if ( !( pm->ps->stats[STAT_WEAPONS] & ( 1 << weapon ) ) ) {
Com_Printf("BANDAGEBUG: (2) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon, // Com_Printf("BANDAGEBUG: (2) weapon is %d and cmd.weapon is %d. Reverting to previous weapon\n", pm->ps->weapon,
weapon); // weapon);
weapon = savedWeap; weapon = savedWeap;
// weapon = WP_NONE; // weapon = WP_NONE;
} }

9
reaction/game/zcam.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.11 2002/05/01 21:14:59 jbravo
// Misc fixes
//
// Revision 1.10 2002/03/31 03:31:24 jbravo // Revision 1.10 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups // Compiler warning cleanups
// //
@ -237,17 +240,17 @@ static int NumPlayers (void)
for (i = 0; i < level.maxclients; i++) for (i = 0; i < level.maxclients; i++)
{ {
// JBravo: zcam team fixes // JBravo: zcam team fixes
if (g_gametype.integer == GT_TEAMPLAY) { /* if (g_gametype.integer == GT_TEAMPLAY) {
if (level.clients[i].pers.connected == CON_CONNECTED if (level.clients[i].pers.connected == CON_CONNECTED
&& level.clients[i].sess.savedTeam != TEAM_SPECTATOR) { && level.clients[i].sess.savedTeam != TEAM_SPECTATOR) {
count ++; count ++;
} }
} else { } else { */
if (level.clients[i].pers.connected == CON_CONNECTED if (level.clients[i].pers.connected == CON_CONNECTED
&& level.clients[i].sess.sessionTeam != TEAM_SPECTATOR) { && level.clients[i].sess.sessionTeam != TEAM_SPECTATOR) {
count ++; count ++;
} }
} // }
} }
return count; return count;
} }