Merge branch 'master' into server

gframe/image_manager.cpp

@@ -273,7 +273,7 @@ void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) {
 			dest->setPixel(dx, dy, pxl);
 		}
 }
-irr::video::ITexture* ImageManager::GetTextureFromFile(char* file, s32 width, s32 height) {
+irr::video::ITexture* ImageManager::GetTextureFromFile(const char* file, s32 width, s32 height) {
 	if(mainGame->gameConf.use_image_scale) {
 		irr::video::ITexture* texture;
 		irr::video::IImage* srcimg = driver->createImageFromFile(file);

gframe/image_manager.h

@@ -21,7 +21,7 @@ public:
 	void ClearTexture();
 	void RemoveTexture(int code);
 	void ResizeTexture();
-	irr::video::ITexture* GetTextureFromFile(char* file, s32 width, s32 height);
+	irr::video::ITexture* GetTextureFromFile(const char* file, s32 width, s32 height);
 	irr::video::ITexture* GetTexture(int code, bool fit = false);
 	irr::video::ITexture* GetTextureThumb(int code);
 	irr::video::ITexture* GetTextureField(int code);

ocgcore @ f8cb041e

-Subproject commit 2e8d7994aee6ae0029f1cf185945d9fae52e2923
+Subproject commit f8cb041e51cefe3504c574a28b988910a94dc077

script @ 60098433

-Subproject commit bf17a54db18da02031c4d6d47cd7d48236a6490f
+Subproject commit 600984331ce6ea470ed7b0efb4e101ae8b42c29c