diff --git a/src/DivaGL/data_test/rob_osage_test.cpp b/src/DivaGL/data_test/rob_osage_test.cpp index e2ae276..96f1641 100644 --- a/src/DivaGL/data_test/rob_osage_test.cpp +++ b/src/DivaGL/data_test/rob_osage_test.cpp @@ -490,10 +490,10 @@ bool RobOsageTest::ctrl() { continue; objects.push_back((::item_id)i, itm_eq_obj->obj_info); - rob_osage_test_dw->rob.object_list_box->AddItem(object_database_get_object_name(itm_eq_obj->obj_info)); + rob_osage_test_dw->rob.object_list_box->AddItem(object_database_get_obj_name(itm_eq_obj->obj_info)); std::string buf = string_to_lower(sprintf_s_string( - "ext_skp_%s.txt", object_database_get_object_name(itm_eq_obj->obj_info))); + "ext_skp_%s.txt", object_database_get_obj_name(itm_eq_obj->obj_info))); std::string path("ram/skin_param/"); path.append(buf); @@ -672,7 +672,7 @@ bool RobOsageTest::ctrl() { path_create_directory("ram/skin_param/"); std::string buf = string_to_lower(sprintf_s_string( - "ext_skp_%s.txt", object_database_get_object_name(itm_eq_obj->obj_info))); + "ext_skp_%s.txt", object_database_get_obj_name(itm_eq_obj->obj_info))); prj::vector_pair_alloc ex_nodes; ex_nodes.reserve(itm_eq_obj->osage_blocks.size() + itm_eq_obj->cloth_blocks.size()); diff --git a/src/DivaGL/object.cpp b/src/DivaGL/object.cpp index 5341d74..e275996 100644 --- a/src/DivaGL/object.cpp +++ b/src/DivaGL/object.cpp @@ -55,7 +55,7 @@ obj_mesh* (FASTCALL* objset_info_storage_get_obj_mesh_by_index)(object_info obj_ = (obj_mesh * (FASTCALL*)(object_info obj_info, int32_t mesh_index))0x0000000140459D40; int32_t(FASTCALL* objset_info_storage_get_obj_mesh_index)(object_info obj_info, const char* mesh_name) = (int32_t(FASTCALL*)(object_info obj_info, const char* mesh_name))0x0000000140459DE0; -const char* (FASTCALL* object_database_get_object_name)(object_info obj_info) +const char* (FASTCALL* object_database_get_obj_name)(object_info obj_info) = (const char* (FASTCALL*)(object_info obj_info))0x0000000140459F20; uint32_t(FASTCALL* object_database_get_object_info)(const char* name) = (uint32_t(FASTCALL*)(const char* name))0x0000000140459F80; diff --git a/src/DivaGL/object.hpp b/src/DivaGL/object.hpp index 98107aa..3cfeaa3 100644 --- a/src/DivaGL/object.hpp +++ b/src/DivaGL/object.hpp @@ -585,7 +585,7 @@ static_assert(sizeof(obj_vertex_buffer) == 0x10, "\"obj_vertex_buffer\" struct s extern void (FASTCALL* objset_info_storage_unload_set)(int32_t set); extern obj_mesh* (FASTCALL* objset_info_storage_get_obj_mesh_by_index)(object_info obj_info, int32_t mesh_index); extern int32_t(FASTCALL* objset_info_storage_get_obj_mesh_index)(object_info obj_info, const char* mesh_name); -extern const char* (FASTCALL* object_database_get_object_name)(object_info obj_info); +extern const char* (FASTCALL* object_database_get_obj_name)(object_info obj_info); extern uint32_t(FASTCALL* object_database_get_object_info)(const char* name); extern obj* (FASTCALL* objset_info_storage_get_obj)(object_info obj_info); extern obj_mesh_index_buffer* (FASTCALL* objset_info_storage_get_obj_mesh_index_buffer)(object_info obj_info, int32_t a2);