[Scummvm-git-logs] scummvm master -> b87b6ee4453d9fb3dab3ce5ad0c598d99fa0e1c2

[aquadran]

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:
b87b6ee445 WINTERMUTE: Fixed setting string


Commit: b87b6ee4453d9fb3dab3ce5ad0c598d99fa0e1c2
    https://github.com/scummvm/scummvm/commit/b87b6ee4453d9fb3dab3ce5ad0c598d99fa0e1c2
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-09-03T06:07:50+02:00

Commit Message:
WINTERMUTE: Fixed setting string

Changed paths:
    engines/wintermute/base/base_string_table.cpp
    engines/wintermute/base/gfx/xanimation_set.h


diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp
index f547e72e353..77ad7c9d070 100644
--- a/engines/wintermute/base/base_string_table.cpp
+++ b/engines/wintermute/base/base_string_table.cpp
@@ -148,7 +148,7 @@ void BaseStringTable::expand(char **str) const {
 
 //////////////////////////////////////////////////////////////////////////
 void BaseStringTable::expand(Common::String &str) const {
-	char *tmp = new char[str.size()+1];
+	char *tmp = new char[str.size() + 1];
 	strcpy(tmp, str.c_str());
 	expand(&tmp);
 	str = tmp;
diff --git a/engines/wintermute/base/gfx/xanimation_set.h b/engines/wintermute/base/gfx/xanimation_set.h
index e611e5479d9..54e5b5db314 100644
--- a/engines/wintermute/base/gfx/xanimation_set.h
+++ b/engines/wintermute/base/gfx/xanimation_set.h
@@ -31,6 +31,7 @@
 #include "engines/wintermute/base/base_named_object.h"
 #include "engines/wintermute/base/gfx/xanimation.h"
 #include "engines/wintermute/base/gfx/xframe_node.h"
+#include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/persistent.h"
 
@@ -54,9 +55,7 @@ public:
 
 		AnimationEvent(char *name, int frame) {
 			_eventName = nullptr;
-			int size = strlen(name);
-			_eventName = new char[size];
-			Common::copy(name, name + size, _eventName);
+			BaseUtils::setString(&_eventName, name);
 			_frame = frame;
 		}