diff options
| author | unknown <gregory.currie@gmail.com> | 2014-12-18 23:25:36 +1100 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2014-12-21 02:41:17 +1000 |
| commit | 1e8e700ee645fa642e868c79c2717c82d3509f55 (patch) | |
| tree | cce5e4aa931cf593d6252e88d786a0a9ef304559 /src/wieldmesh.cpp | |
| parent | 0d55f43977080435c6e67a2851fb343dc65e153c (diff) | |
| download | minetest-1e8e700ee645fa642e868c79c2717c82d3509f55.tar.gz minetest-1e8e700ee645fa642e868c79c2717c82d3509f55.tar.bz2 minetest-1e8e700ee645fa642e868c79c2717c82d3509f55.zip | |
Change TileSpec::frames to be std::vector not std::map
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
Diffstat (limited to 'src/wieldmesh.cpp')
| -rw-r--r-- | src/wieldmesh.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp index 66793249a..2a69bb2a0 100644 --- a/src/wieldmesh.cpp +++ b/src/wieldmesh.cpp @@ -252,7 +252,7 @@ void WieldMeshSceneNode::setCube(const TileSpec tiles[6], if (tiles[i].animation_frame_count == 1) { material.setTexture(0, tiles[i].texture); } else { - FrameSpec animation_frame = tiles[i].frames.find(0)->second; + FrameSpec animation_frame = tiles[i].frames[0]; material.setTexture(0, animation_frame.texture); } tiles[i].applyMaterialOptions(material); @@ -351,7 +351,7 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, IGameDef *gamedef) material.setFlag(video::EMF_TRILINEAR_FILTER, m_trilinear_filter); bool animated = (f.tiles[i].animation_frame_count > 1); if (animated) { - FrameSpec animation_frame = f.tiles[i].frames.find(0)->second; + FrameSpec animation_frame = f.tiles[i].frames[0]; material.setTexture(0, animation_frame.texture); } else { material.setTexture(0, f.tiles[i].texture); @@ -360,7 +360,7 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, IGameDef *gamedef) if (m_enable_shaders) { if (f.tiles[i].normal_texture) { if (animated) { - FrameSpec animation_frame = f.tiles[i].frames.find(0)->second; + FrameSpec animation_frame = f.tiles[i].frames[0]; material.setTexture(1, animation_frame.normal_texture); } else { material.setTexture(1, f.tiles[i].normal_texture); |