Skip to content

Y
ygopro
Commit 4ad69896 authored by nanahira's avatar nanahira
Browse files
Options

format

parent 24a7fe00
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
gframe/image_manager.cpp
View file @ 4ad69896
...@@ -317,8 +317,7 @@ irr::video::ITexture* ImageManager::GetTextureFromFile(const char* file, irr::s3 ...@@ -317,8 +317,7 @@ irr::video::ITexture* ImageManager::GetTextureFromFile(const char* file, irr::s3
mysnprintf(name, "%s/%d_%d", file, width, height); mysnprintf(name, "%s/%d_%d", file, width, height);
return addTexture(name, img, width, height); return addTexture(name, img, width, height);
} }
void* ImageManager::LoadFromSearchPathsImpl(int code, const char* subpath, const std::vector<const char*>& extensions, void* ImageManager::LoadFromSearchPathsImpl(int code, const char* subpath, const std::vector<const char*>& extensions, void* (*callback)(void*, const char*), void* userdata) {
void* (*callback)(void*, const char*), void* userdata) {
// Build base path list // Build base path list
std::vector<std::string> basePaths; std::vector<std::string> basePaths;
for(auto ex : mainGame->GetExpansionsListU()) { for(auto ex : mainGame->GetExpansionsListU()) {
......
gframe/image_manager.h
View file @ 4ad69896
...@@ -14,8 +14,7 @@ private: ...@@ -14,8 +14,7 @@ private:
irr::video::ITexture* addTexture(const char* name, irr::video::IImage* srcimg, irr::s32 width, irr::s32 height); irr::video::ITexture* addTexture(const char* name, irr::video::IImage* srcimg, irr::s32 width, irr::s32 height);
// Internal implementation using void* for type erasure // Internal implementation using void* for type erasure
void* LoadFromSearchPathsImpl(int code, const char* subpath, const std::vector<const char*>& extensions, void* LoadFromSearchPathsImpl(int code, const char* subpath, const std::vector<const char*>& extensions, void* (*callback)(void*, const char*), void* userdata);
void* (*callback)(void*, const char*), void* userdata);
// Load file from search paths (expansions, locale, default) with callback // Load file from search paths (expansions, locale, default) with callback
template<typename Func> template<typename Func>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment