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

Semi fixed the bodies thing in CTB

Browse source
This commit is contained in:
Richard Allen 2002-08-30 01:09:06 +00:00
parent 39f52e2ad4
commit 94214bcd8b
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/game/g_active.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.88 2002/08/30 01:09:06 jbravo
// Semi fixed the bodies thing in CTB
//
// Revision 1.87 2002/08/21 07:00:07 jbravo
// Added CTB respawn queue and fixed game <-> cgame synch problem in CTB
//
@ -1213,7 +1216,7 @@ void ClientThink_real(gentity_t * ent)
// pressing attack or use is the normal respawn method
// JBravo: make'em spactate
if (ucmd->buttons & (BUTTON_ATTACK | BUTTON_USE_HOLDABLE)) {
if (g_gametype.integer == GT_TEAMPLAY) {
if (g_gametype.integer == GT_TEAMPLAY || g_gametype.integer == GT_CTF) {
MakeSpectator(ent);
} else {
respawn(ent);

10
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.114 2002/08/30 01:09:06 jbravo
// Semi fixed the bodies thing in CTB
//
// Revision 1.113 2002/08/28 23:10:06 jbravo
// Added cg_RQ3_SuicideLikeARealMan, timestamping to server logs and
// fixed stats for non-TP modes.
@ -844,15 +847,8 @@ respawn
*/
void respawn(gentity_t * ent)
{
//gentity_t *tent;
CopyToBodyQue(ent);
ClientSpawn(ent);
// add a teleportation effect
//Elder: removed
//tent = G_TempEntity( ent->client->ps.origin, EV_PLAYER_TELEPORT_IN );
//tent->s.clientNum = ent->s.clientNum;
}
/*

7
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.133 2002/08/30 01:09:06 jbravo
// Semi fixed the bodies thing in CTB
//
// Revision 1.132 2002/08/29 23:47:10 jbravo
// Disabled drop case and fixed a padding problem in the date code.
//
@ -1302,7 +1305,7 @@ void RQ3_Respawn_CTB_players(int team)
ent->client->ps.persistant[PERS_TEAM] = team;
ent->client->sess.spectatorState = SPECTATOR_NOT;
ent->client->specMode = SPECTATOR_NOT;
respawn(ent);
ClientSpawn(ent);
}
}
}
@ -1358,6 +1361,8 @@ void MakeSpectator(gentity_t * ent)
}
}
ClientSpawn(ent);
ent->client->gibbed = qtrue;
trap_UnlinkEntity(ent);
return;
}
if (ent->r.svFlags & SVF_BOT)