diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/guiEditBoxWithScrollbar.cpp | 2 | ||||
| -rw-r--r-- | src/script/cpp_api/s_env.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp index cf278a58e..4723437bd 100644 --- a/src/gui/guiEditBoxWithScrollbar.cpp +++ b/src/gui/guiEditBoxWithScrollbar.cpp @@ -743,7 +743,7 @@ void GUIEditBoxWithScrollBar::draw() if (m_passwordbox) { if (m_broken_text.size() != 1) { m_broken_text.clear(); - m_broken_text.push_back(core::stringw()); + m_broken_text.emplace_back(); } if (m_broken_text[0].size() != Text.size()){ m_broken_text[0] = Text; diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp index 170640ce0..c9b652096 100644 --- a/src/script/cpp_api/s_env.cpp +++ b/src/script/cpp_api/s_env.cpp @@ -116,12 +116,12 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env) while (lua_next(L, table)) { // key at index -2 and value at index -1 luaL_checktype(L, -1, LUA_TSTRING); - trigger_contents.push_back(lua_tostring(L, -1)); + trigger_contents.emplace_back(lua_tostring(L, -1)); // removes value, keeps key for next iteration lua_pop(L, 1); } } else if (lua_isstring(L, -1)) { - trigger_contents.push_back(lua_tostring(L, -1)); + trigger_contents.emplace_back(lua_tostring(L, -1)); } lua_pop(L, 1); @@ -133,12 +133,12 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env) while (lua_next(L, table)) { // key at index -2 and value at index -1 luaL_checktype(L, -1, LUA_TSTRING); - required_neighbors.push_back(lua_tostring(L, -1)); + required_neighbors.emplace_back(lua_tostring(L, -1)); // removes value, keeps key for next iteration lua_pop(L, 1); } } else if (lua_isstring(L, -1)) { - required_neighbors.push_back(lua_tostring(L, -1)); + required_neighbors.emplace_back(lua_tostring(L, -1)); } lua_pop(L, 1); |