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

[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:
b080b83fdb AGS: Removal of _GP macros from strings they shouldn't be in


Commit: b080b83fdb93e5f02cfab1cf49f4567ca9a26a33
    https://github.com/scummvm/scummvm/commit/b080b83fdb93e5f02cfab1cf49f4567ca9a26a33
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-06-27T18:30:31-07:00

Commit Message:
AGS: Removal of _GP macros from strings they shouldn't be in

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


diff --git a/engines/ags/engine/game/savegame.cpp b/engines/ags/engine/game/savegame.cpp
index fbb81ebe93..3875852c1c 100644
--- a/engines/ags/engine/game/savegame.cpp
+++ b/engines/ags/engine/game/savegame.cpp
@@ -147,7 +147,7 @@ String GetSavegameErrorText(SavegameErrorType err) {
 	case kSvgErr_UnsupportedComponentVersion:
 		return "Component data version not supported.";
 	case kSvgErr_GameContentAssertion:
-		return "Saved content does not match current _GP(game).";
+		return "Saved content does not match current game.";
 	case kSvgErr_InconsistentData:
 		return "Inconsistent save data, or file is corrupted.";
 	case kSvgErr_InconsistentPlugin:
diff --git a/engines/ags/engine/game/savegame_components.cpp b/engines/ags/engine/game/savegame_components.cpp
index 33876b636a..70381ca57b 100644
--- a/engines/ags/engine/game/savegame_components.cpp
+++ b/engines/ags/engine/game/savegame_components.cpp
@@ -914,7 +914,7 @@ HSaveError WriteThisRoom(Stream *out) {
 	// persistent room's indicator
 	const bool persist = _G(displayed_room) < MAX_ROOMS;
 	out->WriteBool(persist);
-	// write the current _GP(troom) state, in case they save in temporary room
+	// write the current troom state, in case they save in temporary room
 	if (!persist)
 		_GP(troom).WriteToSavegame(out);
 	return HSaveError::None();
@@ -960,7 +960,7 @@ HSaveError ReadThisRoom(Stream *in, int32_t cmp_ver, const PreservedParams &pp,
 	// save the new room music vol for later use
 	r_data.RoomVolume = (RoomVolumeMod)in->ReadInt32();
 
-	// read the current _GP(troom) state, in case they saved in temporary room
+	// read the current troom state, in case they saved in temporary room
 	if (!in->ReadBool())
 		_GP(troom).ReadFromSavegame(in);
 
diff --git a/engines/ags/engine/game/savegame_v321.cpp b/engines/ags/engine/game/savegame_v321.cpp
index 611437a513..536f4fcee5 100644
--- a/engines/ags/engine/game/savegame_v321.cpp
+++ b/engines/ags/engine/game/savegame_v321.cpp
@@ -316,7 +316,7 @@ static void restore_game_displayed_room_status(Stream *in, RestoredData &r_data)
 		if (bb)
 			_G(raw_saved_screen) = read_serialized_bitmap(in);
 
-		// get the current _GP(troom), in case they save in room 600 or whatever
+		// get the current troom, in case they save in room 600 or whatever
 		ReadRoomStatus_Aligned(&_GP(troom), in);
 
 		if (_GP(troom).tsdatasize > 0) {