diff options
| author | Dániel Juhász <juhdanad@gmail.com> | 2017-08-25 11:20:53 +0000 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-25 13:20:53 +0200 |
| commit | f6a33a1a7a298cb7d3fb18818bae97bd1b89d633 (patch) | |
| tree | 7bc7689e33895e5a6084129484f679caaed1cfc0 /src/itemdef.cpp | |
| parent | 6761e213836e902359c5d0acff277623dc3e1588 (diff) | |
| download | minetest-f6a33a1a7a298cb7d3fb18818bae97bd1b89d633.tar.gz minetest-f6a33a1a7a298cb7d3fb18818bae97bd1b89d633.tar.bz2 minetest-f6a33a1a7a298cb7d3fb18818bae97bd1b89d633.zip | |
Overlays for wield and inventory images (#6107)
* Overlays for wield and inventory images
Diffstat (limited to 'src/itemdef.cpp')
| -rw-r--r-- | src/itemdef.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 5ad976450..3d8116bf6 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -67,7 +67,9 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) name = def.name; description = def.description; inventory_image = def.inventory_image; + inventory_overlay = def.inventory_overlay; wield_image = def.wield_image; + wield_overlay = def.wield_overlay; wield_scale = def.wield_scale; stack_max = def.stack_max; usable = def.usable; @@ -105,7 +107,9 @@ void ItemDefinition::reset() name = ""; description = ""; inventory_image = ""; + inventory_overlay = ""; wield_image = ""; + wield_overlay = ""; palette_image = ""; color = video::SColor(0xFFFFFFFF); wield_scale = v3f(1.0, 1.0, 1.0); @@ -159,6 +163,8 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const if (version >= 4) { writeF1000(os, sound_place.pitch); writeF1000(os, sound_place_failed.pitch); + os << serializeString(inventory_overlay); + os << serializeString(wield_overlay); } } @@ -222,6 +228,8 @@ void ItemDefinition::deSerialize(std::istream &is) if (version >= 4) { sound_place.pitch = readF1000(is); sound_place_failed.pitch = readF1000(is); + inventory_overlay = deSerializeString(is); + wield_overlay = deSerializeString(is); } } catch(SerializationError &e) {}; } |