Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/spacemine.cc')
-rw-r--r--src/game/base/spacemine.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/game/base/spacemine.cc b/src/game/base/spacemine.cc
index dc5f6c5..32d4798 100644
--- a/src/game/base/spacemine.cc
+++ b/src/game/base/spacemine.cc
@@ -13,7 +13,7 @@ namespace game
const Template *SpaceMine::spacemine_template = 0;
-SpaceMine::SpaceMine(const core::Info *info) : EntityDynamic()
+SpaceMine::SpaceMine(const Weapon *weapon) : EntityDynamic()
{
entity_moduletypeid = spacemine_enttype;
set_name("Space mine");
@@ -24,6 +24,7 @@ SpaceMine::SpaceMine(const core::Info *info) : EntityDynamic()
// setting
set_radius(0);
+ set_damage(0.0f);
// use template settings if available
if (spacemine_template) {
@@ -31,13 +32,14 @@ SpaceMine::SpaceMine(const core::Info *info) : EntityDynamic()
}
// item type model overrides template
- if (info) {
- set_info(info);
- if (info->modelname().size()) {
- set_modelname(info->modelname());
+ if (weapon) {
+ set_info(weapon);
+ if (weapon->modelname().size()) {
+ set_modelname(weapon->modelname());
}
- set_name(info->name());
- set_label(info->label());
+ set_name(weapon->name());
+ set_label(weapon->label());
+ set_damage(weapon->damage());
}
// radius fallback