From 2c98d3eef488233b99a76ca44d69c1c9d53404af Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 7 Dec 2014 16:12:49 +0000 Subject: 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. --- src/game/base/weapon.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game/base/weapon.h') 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; } } -- cgit v1.2.3