diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-11-18 15:10:37 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-11-18 15:10:37 +0000 |
| commit | ab61530779c73e7e145193efcb1e23a47c16e7f3 (patch) | |
| tree | 9aed75947be45585cf884effc3a59575a1b1bb8e /src/game/base/weapon.cc | |
| parent | 69b0cd536aee5cf948e5a97af4df3dd75a545bd0 (diff) | |
Implements server-side ship damage,
adds a damage key to the weapons.ini file,
configurable spacemine damage.
Diffstat (limited to 'src/game/base/weapon.cc')
| -rw-r--r-- | src/game/base/weapon.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/game/base/weapon.cc b/src/game/base/weapon.cc index 59384e2..ec87b34 100644 --- a/src/game/base/weapon.cc +++ b/src/game/base/weapon.cc @@ -75,6 +75,10 @@ bool Weapon::init() } else if (weaponsini.got_key_float("volume", f)) { weapon->set_volume(f); continue; + + } else if (weaponsini.got_key_float("damage", f)) { + weapon->set_damage(f); + continue; } else if (weaponsini.got_key_long("level", l)) { weapon->set_level(l); @@ -108,6 +112,10 @@ bool Weapon::init() weapon->set_volume(f); continue; + } else if (weaponsini.got_key_float("damage", f)) { + weapon->set_damage(f); + continue; + } else if (weaponsini.got_key_long("level", l)) { weapon->set_level(l); continue; @@ -139,6 +147,10 @@ bool Weapon::init() } else if (weaponsini.got_key_float("volume", f)) { weapon->set_volume(f); continue; + + } else if (weaponsini.got_key_float("damage", f)) { + weapon->set_damage(f); + continue; } else if (weaponsini.got_key_long("level", l)) { weapon->set_level(l); |