mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9028] Better error output for ACHIEVEMENT_CRITERIA_REQUIRE_INSTANCE_SCRIPT.

Browse source
This commit is contained in:
VladimirMangos 2009-12-19 21:59:05 +03:00
parent ff229af00a
commit da3f340e14
4 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/AchievementMgr.cpp
View file

@ -319,10 +319,18 @@ bool AchievementCriteriaRequirement::Meets(uint32 criteria_id, Player const* sou
return false; return false;
Map* map = source->GetMap(); Map* map = source->GetMap();
if (!map->Instanceable()) 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(); InstanceData* data = ((InstanceMap*)map)->GetInstanceData();
if (!data) 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 false;
}
return data->CheckAchievementCriteriaMeet(criteria_id, source, target, miscvalue1); return data->CheckAchievementCriteriaMeet(criteria_id, source, target, miscvalue1);
} }
return false; return false;

8
src/game/InstanceData.cpp
View file

@ -19,6 +19,7 @@
#include "InstanceData.h" #include "InstanceData.h"
#include "Database/DatabaseEnv.h" #include "Database/DatabaseEnv.h"
#include "Map.h" #include "Map.h"
#include "Log.h"
void InstanceData::SaveToDB() void InstanceData::SaveToDB()
{ {
@ -27,3 +28,10 @@ void InstanceData::SaveToDB()
CharacterDatabase.escape_string(data); CharacterDatabase.escape_string(data);
CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%d'", data.c_str(), instance->GetInstanceId()); 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;
}

5
src/game/InstanceData.h
View file

@ -73,9 +73,6 @@ class MANGOS_DLL_SPEC InstanceData
// Achievement criteria additional requirements check // Achievement criteria additional requirements check
// NOTE: not use this if same can be checked existed requirement types from AchievementCriteriaRequirementType // 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) virtual bool CheckAchievementCriteriaMeet(uint32 /*criteria_id*/, Player const* /*source*/, Unit const* /*target*/ = NULL, uint32 /*miscvalue1*/ = 0);
{
return false;
}
}; };
#endif #endif

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9027" #define REVISION_NR "9028"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__