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>2014-12-07 16:12:49 +0000
committerStijn Buys <ingar@osirion.org>2014-12-07 16:12:49 +0000
commit2c98d3eef488233b99a76ca44d69c1c9d53404af (patch)
tree9259bad9533d1de7381b291eee19fd319b8366eb /src/game/base/weapon.h
parentacb236d0df275394095ab43e8519aebc4811865d (diff)
Cleanup of the slots code, unified model weapon and dock tags into a single slots list,
load dock tags into entity slots, represent entity slot locations in entity coordinate space, have r_slots render fixed-size slot indicators regardless of model scale.
Diffstat (limited to 'src/game/base/weapon.h')
-rw-r--r--src/game/base/weapon.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/base/weapon.h b/src/game/base/weapon.h
index a6a5731..857b3cd 100644
--- a/src/game/base/weapon.h
+++ b/src/game/base/weapon.h
@@ -88,17 +88,17 @@ public:
return weapon_projectile_soundname;
}
- inline const model::Weapon::Type slot_type() const
+ inline const model::Slot::Type slot_type() const
{
switch (weapon_subtype) {
case Cannon:
- return model::Weapon::Cannon;
+ return model::Slot::Cannon;
break;
case Turret:
- return model::Weapon::Turret;
+ return model::Slot::Turret;
break;
default:
- return model::Weapon::Unmountable;
+ return model::Slot::None;
}
}