Skip to content

Commit

Permalink
Use inventory_image in the first place for inventory item mesh
Browse files Browse the repository at this point in the history
  • Loading branch information
RealBadAngel authored and est31 committed Feb 8, 2016
1 parent b44da49 commit 38e7122
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/wieldmesh.cpp
Expand Up @@ -452,11 +452,8 @@ scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item)

scene::IMesh *mesh;

// If wield_image is defined, it overrides everything else
if (def.wield_image != "") {
mesh = getExtrudedMesh(tsrc, def.wield_image);
return mesh;
} else if (def.inventory_image != "") {
// If inventory_image is defined, it overrides everything else
if (def.inventory_image != "") {
mesh = getExtrudedMesh(tsrc, def.inventory_image);
return mesh;
} else if (def.type == ITEM_NODE) {
Expand Down

0 comments on commit 38e7122

Please sign in to comment.