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

Bando now adds extra ammo to the special weaps, and when its dropped it goes

Browse source 
away again.
This commit is contained in:
Richard Allen 2002-03-21 19:22:12 +00:00
parent d22a255004
commit 965f7c55ad
3 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/game/bg_public.h
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.51 2002/03/21 19:22:12 jbravo
// Bando now adds extra ammo to the special weaps, and when its dropped it goes
// away again.
//
// Revision 1.50 2002/03/14 02:24:39 jbravo
// Adding radio :)
//
@ -189,6 +193,7 @@
#define RQ3_M4_EXTRA_AMMO 1
#define RQ3_AKIMBO_EXTRA_AMMO 2
#define RQ3_HANDCANNON_EXTRA_AMMO 12
#define RQ3_KNIVES_EXTRA_AMMO 10
//Elder: confused?

33
reaction/game/g_cmds.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.80 2002/03/21 19:22:12 jbravo
// Bando now adds extra ammo to the special weaps, and when its dropped it goes
// away again.
//
// Revision 1.79 2002/03/18 19:18:39 slicer
// Fixed bandage bugs ( i hope )
//
@ -2728,7 +2732,7 @@ void Cmd_DropItem_f( gentity_t *ent )
//Elder: reset item totals if using bandolier
if (bg_itemlist[ent->client->ps.stats[STAT_HOLDABLE_ITEM]].giTag == HI_BANDOLIER)
{
if (ent->client->numClips[WP_PISTOL] > RQ3_PISTOL_MAXCLIP)
/* if (ent->client->numClips[WP_PISTOL] > RQ3_PISTOL_MAXCLIP)
{
ent->client->numClips[WP_PISTOL] = RQ3_PISTOL_MAXCLIP;
ent->client->numClips[WP_AKIMBO] = RQ3_PISTOL_MAXCLIP;
@ -2737,15 +2741,24 @@ void Cmd_DropItem_f( gentity_t *ent )
{
ent->client->numClips[WP_M3] = RQ3_M3_MAXCLIP;
ent->client->numClips[WP_HANDCANNON] = RQ3_M3_MAXCLIP;
}
if (ent->client->numClips[WP_M4] > RQ3_M4_MAXCLIP)
ent->client->numClips[WP_M4] = RQ3_M4_MAXCLIP;
if (ent->client->numClips[WP_MP5] > RQ3_MP5_MAXCLIP)
ent->client->numClips[WP_MP5] = RQ3_MP5_MAXCLIP;
if (ent->client->numClips[WP_KNIFE] > RQ3_KNIFE_MAXCLIP)
ent->client->numClips[WP_KNIFE] = RQ3_KNIFE_MAXCLIP;
if (ent->client->numClips[WP_GRENADE] > RQ3_GRENADE_MAXCLIP)
ent->client->numClips[WP_GRENADE] = RQ3_GRENADE_MAXCLIP;
} */
if (ent->client->numClips[WP_SSG3000] > RQ3_SSG3000_EXTRA_AMMO)
ent->client->numClips[WP_SSG3000] = RQ3_SSG3000_EXTRA_AMMO;
if (ent->client->numClips[WP_M3] > RQ3_M3_EXTRA_AMMO)
ent->client->numClips[WP_M3] = RQ3_M3_EXTRA_AMMO;
if (ent->client->numClips[WP_M4] > RQ3_M4_EXTRA_AMMO)
ent->client->numClips[WP_M4] = RQ3_M4_EXTRA_AMMO;
if (ent->client->numClips[WP_MP5] > RQ3_MP5_EXTRA_AMMO)
ent->client->numClips[WP_MP5] = RQ3_MP5_EXTRA_AMMO;
if (ent->client->numClips[WP_KNIFE] > RQ3_KNIVES_EXTRA_AMMO)
ent->client->numClips[WP_KNIFE] = RQ3_KNIVES_EXTRA_AMMO;
if (ent->client->numClips[WP_AKIMBO] > RQ3_AKIMBO_EXTRA_AMMO)
ent->client->numClips[WP_AKIMBO] = RQ3_AKIMBO_EXTRA_AMMO;
if (ent->client->ps.ammo[WP_GRENADE] > 0)
ent->client->ps.ammo[WP_GRENADE] = 0;
if (ent->client->numClips[WP_PISTOL] > 1)
ent->client->numClips[WP_PISTOL] = 1;
if (ent->client->uniqueWeapons > g_RQ3_maxWeapons.integer)
{

20
reaction/game/g_teamplay.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.40 2002/03/21 19:22:12 jbravo
// Bando now adds extra ammo to the special weaps, and when its dropped it goes
// away again.
//
// Revision 1.39 2002/03/21 15:02:05 jbravo
// More teamname cleanups and fix for fraglines.
//
@ -700,7 +704,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_SSG3000 );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_KNIFE );
ent->client->numClips[ WP_SSG3000 ] = RQ3_SSG3000_EXTRA_AMMO;
ent->client->numClips[ WP_SSG3000 ] = RQ3_SSG3000_EXTRA_AMMO * bandolierFactor;
ent->client->ps.ammo[ WP_SSG3000 ] = RQ3_SSG3000_AMMO;
ent->client->ps.weapon = WP_SSG3000;
ent->client->ps.weaponTime = RQ3_SSG3000_ACTIVATE_DELAY;
@ -711,7 +715,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_MP5 );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_KNIFE );
ent->client->numClips[ WP_MP5 ] = RQ3_MP5_EXTRA_AMMO;
ent->client->numClips[ WP_MP5 ] = RQ3_MP5_EXTRA_AMMO * bandolierFactor;
ent->client->ps.ammo[ WP_MP5 ] = RQ3_MP5_AMMO;
ent->client->ps.weapon = WP_MP5;
ent->client->ps.weaponTime = RQ3_MP5_ACTIVATE_DELAY;
@ -722,7 +726,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_M3 );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_KNIFE );
ent->client->numClips[ WP_M3 ] = RQ3_M3_EXTRA_AMMO;
ent->client->numClips[ WP_M3 ] = RQ3_M3_EXTRA_AMMO * bandolierFactor;
ent->client->ps.ammo[ WP_M3 ] = RQ3_M3_AMMO;
ent->client->ps.weapon = WP_M3;
ent->client->ps.weaponTime = RQ3_M3_ACTIVATE_DELAY;
@ -733,7 +737,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_M4 );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_KNIFE );
ent->client->numClips[ WP_M4 ] = RQ3_M4_EXTRA_AMMO;
ent->client->numClips[ WP_M4 ] = RQ3_M4_EXTRA_AMMO * bandolierFactor;
ent->client->ps.ammo[ WP_M4 ] = RQ3_M4_AMMO;
ent->client->ps.weapon = WP_M4;
ent->client->ps.weaponTime = RQ3_M4_ACTIVATE_DELAY;
@ -744,7 +748,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_AKIMBO );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_KNIFE );
ent->client->numClips[ WP_AKIMBO ] = RQ3_AKIMBO_EXTRA_AMMO;
ent->client->numClips[ WP_AKIMBO ] = RQ3_AKIMBO_EXTRA_AMMO * bandolierFactor;
ent->client->ps.ammo[ WP_AKIMBO ] = RQ3_AKIMBO_AMMO;
ent->client->ps.weapon = WP_AKIMBO;
ent->client->ps.weaponTime = RQ3_AKIMBO_ACTIVATE_DELAY;
@ -755,7 +759,7 @@ void EquipPlayer (gentity_t *ent)
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_HANDCANNON );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_KNIFE );
ent->client->numClips[ WP_HANDCANNON ] = RQ3_HANDCANNON_EXTRA_AMMO;
ent->client->numClips[ WP_HANDCANNON ] = RQ3_HANDCANNON_EXTRA_AMMO * bandolierFactor;
ent->client->ps.ammo[ WP_HANDCANNON ] = RQ3_HANDCANNON_AMMO;
ent->client->ps.weapon = WP_HANDCANNON;
ent->client->ps.weaponTime = RQ3_HANDCANNON_ACTIVATE_DELAY;
@ -765,7 +769,7 @@ void EquipPlayer (gentity_t *ent)
case WP_KNIFE:
ent->client->ps.stats[STAT_WEAPONS] = ( 1 << WP_KNIFE );
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_PISTOL );
ent->client->ps.ammo[ WP_KNIFE ] = 10 * bandolierFactor;
ent->client->ps.ammo[ WP_KNIFE ] = RQ3_KNIVES_EXTRA_AMMO * bandolierFactor;
ent->client->ps.weapon = WP_KNIFE;
ent->client->ps.weaponTime = RQ3_KNIFE_ACTIVATE_DELAY;
ent->client->weaponCount[ent->client->ps.weapon] = 1;
@ -778,7 +782,7 @@ void EquipPlayer (gentity_t *ent)
if (grenades > 0) {
ent->client->ps.stats[STAT_WEAPONS] |= ( 1 << WP_GRENADE );
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)) {
ent->client->ps.generic1 = ((ent->client->ps.generic1 & ANIM_TOGGLEBIT) ^