From 0dc8422c95b2e6cac2e33aa1dcac52d12be6427a Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 8 Oct 2024 16:00:53 +0200 Subject: [PATCH] [godot] Remove superfluous GodotSpineExtension::_readFile impl --- .../spine_godot/GodotSpineExtension.cpp | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/spine-godot/spine_godot/GodotSpineExtension.cpp b/spine-godot/spine_godot/GodotSpineExtension.cpp index 2ca665e89..92f4f7170 100644 --- a/spine-godot/spine_godot/GodotSpineExtension.cpp +++ b/spine-godot/spine_godot/GodotSpineExtension.cpp @@ -31,15 +31,8 @@ #ifdef SPINE_GODOT_EXTENSION #include "SpineCommon.h" #include -#include #else #include "core/os/memory.h" -#include "core/version.h" -#if VERSION_MAJOR > 3 -#include "core/io/file_access.h" -#else -#include "core/os/file_access.h" -#endif #endif #include @@ -66,23 +59,5 @@ void GodotSpineExtension::_free(void *mem, const char *file, int line) { } char *GodotSpineExtension::_readFile(const spine::String &path, int *length) { - Error error; -#ifdef SPINE_GODOT_EXTENSION - // FIXME no error parameter! - auto res = FileAccess::get_file_as_bytes(String(path.buffer())); -#else -#if VERSION_MAJOR > 3 - auto res = FileAccess::get_file_as_bytes(String(path.buffer()), &error); -#else - auto res = FileAccess::get_file_as_array(String(path.buffer()), &error); -#endif - if (error != OK) { - if (length) *length = 0; - return NULL; - } -#endif - auto r = alloc(res.size(), __FILE__, __LINE__); - memcpy(r, res.ptr(), res.size()); - if (length) *length = res.size(); - return r; + return NULL; }