LuaRefactor: Fail safely if an ability script isn't found

topaz-next · Feb 2, 2021 · 1e500c7 · 1e500c7
1 parent fcae697
commit 1e500c7
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/map/lua/luautils.cpp b/src/map/lua/luautils.cpp
@@ -3212,21 +3212,20 @@ namespace luautils
             return 87;
         }
 
-        auto name = (const char*)PAbility->getName();
-
-        sol::function onAbilityCheck;
+        std::string filename;
         if (PAbility->isPetAbility())
         {
-            onAbilityCheck = lua["tpz"]["globals"]["abilities"]["pets"][name]["onAbilityCheck"];
+            filename = fmt::format("./scripts/globals/abilities/pets/{}.lua", PAbility->getName());
         }
         else
         {
-            onAbilityCheck = lua["tpz"]["globals"]["abilities"][name]["onAbilityCheck"];
+            filename = fmt::format("./scripts/globals/abilities/{}.lua", PAbility->getName());
         }
 
+        sol::function onAbilityCheck = GetCacheEntryFromFilename(filename)["onAbilityCheck"];
         if (!onAbilityCheck.valid())
         {
-            ShowWarning("luautils::onAbilityCheck\n");
+            ShowWarning("luautils::onAbilityCheck - Ability %s not found.\n", PAbility->getName());
             return 87;
         }
 
@@ -3258,9 +3257,9 @@ namespace luautils
     {
         TracyZoneScoped;
 
-        auto name     = (const char*)PMobSkill->getName();
+        std::string filename = fmt::format("./scripts/globals/abilities/pets/{}.lua", PMobSkill->getName());
 
-        auto onPetAbility = lua["tpz"]["globals"]["abilities"]["pets"][name]["onPetAbility"];
+        sol::function onPetAbility = GetCacheEntryFromFilename(filename)["onPetAbility"];
         if (!onPetAbility.valid())
         {
             return 0;
@@ -3302,18 +3301,17 @@ namespace luautils
     {
         TracyZoneScoped;
 
-        auto name = (const char*)PAbility->getName();
-
-        sol::function onUseAbility;
-        if (PUser->objtype == TYPE_PET)
+        std::string filename;
+        if (PAbility->isPetAbility())
         {
-            onUseAbility = lua["tpz"]["globals"]["abilities"]["pets"][name]["onUseAbility"];
+            filename = fmt::format("./scripts/globals/abilities/pets/{}.lua", PAbility->getName());
         }
         else
         {
-            onUseAbility = lua["tpz"]["globals"]["abilities"][name]["onUseAbility"];
+            filename = fmt::format("./scripts/globals/abilities/{}.lua", PAbility->getName());
         }
 
+        sol::function onUseAbility = GetCacheEntryFromFilename(filename)["onUseAbility"];
         if (!onUseAbility.valid())
         {
             ShowWarning("luautils::onUseAbility - Ability %s not found.\n", PAbility->getName());