mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-10 23:32:06 +00:00
Dead players cant use unzoom or weapon commands
This commit is contained in:
parent
98d223f6de
commit
7deb8460e1
2 changed files with 9 additions and 2 deletions
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.112 2005/09/13 03:11:08 jbravo
|
||||
// Dead players cant use unzoom or weapon commands
|
||||
//
|
||||
// Revision 1.111 2005/09/07 20:27:41 makro
|
||||
// Entity attachment trees
|
||||
//
|
||||
|
@ -523,6 +526,7 @@ extern radio_msg_t female_radio_msgs[];
|
|||
#define RQ3_HANDCANNON_DELAY 1200
|
||||
#define RQ3_SSG3000_DELAY 1400
|
||||
#define RQ3_SSG3000_BOLT_DELAY 1300 // Elder: delay before zooming back in
|
||||
#define RQ3_SSG3000_ZOOM_DELAY 500 // JBravo: stop the sniperscripts
|
||||
//#define RQ3_AKIMBO_DELAY 500 // Elder: two delays: one for the total delay
|
||||
//#define RQ3_AKIMBO_DELAY2 200 // one for the time to start the second shot
|
||||
#define RQ3_AKIMBO_DELAY 100
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.194 2005/09/13 03:11:08 jbravo
|
||||
// Dead players cant use unzoom or weapon commands
|
||||
//
|
||||
// Revision 1.193 2005/09/13 02:33:17 jbravo
|
||||
// Adding new callvote gametype:map
|
||||
//
|
||||
|
@ -2619,7 +2622,7 @@ void Cmd_Weapon(gentity_t * ent)
|
|||
{
|
||||
|
||||
//Makro - this was a few lines below
|
||||
if (ent->client->ps.pm_type == PM_SPECTATOR)
|
||||
if (!ent || !ent->client || ent->client->ps.pm_type == PM_SPECTATOR)
|
||||
return;
|
||||
|
||||
ent->client->weapon_attempts--;
|
||||
|
@ -2779,7 +2782,7 @@ void Cmd_New_Weapon(gentity_t * ent)
|
|||
void Cmd_Unzoom(gentity_t * ent)
|
||||
{
|
||||
//Makro - if the client is dead or spectating, do nothing
|
||||
if (!ent || !ent->client || ent->client->ps.stats[STAT_HEALTH] <= 0 || ent->client->ps.pm_type == PM_SPECTATOR)
|
||||
if (!ent || !ent->client || ent->client->ps.pm_type == PM_SPECTATOR)
|
||||
return;
|
||||
|
||||
// Freud, play zooming sounds for unzoom
|
||||
|
|
Loading…
Reference in a new issue