[9028] Better error output for ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_…

…SCRIPT.
mangos · Dec 19, 2009 · 9603034 · 9603034
1 parent a765381
commit 9603034
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
@@ -319,10 +319,18 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou
                 return false;
             Map* map = source->GetMap();
             if (!map->Instanceable())
-                return false;
+            {
+                sLog.outErrorDb("Achievement system call ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT (%u) for achievement criteria %u for non-instance map %u",
+                    ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT, criteria_id, map->GetId());
+                    return false;
+            }
             InstanceData* data = ((InstanceMap*)map)->GetInstanceData();
             if (!data)
+            {
+                sLog.outErrorDb("Achievement system call ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT (%u) for achievement criteria %u for map %u but map not have instance script",
+                    ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT, criteria_id, map->GetId());
                 return false;
+            }
             return data->CheckAchievementCriteriaMeet(criteria_id, source, target, miscvalue1);
     }
     return false;

diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp
@@ -19,6 +19,7 @@
 #include "InstanceData.h"
 #include "Database/DatabaseEnv.h"
 #include "Map.h"
+#include "Log.h"
 
 void InstanceData::SaveToDB()
 {
@@ -27,3 +28,10 @@ void InstanceData::SaveToDB()
     CharacterDatabase.escape_string(data);
     CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%d'", data.c_str(), instance->GetInstanceId());
 }
+
+bool InstanceData::CheckAchievementCriteriaMeet( uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/ /*= NULL*/, uint32 /*miscvalue1*/ /*= 0*/ )
+{
+    sLog.outError("Achievement system call InstanceData::CheckAchievementCriteriaMeet but instance script for map %u not have implementation for achievement criteria %u",
+        instance->GetId(),criteria_id);
+    return false;
+}
diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h
@@ -73,9 +73,6 @@ class MANGOS_DLL_SPEC InstanceData
 
         // Achievement criteria additional requirements check
         // NOTE: not use this if same can be checked existed requirement types from AchievementCriteriaRequirementType
-        virtual bool CheckAchievementCriteriaMeet(uint32 /*criteria_id*/, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0)
-        {
-            return false;
-        }
+        virtual bool CheckAchievementCriteriaMeet(uint32 /*criteria_id*/, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0);
 };
 #endif
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9027"
+ #define REVISION_NR "9028"
 #endif // __REVISION_NR_H__