[Scummvm-git-logs] scummvm master -> 89e543729e2f6f2831beeab0e8d62a3d2cfd4026

aquadran noreply at scummvm.org
Sun Sep 4 13:31:36 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
89e543729e WINTERMUTE: Restore original setting string


Commit: 89e543729e2f6f2831beeab0e8d62a3d2cfd4026
    https://github.com/scummvm/scummvm/commit/89e543729e2f6f2831beeab0e8d62a3d2cfd4026
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-09-04T15:31:29+02:00

Commit Message:
WINTERMUTE: Restore original setting string

Changed paths:
    engines/wintermute/base/gfx/xmodel.h


diff --git a/engines/wintermute/base/gfx/xmodel.h b/engines/wintermute/base/gfx/xmodel.h
index e2e615f17fd..ac9f61fcaa8 100644
--- a/engines/wintermute/base/gfx/xmodel.h
+++ b/engines/wintermute/base/gfx/xmodel.h
@@ -76,20 +76,14 @@ private:
 		XModelMatSprite(const char *matName, BaseSprite *sprite) {
 			_theora = nullptr;
 			_matName = nullptr;
-			uint32 size = strlen(matName);
-			_matName = new char[size + 1];
-			Common::copy(matName, matName + size, _matName);
-			_matName[size] = 0;
+			BaseUtils::setString(&_matName, matName);
 			_sprite = sprite;
 		}
 
 		XModelMatSprite(const char *matName, VideoTheoraPlayer *theora) {
 			_sprite = nullptr;
 			_matName = nullptr;
-			uint32 size = strlen(matName);
-			_matName = new char[size + 1];
-			Common::copy(matName, matName + size, _matName);
-			_matName[size] = 0;
+			BaseUtils::setString(&_matName, matName);
 			_theora = theora;
 		}
 




More information about the Scummvm-git-logs mailing list