diff --git a/Source/Client/Mode/ModeDragState.cpp b/Source/Client/Mode/ModeDragState.cpp index 515e474dc..940b198c1 100644 --- a/Source/Client/Mode/ModeDragState.cpp +++ b/Source/Client/Mode/ModeDragState.cpp @@ -76,7 +76,7 @@ void ModeDragState::BeginSkill( this->source = sourceValue; this->id = idValue; this->identified = 0; - this->resource = SkillDragResource(resources, nameValue); + this->resource = SkillDragResource(nameValue); this->name = nameValue; this->skillName = nameValue; this->skillLevel = level; diff --git a/Source/Contents/Items/ItemResources.cpp b/Source/Contents/Items/ItemResources.cpp index 1e8a752a7..72587fe51 100644 --- a/Source/Contents/Items/ItemResources.cpp +++ b/Source/Contents/Items/ItemResources.cpp @@ -30,12 +30,12 @@ const char* CSession::ItemDragResource(const char* id, int identified) { // OFFSET: 0x00DDDCD0 // FUNCTION: fn_23392 -const char* SkillDragResource(ResourceMgr& resources, const char* name) { +const char* SkillDragResource(const char* name) { static std::string resource; resource = "아이템\\"; resource += name; - if (!resources.Exists((resource + ".act").c_str())) { + if (!ResourceMgr::Instance().Exists((resource + ".act").c_str())) { resource = "아이템\\am_berserkpitcher"; } diff --git a/Source/Contents/Items/ItemResources.h b/Source/Contents/Items/ItemResources.h index 2c17f6dfe..670648154 100644 --- a/Source/Contents/Items/ItemResources.h +++ b/Source/Contents/Items/ItemResources.h @@ -1,8 +1,6 @@ #ifndef RAGNAROK_SOURCE_CONTENTS_ITEMS_ITEMRESOURCES_H #define RAGNAROK_SOURCE_CONTENTS_ITEMS_ITEMRESOURCES_H -class ResourceMgr; - -const char* SkillDragResource(ResourceMgr& resources, const char* name); +const char* SkillDragResource(const char* name); #endif diff --git a/Source/Linkage/Source/Contents/Items/ItemResources.cpp.h b/Source/Linkage/Source/Contents/Items/ItemResources.cpp.h new file mode 100644 index 000000000..a993f0b25 --- /dev/null +++ b/Source/Linkage/Source/Contents/Items/ItemResources.cpp.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +extern template std::string std::operator+(const std::string&, const char* const);