diff --git a/src/outfit.c b/src/outfit.c index 491ae1f..76f5f66 100644 --- a/src/outfit.c +++ b/src/outfit.c @@ -226,6 +226,8 @@ const char* outfit_typename[] = { "NULL", "Bolt Cannon", "Beam Cannon", + "Bolt Turret", + "Beam Turret", "Dumb Missile", "Dumb Missile Ammunition", "Seeker Missile", @@ -236,8 +238,6 @@ const char* outfit_typename[] = { "Swarm Missile Ammunition Pack", "Smart Swarm Missile", "Smart Swarm Missile Ammunition Pack", - "Bolt Turret", - "Beam Turret", "Ship Modification", "Afterburner", "Map" @@ -289,6 +289,8 @@ static DamageType outfit_strToDamageType(char* buf) { static OutfitType outfit_strToOutfitType(char* buf) { O_CMP("bolt", OUTFIT_TYPE_BOLT); O_CMP("beam", OUTFIT_TYPE_BEAM); + O_CMP("turret bolt", OUTFIT_TYPE_TURRET_BOLT); + O_CMP("turret beam", OUTFIT_TYPE_TURRET_BEAM); O_CMP("missile dumb", OUTFIT_TYPE_MISSILE_DUMB); O_CMP("missile dumb ammo", OUTFIT_TYPE_MISSILE_DUMB_AMMO); O_CMP("missile seek", OUTFIT_TYPE_MISSILE_SEEK); @@ -299,8 +301,6 @@ static OutfitType outfit_strToOutfitType(char* buf) { O_CMP("missile swarm ammo", OUTFIT_TYPE_MISSILE_SWARM_AMMO); O_CMP("missile swarm smart", OUTFIT_TYPE_MISSILE_SWARM_SMART); O_CMP("missile swarm smart ammo", OUTFIT_TYPE_MISSILE_SWARM_SMART_AMMO); - O_CMP("turret bolt", OUTFIT_TYPE_TURRET_BOLT); - O_CMP("turret beam", OUTFIT_TYPE_TURRET_BEAM); O_CMP("modification", OUTFIT_TYPE_MODIFICATION); O_CMP("afterburner", OUTFIT_TYPE_AFTERBURNER); O_CMP("map", OUTFIT_TYPE_MAP); diff --git a/src/outfit.h b/src/outfit.h index f4888fe..f76ad15 100644 --- a/src/outfit.h +++ b/src/outfit.h @@ -11,6 +11,8 @@ typedef enum OutfitType_ { OUTFIT_TYPE_NULL, OUTFIT_TYPE_BOLT, OUTFIT_TYPE_BEAM, + OUTFIT_TYPE_TURRET_BOLT, + OUTFIT_TYPE_TURRET_BEAM, OUTFIT_TYPE_MISSILE_DUMB, OUTFIT_TYPE_MISSILE_DUMB_AMMO, OUTFIT_TYPE_MISSILE_SEEK, @@ -21,8 +23,6 @@ typedef enum OutfitType_ { OUTFIT_TYPE_MISSILE_SWARM_AMMO, OUTFIT_TYPE_MISSILE_SWARM_SMART, OUTFIT_TYPE_MISSILE_SWARM_SMART_AMMO, - OUTFIT_TYPE_TURRET_BOLT, - OUTFIT_TYPE_TURRET_BEAM, OUTFIT_TYPE_MODIFICATION, OUTFIT_TYPE_AFTERBURNER, OUTFIT_TYPE_MAP,