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

Final fixes for anims at spawn and a knife bug.

Browse source
This commit is contained in:
Richard Allen 2002-03-03 23:51:45 +00:00
parent 8de2aca82c
commit 1097d75ab4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.28 2002/03/03 23:51:45 jbravo
// Final fixes for anims at spawn and a knife bug.
//
// Revision 1.27 2002/03/03 18:00:26 jbravo // Revision 1.27 2002/03/03 18:00:26 jbravo
// More Anim fixes. Knives still broken // More Anim fixes. Knives still broken
// //
@ -710,8 +713,8 @@ void EquipPlayer (gentity_t *ent)
case WP_KNIFE: case WP_KNIFE:
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_KNIFE ); ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_KNIFE );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL ); ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_KNIFE );
ent->client->ps.ammo[ WP_KNIFE ] = 10 * bandolierFactor; ent->client->ps.ammo[ WP_KNIFE ] = 10 * bandolierFactor;
ent->client->ps.weapon = WP_KNIFE;
ent->client->ps.weaponTime = RQ3_KNIFE_ACTIVATE_DELAY; ent->client->ps.weaponTime = RQ3_KNIFE_ACTIVATE_DELAY;
ent->client->weaponCount[ent->client->ps.weapon] = 1; ent->client->weaponCount[ent->client->ps.weapon] = 1;
ent->client->uniqueWeapons = 0; ent->client->uniqueWeapons = 0;
@ -725,7 +728,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->ps.ammo[WP_GRENADE] = grenades; ent->client->ps.ammo[WP_GRENADE] = grenades;
ent->client->uniqueWeapons++; ent->client->uniqueWeapons++;
} }
if (ent->client->teamplayWeapon == WP_KNIFE && (ent->client->ps.persistant[PERS_WEAPONMODES] & RQ3_KNIFEMODE)) { if (ent->client->teamplayWeapon == WP_KNIFE && !(ent->client->ps.persistant[PERS_WEAPONMODES] & RQ3_KNIFEMODE)) {
ent->client->ps.generic1 = ((ent->client->ps.generic1 & ANIM_TOGGLEBIT) ^ ent->client->ps.generic1 = ((ent->client->ps.generic1 & ANIM_TOGGLEBIT) ^
ANIM_TOGGLEBIT) | WP_ANIM_THROWACTIVATE; ANIM_TOGGLEBIT) | WP_ANIM_THROWACTIVATE;
} else { } else {