Merge branch 'blanknoms' into 'master'

Unconditionally blank ingredient data before conditionally assigning new values

Closes #9130

See merge request OpenMW/openmw!5471

Author: Assumeru

CMakeLists.txt

@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 52)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 145)
+set(OPENMW_LUA_API_REVISION 146)
 set(OPENMW_POSTPROCESSING_API_REVISION 5)
 
 set(OPENMW_VERSION_COMMITHASH "")

apps/openmw/mwlua/types/ingredient.cpp

@@ -109,9 +109,8 @@ namespace MWLua
                             const size_t length = table.size();
                             for (uint32_t i = 0; i < numEffects; ++i)
                             {
-                                if (i >= length)
-                                    blankIndex(ingred.mData, i);
-                                else
+                                blankIndex(ingred.mData, i);
+                                if (i < length)
                                     setFromTable(ingred.mData, i, table[LuaUtil::toLuaIndex(i)]);
                             }
                         }
@@ -134,9 +133,8 @@ namespace MWLua
                           if (i == 0 || i > numEffects)
                               throw std::runtime_error("index out of range");
                           --i;
-                          if (value == sol::nil)
-                              blankIndex(ingred.mData, i);
-                          else
+                          blankIndex(ingred.mData, i);
+                          if (value != sol::nil)
                               setFromTable(ingred.mData, i, value.as<sol::lua_table>());
                       };
                 listType[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
@@ -214,9 +212,8 @@ namespace MWLua
             const size_t length = effects.size();
             for (uint32_t i = 0; i < numEffects; ++i)
             {
-                if (i >= length)
-                    blankIndex(ingred.mData, i);
-                else
+                blankIndex(ingred.mData, i);
+                if (i < length)
                     setFromTable(ingred.mData, i, effects[LuaUtil::toLuaIndex(i)]);
             }
         }