Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-01-06 15:26:56 +0000
committerStijn Buys <ingar@osirion.org>2013-01-06 15:26:56 +0000
commitcafb6d40174459819b33ffc5e3d5e96762375619 (patch)
treef7df6dfc414e339ba466f9c151b759d921c9849a /src/game/base/weapon.cc
parent4701580b1d6d1ec71733096122ffa5979a1fe075 (diff)
Set the item::Mountable flag where required,
removed the Weapon::stackable() attribute.
Diffstat (limited to 'src/game/base/weapon.cc')
-rw-r--r--src/game/base/weapon.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/game/base/weapon.cc b/src/game/base/weapon.cc
index 1838733..a27d51b 100644
--- a/src/game/base/weapon.cc
+++ b/src/game/base/weapon.cc
@@ -205,21 +205,18 @@ bool Weapon::init()
if (weaponsini.got_section("mine")) {
previous = weapon;
weapon = new Weapon();
- weapon->set_stackable(true);
weapon->set_subtype(Mine);
count++;
} else if (weaponsini.got_section("cannon")) {
previous = weapon;
weapon = new Weapon();
- weapon->set_stackable(false);
weapon->set_subtype(Cannon);
count++;
} else if (weaponsini.got_section("turret")) {
previous = weapon;
weapon = new Weapon();
- weapon->set_stackable(false);
weapon->set_subtype(Turret);
count++;
@@ -279,7 +276,6 @@ Weapon::Weapon() : core::Info(weapon_infotype)
{
set_volume(1);
set_level(1);
- set_stackable(false);
set_subtype(Ammo);
set_damage(0);
set_projectile_interval(0);
@@ -291,11 +287,6 @@ Weapon::~Weapon()
{
}
-void Weapon::set_stackable(bool stackable)
-{
- weapon_stackable = stackable;
-}
-
void Weapon::set_level(const int level)
{
weapon_level = level;