[Scummvm-git-logs] scummvm master -> 2e9819ad4e88552eaf26fd7a34f5db6c147686fd

tag2015 noreply at scummvm.org
Fri Feb 24 20:15:21 UTC 2023


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:
2e9819ad4e AGS: Fix some overzealous renames


Commit: 2e9819ad4e88552eaf26fd7a34f5db6c147686fd
    https://github.com/scummvm/scummvm/commit/2e9819ad4e88552eaf26fd7a34f5db6c147686fd
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-02-24T21:13:17+01:00

Commit Message:
AGS: Fix some overzealous renames

_GP(game) -> game

Changed paths:
    engines/ags/engine/ac/room.cpp
    engines/ags/engine/game/savegame.cpp
    engines/ags/engine/main/game_run.cpp
    engines/ags/engine/main/game_start.cpp
    engines/ags/shared/api/stream_api.h
    engines/ags/shared/game/room_struct.h


diff --git a/engines/ags/engine/ac/room.cpp b/engines/ags/engine/ac/room.cpp
index d4b020a32a9..f75527e8133 100644
--- a/engines/ags/engine/ac/room.cpp
+++ b/engines/ags/engine/ac/room.cpp
@@ -440,7 +440,7 @@ void load_new_room(int newnum, CharacterInfo *forchar) {
 
 	if ((_GP(thisroom).GameID != NO_GAME_ID_IN_ROOM_FILE) &&
 	        (_GP(thisroom).GameID != _GP(game).uniqueid)) {
-		quitprintf("!Unable to load '%s'. This room file is assigned to a different _GP(game).", room_filename.GetCStr());
+		quitprintf("!Unable to load '%s'. This room file is assigned to a different game.", room_filename.GetCStr());
 	}
 
 	HError err = LoadRoomScript(&_GP(thisroom), newnum);
diff --git a/engines/ags/engine/game/savegame.cpp b/engines/ags/engine/game/savegame.cpp
index 63c69626c34..69c9b6ed958 100644
--- a/engines/ags/engine/game/savegame.cpp
+++ b/engines/ags/engine/game/savegame.cpp
@@ -125,7 +125,7 @@ String GetSavegameErrorText(SavegameErrorType err) {
 	case kSvgErr_IncompatibleEngine:
 		return "Save was written by incompatible engine, or file is corrupted.";
 	case kSvgErr_GameGuidMismatch:
-		return "Game GUID does not match, saved by a different _GP(game).";
+		return "Game GUID does not match, saved by a different game.";
 	case kSvgErr_ComponentListOpeningTagFormat:
 		return "Failed to parse opening tag of the components list.";
 	case kSvgErr_ComponentListClosingTagMissing:
diff --git a/engines/ags/engine/main/game_run.cpp b/engines/ags/engine/main/game_run.cpp
index d142eea182f..7155b9bdc7a 100644
--- a/engines/ags/engine/main/game_run.cpp
+++ b/engines/ags/engine/main/game_run.cpp
@@ -1028,7 +1028,7 @@ void GameLoopUntilButAnimEnd(int guin, int objn) {
 }
 
 void RunGameUntilAborted() {
-	// skip ticks to account for time spent starting _GP(game).
+	// skip ticks to account for time spent starting game.
 	skipMissedTicks();
 
 	while (!_G(abort_engine)) {
diff --git a/engines/ags/engine/main/game_start.cpp b/engines/ags/engine/main/game_start.cpp
index 63ec5b344e2..3e2a444e12f 100644
--- a/engines/ags/engine/main/game_start.cpp
+++ b/engines/ags/engine/main/game_start.cpp
@@ -86,7 +86,7 @@ void start_game() {
 
 	_G(our_eip) = -42;
 
-	// skip ticks to account for initialisation or a restored _GP(game).
+	// skip ticks to account for initialisation or a restored game.
 	skipMissedTicks();
 
 	RunScriptFunctionInModules("game_start");
diff --git a/engines/ags/shared/api/stream_api.h b/engines/ags/shared/api/stream_api.h
index 9fc11ef9611..9230725cd3d 100644
--- a/engines/ags/shared/api/stream_api.h
+++ b/engines/ags/shared/api/stream_api.h
@@ -24,7 +24,7 @@
 //=============================================================================
 //
 // IAGSStream is a contract for stream class, provided by engine to plugin
-// on the need, such as saving/restoring the _GP(game).
+// on the need, such as saving/restoring the game.
 // The user is advised to use advanced helper methods, such as Read/WriteX
 // and Read/WriteArrayOfX to allow the stream implementation properly control
 // endianness conversions and data padding, when needed.
diff --git a/engines/ags/shared/game/room_struct.h b/engines/ags/shared/game/room_struct.h
index 5d70390aa10..2125751a1c0 100644
--- a/engines/ags/shared/game/room_struct.h
+++ b/engines/ags/shared/game/room_struct.h
@@ -316,7 +316,7 @@ public:
 	// Game's unique ID, corresponds to GameSetupStructBase::uniqueid.
 	// If this field has a valid value and does not match actual game's id,
 	// then engine will refuse to start this room.
-	// May be set to NO_GAME_ID_IN_ROOM_FILE to let it run within any _GP(game).
+	// May be set to NO_GAME_ID_IN_ROOM_FILE to let it run within any game.
 	int32_t                 GameID;
 	// Loaded room file's data version. This value may be used to know when
 	// the room must have behavior specific to certain version of AGS.




More information about the Scummvm-git-logs mailing list