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

Fixed a bug in the Obit system and a give (weapons or all) bug

Browse source
This commit is contained in:
Richard Allen 2002-05-10 08:10:18 +00:00
parent 73818a9160
commit 13aa3794ac
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.106 2002/05/10 08:10:18 jbravo
// Fixed a bug in the Obit system and a give (weapons or all) bug
//
// Revision 1.105 2002/05/10 04:06:27 jbravo // Revision 1.105 2002/05/10 04:06:27 jbravo
// Added Ignore // Added Ignore
// //
@ -503,7 +506,14 @@ void Cmd_Give_f (gentity_t *ent)
//the initial bit (I don't know what that is) //the initial bit (I don't know what that is)
//http://www.iota-six.freeserve.co.uk/c/bitwise.htm //http://www.iota-six.freeserve.co.uk/c/bitwise.htm
ent->client->ps.stats[STAT_WEAPONS] = (1 << WP_NUM_WEAPONS) - 1 - ( 1 << WP_NONE ); ent->client->ps.stats[STAT_WEAPONS] = (1 << WP_NUM_WEAPONS) - 1 - ( 1 << WP_NONE );
// JBravo: so we can drop any of these weapons
ent->client->uniqueWeapons = 5;
ent->client->weaponCount[WP_SSG3000] = 1;
ent->client->weaponCount[WP_MP5] = 1;
ent->client->weaponCount[WP_M3] = 1;
ent->client->weaponCount[WP_M4] = 1;
ent->client->weaponCount[WP_AKIMBO] = 1;
ent->client->weaponCount[WP_HANDCANNON] = 1;
if (!give_all) if (!give_all)
return; return;
} }

5
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.70 2002/05/10 08:10:18 jbravo
// Fixed a bug in the Obit system and a give (weapons or all) bug
//
// Revision 1.69 2002/05/10 07:47:23 jbravo // Revision 1.69 2002/05/10 07:47:23 jbravo
// Forgot grenade obits // Forgot grenade obits
// //
@ -785,7 +788,7 @@ void PrintDeathMessage (gentity_t *target, gentity_t *attacker, int location, in
break; break;
} }
} }
if (attacker->client || attacker != target) if (attacker->client && attacker != target)
message[0] = '\0'; message[0] = '\0';
if (message[0] != '\0') { if (message[0] != '\0') {
Com_sprintf (death_msg, sizeof(death_msg), "%s %s\n", target->client->pers.netname, message); Com_sprintf (death_msg, sizeof(death_msg), "%s %s\n", target->client->pers.netname, message);