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>2012-10-14 10:25:33 +0000
committerStijn Buys <ingar@osirion.org>2012-10-14 10:25:33 +0000
commit4798ff98e23a8f56622b8ca448b997b84ecbd7d5 (patch)
treeeade67b796a595a3e4d127a1cd5ee937bf56f56f /src/game/base/weapon.cc
parentfdd6655f2ce1fa5332c5e23f1a76e25e26733a61 (diff)
Add a stackable flag for weapons, load a default model for spacemines.
Diffstat (limited to 'src/game/base/weapon.cc')
-rw-r--r--src/game/base/weapon.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/base/weapon.cc b/src/game/base/weapon.cc
index 8eca691..7f816e2 100644
--- a/src/game/base/weapon.cc
+++ b/src/game/base/weapon.cc
@@ -152,14 +152,17 @@ bool Weapon::init()
if (weaponsini.got_section("mine")) {
weapon = new Weapon();
+ weapon->set_stackable(true);
count++;
} else if (weaponsini.got_section("cannon")) {
weapon = new Weapon();
+ weapon->set_stackable(false);
count++;
} else if (weaponsini.got_section("turret")) {
weapon = new Weapon();
+ weapon->set_stackable(false);
count++;
} else if (weaponsini.got_section()) {
@@ -190,6 +193,7 @@ Weapon::Weapon() : core::Info(weapon_infotype)
{
set_volume(1);
set_level(1);
+ set_stackable(false);
}
Weapon::~Weapon()