Merge branch 'master' into another

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 @ 7bbade93

-Subproject commit 91b8bc4cf5e96a2e57fa43aa55f1377d8a3e3a64
+Subproject commit 7bbade934bcc2a439c6e13bfff76ae5cafd9c253

script @ 60098433

-Subproject commit b820812a1ffb14eeb0022b2336c0c8c93d856d5c
+Subproject commit 600984331ce6ea470ed7b0efb4e101ae8b42c29c

system.conf

@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4939
+pro_version = 4944
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi