Merge branch '8300_create_arrows_bolts' into 'master'

Lua: Allow creating arrows and bolt records (#8300) See merge request OpenMW/openmw!4514
OpenMW · Jan 13, 2025 · 7d47b22 · 7d47b22
2 parents 6ea3d11 + ffedd62
commit 7d47b22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 49)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 69)
+set(OPENMW_LUA_API_REVISION 70)
 set(OPENMW_POSTPROCESSING_API_REVISION 2)
 
 set(OPENMW_VERSION_COMMITHASH "")

diff --git a/apps/openmw/mwlua/types/weapon.cpp b/apps/openmw/mwlua/types/weapon.cpp
@@ -63,7 +63,7 @@ namespace
         if (rec["type"] != sol::nil)
         {
             int weaponType = rec["type"].get<int>();
-            if (weaponType >= 0 && weaponType <= ESM::Weapon::MarksmanThrown)
+            if (weaponType >= 0 && weaponType <= ESM::Weapon::Last)
                 weapon.mData.mType = weaponType;
             else
                 throw std::runtime_error("Invalid Weapon Type provided: " + std::to_string(weaponType));