]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
fix: drop old irrlicht <1.8 compat on Client::loadMedia
authorLoic Blot <loic.blot@unix-experience.fr>
Wed, 28 Apr 2021 07:55:51 +0000 (09:55 +0200)
committerLoïc Blot <nerzhul@users.noreply.github.com>
Mon, 3 May 2021 17:49:19 +0000 (19:49 +0200)
src/client/client.cpp

index 0486bc0a91534e015369ede88815265c1a046399..5db0b8f5dd789ff13ae36bf30107c4a905bd368a 100644 (file)
@@ -663,15 +663,8 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
                io::IFileSystem *irrfs = RenderingEngine::get_filesystem();
                video::IVideoDriver *vdrv = RenderingEngine::get_video_driver();
 
-#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
                io::IReadFile *rfile = irrfs->createMemoryReadFile(
                                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.");