BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

fix: drop old irrlicht <1.8 compat on Client::loadMedia

Browse Source
This commit is contained in:
Loic Blot 2021-04-28 09:55:51 +02:00 committed by Loïc Blot
parent 83a7b48bb1
commit bc1888ff21
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/client.cpp
View File

@ -663,15 +663,8 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
io::IFileSystem *irrfs = RenderingEngine::get_filesystem(); io::IFileSystem *irrfs = RenderingEngine::get_filesystem();
video::IVideoDriver *vdrv = RenderingEngine::get_video_driver(); video::IVideoDriver *vdrv = RenderingEngine::get_video_driver();
#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
io::IReadFile *rfile = irrfs->createMemoryReadFile( io::IReadFile *rfile = irrfs->createMemoryReadFile(
data.c_str(), data.size(), "_tempreadfile"); data.c_str(), data.size(), "_tempreadfile");
#else
// Silly irrlicht's const-incorrectness
Buffer<char> data_rw(data.c_str(), data.size());
io::IReadFile *rfile = irrfs->createMemoryReadFile(
*data_rw, data_rw.getSize(), "_tempreadfile");
#endif
FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file."); FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file.");