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

[dreammaster]

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:
f39b0b9dbe AGS: Fix saving savegame components


Commit: f39b0b9dbeb77b86143148663bb99bf889370e4f
    https://github.com/scummvm/scummvm/commit/f39b0b9dbeb77b86143148663bb99bf889370e4f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-03-13T22:08:45-08:00

Commit Message:
AGS: Fix saving savegame components

Changed paths:
    engines/ags/engine/game/savegame_components.cpp


diff --git a/engines/ags/engine/game/savegame_components.cpp b/engines/ags/engine/game/savegame_components.cpp
index f3f3d191e3..f87b032243 100644
--- a/engines/ags/engine/game/savegame_components.cpp
+++ b/engines/ags/engine/game/savegame_components.cpp
@@ -1128,8 +1128,8 @@ static const ComponentHandler ComponentHandlers[] = {
 typedef std::map<String, ComponentHandler> HandlersMap;
 void GenerateHandlersMap(HandlersMap &map) {
 	map.clear();
-	for (int i = 0; !strlen(ComponentHandlers[i].Name); ++i)
-		map[String(ComponentHandlers[i].Name)] = ComponentHandlers[i];
+	for (int i = 0; ComponentHandlers[i].Name; ++i)
+		map[ComponentHandlers[i].Name] = ComponentHandlers[i];
 }
 
 // A helper struct to pass to (de)serialization handlers
@@ -1235,7 +1235,7 @@ HSaveError WriteComponent(PStream out, const ComponentHandler &hdlr) {
 
 HSaveError WriteAllCommon(PStream out) {
 	WriteFormatTag(out, ComponentListTag, true);
-	for (int type = 0; !strlen(ComponentHandlers[type].Name); ++type) {
+	for (int type = 0; ComponentHandlers[type].Name; ++type) {
 		HSaveError err = WriteComponent(out, ComponentHandlers[type]);
 		if (!err) {
 			return new SavegameError(kSvgErr_ComponentSerialization,