diff options
| author | Jean-Patrick Guerrero <kilbith@users.noreply.github.com> | 2021-03-16 23:28:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 23:28:16 +0100 |
| commit | 285ba74723695c4b51192dac0e1e17c5d8f880db (patch) | |
| tree | 5b6147a093f28d01d7a6b9da40770e2c434b1641 /src/gui/guiFormSpecMenu.cpp | |
| parent | 66b5c086644ac18845731d6f3556d9e7cde4ee28 (diff) | |
| download | minetest-285ba74723695c4b51192dac0e1e17c5d8f880db.tar.gz minetest-285ba74723695c4b51192dac0e1e17c5d8f880db.tar.bz2 minetest-285ba74723695c4b51192dac0e1e17c5d8f880db.zip | |
GUIScene: Clear depth buffer + replace deprecated clearZBuffer calls
Diffstat (limited to 'src/gui/guiFormSpecMenu.cpp')
| -rw-r--r-- | src/gui/guiFormSpecMenu.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index 5aa6dc9ae..5d763a4be 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -2746,7 +2746,7 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element) { std::vector<std::string> parts = split(element, ';'); - if (parts.size() < 5 || (parts.size() > 9 && + if (parts.size() < 5 || (parts.size() > 10 && m_formspec_version <= FORMSPEC_API_VERSION)) { errorstream << "Invalid model element (" << parts.size() << "): '" << element << "'" << std::endl; @@ -2766,6 +2766,7 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element) bool inf_rotation = is_yes(parts[6]); bool mousectrl = is_yes(parts[7]) || parts[7].empty(); // default true std::vector<std::string> frame_loop = split(parts[8], ','); + std::string speed = unescape_string(parts[9]); MY_CHECKPOS("model", 0); MY_CHECKGEOM("model", 1); @@ -2825,6 +2826,7 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element) } e->setFrameLoop(frame_loop_begin, frame_loop_end); + e->setAnimationSpeed(stof(speed)); auto style = getStyleForElement("model", spec.fname); e->setStyles(style); |