← Back to branch summary

~ubuntu-branches/ubuntu/natty/alien-arena/natty

« back to all changes in this revision

Viewing changes to source/game/p_weapon.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Gilbert
  • Date: 2010-05-07 22:09:24 UTC
  • mfrom: (1.1.4 upstream) (4.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100507220924-kcuv71rd3un2bdyd
Tags: 7.40-1
* New upstream release
  - Five new maps!
  - Two new weapon models.
  - Improvements to the renderer.
  - A variety of gameplay changes and tweaks.
  - Antilag bugfixes.
  - Revamped menu.
* Drop security patches (all of them have been applied upstream now).
* The watch file is currently broken and unfixable due to upstream's file
  naming scheme for this version (they have indicated that they will fix
  this in future releases).

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/game/p_weapon.c
404
404
                return;
405
405
        }
406
406
 
407
 
        if ( ent->client->pers.inventory[ITEM_INDEX(FindItem("cells"))]
 
407
        if ( ent->client->pers.inventory[ITEM_INDEX(FindItem("cells"))] > 4
408
408
                && ent->client->pers.inventory[ITEM_INDEX(FindItem("Alien Disruptor"))] )
409
409
        {
410
410
                ent->client->newweapon = FindItem ("Alien Disruptor");
751
751
        PlayerNoise(ent, start, PNOISE_WEAPON);
752
752
 
753
753
        if ((! ( (int)dmflags->value & DF_INFINITE_AMMO ) ) && !instagib->value )
754
 
                ent->client->pers.inventory[ent->client->ammo_index]= ent->client->pers.inventory[ent->client->ammo_index]-2;
 
754
                ent->client->pers.inventory[ent->client->ammo_index]= ent->client->pers.inventory[ent->client->ammo_index]-5;
755
755
}
756
756
 
757
757
void Weapon_Disruptor (edict_t *ent)
886
886
                VectorSet(offset, 8, 8, ent->viewheight-8);
887
887
                P_ProjectSource (ent->client, ent->s.origin, offset, forward, right, start);
888
888
 
889
 
                fire_fireball (ent, start, forward, damage, 1500, damage_radius, 100);
 
889
                fire_fireball (ent, start, forward, damage, 1500, damage_radius, 75);
890
890
 
891
891
                // send muzzle flash
892
892
                gi.WriteByte (svc_muzzleflash);
985
985
 
986
986
        if(ent->client->buttons & BUTTON_ATTACK2) //alt fire
987
987
        {
988
 
                if(excessive->value) //no homers in excessive!
 
988
                if(ent->client->resp.homing_shots < 5) {
 
989
                        if(excessive->value) //no homers in excessive!
 
990
                                fire_rocket (ent, start, forward, damage, 900, damage_radius, radius_damage);
 
991
                        else
 
992
                                fire_homingrocket (ent, start, forward, damage, 250, damage_radius, radius_damage);
 
993
                }
 
994
                else {
 
995
                        safe_cprintf(ent, PRINT_HIGH, "Exceeded max number of homing missiles for this round!\n");
989
996
                        fire_rocket (ent, start, forward, damage, 900, damage_radius, radius_damage);
990
 
                else
991
 
                        fire_homingrocket (ent, start, forward, damage, 250, damage_radius, radius_damage);
 
997
                }
992
998
        }
993
999
        else
994
1000
                fire_rocket (ent, start, forward, damage, 900, damage_radius, radius_damage);