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

Small fixes to misc stuff

Browse source
This commit is contained in:
Richard Allen 2002-05-06 00:35:49 +00:00
parent 7cbc7a0d63
commit d981952de6
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.104 2002/05/06 00:35:49 jbravo
// Small fixes to misc stuff
//
// Revision 1.103 2002/05/05 15:51:16 slicer
// Captain and subs get saved on map_restarts ( moved to "sess" )
//
@ -985,6 +988,8 @@ void StopFollowing( gentity_t *ent ) {
ent->client->sess.sessionTeam = TEAM_SPECTATOR;
ent->client->sess.spectatorState = SPECTATOR_FREE;
ent->client->specMode = SPECTATOR_FREE;
// JBravo: clear zcam also
ent->client->ps.stats[STAT_RQ3] &= ~RQ3_ZCAM;
//Slicer - Removing any zoom bits he might have gainned
Cmd_Unzoom(ent);
ent->client->ps.pm_flags &= ~PMF_FOLLOW;

5
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.66 2002/05/06 00:35:49 jbravo
// Small fixes to misc stuff
//
// Revision 1.65 2002/05/04 16:13:04 makro
// Bots
//
@ -1026,7 +1029,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
// JBravo: make clients that are following this one stop following.
if (client->sess.spectatorClient == self->s.number) {
if (g_gametype.integer == GT_TEAMPLAY) {
if (client->sess.spectatorState != SPECTATOR_ZCAM)
if (client->sess.spectatorState == SPECTATOR_FOLLOW)
Cmd_FollowCycle_f(follower, 1);
} else {
Cmd_Score_f(g_entities + i);

12
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.81 2002/05/06 00:35:49 jbravo
// Small fixes to misc stuff
//
// Revision 1.80 2002/05/05 16:51:36 slicer
// Fixed a problem on MakeAllPlayersObservers()
//
@ -470,8 +473,12 @@ void MakeAllLivePlayersObservers()
for (i = 0; i < level.maxclients; i++) {
player = &g_entities[i];
// JBravo: I dont agree. Why allow players that are already spectators to stay in follow
// Mode or zcam mode when there are no other players to follow ?
//Slicer: Need to check if they are solid or not.
if (!player->inuse || player->client->ps.pm_type != PM_NORMAL)
// if (!player->inuse || player->client->ps.pm_type != PM_NORMAL)
// continue;
if (!player->inuse)
continue;
//Slicer Adding this..
level.clients[i].ps.pm_type = PM_DEAD;
@ -479,8 +486,7 @@ void MakeAllLivePlayersObservers()
level.clients[i].sess.savedTeam = level.clients[i].sess.sessionTeam;
level.clients[i].ps.persistant[PERS_SAVEDTEAM] = level.clients[i].sess.sessionTeam;
level.clients[i].sess.sessionTeam = TEAM_SPECTATOR;
level.clients[i].sess.spectatorState = SPECTATOR_FREE;
StopFollowing (player);
}
}

9
reaction/game/zcam.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.12 2002/05/06 00:35:49 jbravo
// Small fixes to misc stuff
//
// Revision 1.11 2002/05/01 21:14:59 jbravo
// Misc fixes
//
@ -694,7 +697,8 @@ void CameraFlicBegin (gentity_t *ent)
cameras[clientNum].flic_target = NULL;
cameras[clientNum].swing_target = NULL;
camera_begin (ent);
CameraShowMode (ent);
// JBravo: no need for this extra spam
// CameraShowMode (ent);
}
static void CameraStaticThink (gentity_t *ent)
@ -923,7 +927,8 @@ void CameraSwingCycle (gentity_t *ent, int dir)
if (ent->client->camera->mode != CAMERA_MODE_SWING)
{
ent->client->camera->mode = CAMERA_MODE_SWING;
CameraShowMode (ent);
// JBravo: yes, we know
// CameraShowMode (ent);
// start with current flic target
if (ent->client->camera->flic_target != NULL