Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle missing ship class/manufacturer

master
Robert Norris 2014-01-05 10:07:45 +11:00
parent ed11f430a7
commit e381013649
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/ui/StationView/ShipMarket.lua
View File

@ -39,6 +39,8 @@ local shipClassString = {
heavy_freighter = l.HEAVY_FREIGHTER,
heavy_passenger_shuttle = l.HEAVY_PASSENGER_SHUTTLE,
heavy_passenger_transport = l.HEAVY_PASSENGER_TRANSPORT,
unknown = "",
}
local shipTable =
@ -54,13 +56,13 @@ local shipInfo =
ui:Expand("VERTICAL")
local function shipClassIcon (shipClass)
return shipClass ~= ""
return shipClass ~= "unknown"
and ui:Image("icons/shipclass/"..shipClass..".png", { "PRESERVE_ASPECT" })
or ui:Margin(32)
end
local function manufacturerIcon (manufacturer)
return manufacturer ~= ""
return manufacturer ~= "unknown"
and ui:Image("icons/manufacturer/"..manufacturer..".png", { "PRESERVE_ASPECT" })
or ui:Margin(32)
end

4
src/ShipType.cpp
View File

@ -61,8 +61,8 @@ int _define_ship(lua_State *L, ShipType::Tag tag, std::vector<ShipType::Id> *lis
LuaTable t(L, -1);
s.name = t.Get("name", "");
s.shipClass = t.Get("ship_class", "");
s.manufacturer = t.Get("manufacturer", "");
s.shipClass = t.Get("ship_class", "unknown");
s.manufacturer = t.Get("manufacturer", "unknown");
s.modelName = t.Get("model", "");
s.cockpitName = t.Get("cockpit", "");