From bc1888ff21d50eb21c8f4d381e5dcc8049f7e36c Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Wed, 28 Apr 2021 09:55:51 +0200 Subject: [PATCH] fix: drop old irrlicht <1.8 compat on Client::loadMedia --- src/client/client.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index 0486bc0a9..5db0b8f5d 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -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 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.");