rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-04-19 17:02:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

newb ctb message added

Browse source
This commit is contained in:
Bryce Hutchings 2002-09-08 19:47:03 +00:00
parent c93f437aca
commit f4713b34a9
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.124 2002/09/08 19:47:03 niceass
// newb ctb message added
//
// Revision 1.123 2002/09/07 22:40:01 jbravo
// Added a scaling ctb respawn system. Fixed a bug that allowed players to
// spawn before their team respawn with the team command.
@ -729,6 +732,7 @@ struct gclient_s {
float rd_repTime; //The time for the last repeated radio msg
// JBravo: time of death for delayed CTB respawns
int time_of_death;
int flagMessageTime;// NiceAss: Newb message for pistol/knife w/ enemy case
};
// JBravo: for model loading

9
reaction/game/g_team.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.15 2002/09/08 19:46:27 niceass
// newb ctb message added
//
// Revision 1.14 2002/07/27 22:15:16 niceass
// special weapon cheat w/ flag fixed
//
@ -825,8 +828,10 @@ int Pickup_Team(gentity_t * ent, gentity_t * other)
// JBravo: no picking up [the enemy case-NiceAss] case if you have a two handed weapon.
if (other->client->ps.weapon != WP_PISTOL && other->client->ps.weapon != WP_KNIFE &&
team != cl->sess.sessionTeam) {
return 0;
team != cl->sess.sessionTeam && level.time - cl->flagMessageTime > 10000 ) {
cl->flagMessageTime = level.time;
trap_SendServerCommand(cl->ps.clientNum, va("print \"^1Your active weapon must be the pistol or knife in order to pick up the enemy case!^7\n\""));
return 0;
}
// NiceAss: If you are switching weapons as you go over a flag, cmd.weapon will have the weapon