Rename MSG_META_TAKE_SCREENSHOT_JPEG to MSG_META_TAKE_SCREENSHOT_PNG

bobtista · bobtista · commit de35e57df2bc · 2025-12-03T11:47:54.000-05:00
diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h
@@ -258,7 +258,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_END_PREFER_SELECTION,							///< The Shift key has been released.
 
 		MSG_META_TAKE_SCREENSHOT,										///< take JPEG screenshot (F12)
-		MSG_META_TAKE_SCREENSHOT_JPEG,							///< take PNG screenshot (CTRL+F12, lossless)
+		MSG_META_TAKE_SCREENSHOT_PNG,							///< take PNG screenshot (CTRL+F12, lossless)
 		MSG_META_ALL_CHEER,													///< Yay! :)
 		MSG_META_TOGGLE_ATTACKMOVE,									///< enter attack-move mode
 
diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -364,7 +364,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_END_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
-	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_JPEG)
+	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_PNG)
 	CASE_LABEL(MSG_META_ALL_CHEER)
 	CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
 	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -3422,7 +3422,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			break;
 		}
 
-		case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:
+		case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:
 		{
 			if (TheDisplay)
 				TheDisplay->takeScreenShot(SCREENSHOT_PNG);
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
@@ -163,7 +163,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "END_PREFER_SELECTION",											GameMessage::MSG_META_END_PREFER_SELECTION },
 
 	{ "TAKE_SCREENSHOT",													GameMessage::MSG_META_TAKE_SCREENSHOT },
-	{ "TAKE_SCREENSHOT_JPEG",											GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG },
+	{ "TAKE_SCREENSHOT_PNG",											GameMessage::MSG_META_TAKE_SCREENSHOT_PNG },
 	{ "ALL_CHEER",																GameMessage::MSG_META_ALL_CHEER },
 
 	{ "BEGIN_CAMERA_ROTATE_LEFT",									GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_LEFT },
@@ -823,7 +823,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 		}
 	}
 	{
-		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG);
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);
 		if (map->m_key == MK_NONE)
 		{
 			map->m_key = MK_F12;
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
@@ -258,7 +258,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_END_PREFER_SELECTION,							///< The Shift key has been released.
 
 		MSG_META_TAKE_SCREENSHOT,										///< take JPEG screenshot (F12)
-		MSG_META_TAKE_SCREENSHOT_JPEG,							///< take PNG screenshot (CTRL+F12, lossless)
+		MSG_META_TAKE_SCREENSHOT_PNG,							///< take PNG screenshot (CTRL+F12, lossless)
 		MSG_META_ALL_CHEER,													///< Yay! :)
 		MSG_META_TOGGLE_ATTACKMOVE,									///< enter attack-move mode
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -364,7 +364,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_END_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
-	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_JPEG)
+	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_PNG)
 	CASE_LABEL(MSG_META_ALL_CHEER)
 	CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
 	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -3755,7 +3755,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			break;
 		}
 
-		case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:
+		case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:
 		{
 			if (TheDisplay)
 				TheDisplay->takeScreenShot(SCREENSHOT_PNG);
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
@@ -171,7 +171,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "END_PREFER_SELECTION",											GameMessage::MSG_META_END_PREFER_SELECTION },
 
 	{ "TAKE_SCREENSHOT",													GameMessage::MSG_META_TAKE_SCREENSHOT },
-	{ "TAKE_SCREENSHOT_JPEG",											GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG },
+	{ "TAKE_SCREENSHOT_PNG",											GameMessage::MSG_META_TAKE_SCREENSHOT_PNG },
 	{ "ALL_CHEER",																GameMessage::MSG_META_ALL_CHEER },
 
 	{ "BEGIN_CAMERA_ROTATE_LEFT",									GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_LEFT },
@@ -881,7 +881,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 		}
 	}
 	{
-		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG);
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);
 		if (map->m_key == MK_NONE)
 		{
 			map->m_key = MK_F12;

Original file line number	Diff line number	Diff line change
`@@ -3422,7 +3422,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3422`	`3422`	`break;`
`3423`	`3423`	`}`
`3424`	`3424`
`3425`		`- case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:`
	`3425`	`+ case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:`
`3426`	`3426`	`{`
`3427`	`3427`	`if (TheDisplay)`
`3428`	`3428`	`TheDisplay->takeScreenShot(SCREENSHOT_PNG);`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =`
`163`	`163`	`{ "END_PREFER_SELECTION", GameMessage::MSG_META_END_PREFER_SELECTION },`
`164`	`164`
`165`	`165`	`{ "TAKE_SCREENSHOT", GameMessage::MSG_META_TAKE_SCREENSHOT },`
`166`		`- { "TAKE_SCREENSHOT_JPEG", GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG },`
	`166`	`+ { "TAKE_SCREENSHOT_PNG", GameMessage::MSG_META_TAKE_SCREENSHOT_PNG },`
`167`	`167`	`{ "ALL_CHEER", GameMessage::MSG_META_ALL_CHEER },`
`168`	`168`
`169`	`169`	`{ "BEGIN_CAMERA_ROTATE_LEFT", GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_LEFT },`
`@@ -823,7 +823,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)`
`823`	`823`	`}`
`824`	`824`	`}`
`825`	`825`	`{`
`826`		`- MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG);`
	`826`	`+ MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);`
`827`	`827`	`if (map->m_key == MK_NONE)`
`828`	`828`	`{`
`829`	`829`	`map->m_key = MK_F12;`
Original file line number	Diff line number	Diff line change
`@@ -3755,7 +3755,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3755`	`3755`	`break;`
`3756`	`3756`	`}`
`3757`	`3757`
`3758`		`- case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:`
	`3758`	`+ case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:`
`3759`	`3759`	`{`
`3760`	`3760`	`if (TheDisplay)`
`3761`	`3761`	`TheDisplay->takeScreenShot(SCREENSHOT_PNG);`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =`
`171`	`171`	`{ "END_PREFER_SELECTION", GameMessage::MSG_META_END_PREFER_SELECTION },`
`172`	`172`
`173`	`173`	`{ "TAKE_SCREENSHOT", GameMessage::MSG_META_TAKE_SCREENSHOT },`
`174`		`- { "TAKE_SCREENSHOT_JPEG", GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG },`
	`174`	`+ { "TAKE_SCREENSHOT_PNG", GameMessage::MSG_META_TAKE_SCREENSHOT_PNG },`
`175`	`175`	`{ "ALL_CHEER", GameMessage::MSG_META_ALL_CHEER },`
`176`	`176`
`177`	`177`	`{ "BEGIN_CAMERA_ROTATE_LEFT", GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_LEFT },`
`@@ -881,7 +881,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)`
`881`	`881`	`}`
`882`	`882`	`}`
`883`	`883`	`{`
`884`		`- MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG);`
	`884`	`+ MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);`
`885`	`885`	`if (map->m_key == MK_NONE)`
`886`	`886`	`{`
`887`	`887`	`map->m_key = MK_F12;`