Skip to content

Commit de35e57

Browse files
bobtistabobtista
committed
Rename MSG_META_TAKE_SCREENSHOT_JPEG to MSG_META_TAKE_SCREENSHOT_PNG
1 parent 999108f commit de35e57

8 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎Generals/Code/GameEngine/Include/Common/MessageStream.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class GameMessage : public MemoryPoolObject
258258
MSG_META_END_PREFER_SELECTION, ///< The Shift key has been released.
259259

260260
MSG_META_TAKE_SCREENSHOT, ///< take JPEG screenshot (F12)
261-
MSG_META_TAKE_SCREENSHOT_JPEG, ///< take PNG screenshot (CTRL+F12, lossless)
261+
MSG_META_TAKE_SCREENSHOT_PNG, ///< take PNG screenshot (CTRL+F12, lossless)
262262
MSG_META_ALL_CHEER, ///< Yay! :)
263263
MSG_META_TOGGLE_ATTACKMOVE, ///< enter attack-move mode
264264

‎Generals/Code/GameEngine/Source/Common/MessageStream.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
364364
CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
365365
CASE_LABEL(MSG_META_END_PREFER_SELECTION)
366366
CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
367-
CASE_LABEL(MSG_META_TAKE_SCREENSHOT_JPEG)
367+
CASE_LABEL(MSG_META_TAKE_SCREENSHOT_PNG)
368368
CASE_LABEL(MSG_META_ALL_CHEER)
369369
CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
370370
CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)

‎Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3422,7 +3422,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
34223422
break;
34233423
}
34243424

3425-
case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:
3425+
case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:
34263426
{
34273427
if (TheDisplay)
34283428
TheDisplay->takeScreenShot(SCREENSHOT_PNG);

‎Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
163163
{ "END_PREFER_SELECTION", GameMessage::MSG_META_END_PREFER_SELECTION },
164164

165165
{ "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 },
167167
{ "ALL_CHEER", GameMessage::MSG_META_ALL_CHEER },
168168

169169
{ "BEGIN_CAMERA_ROTATE_LEFT", GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_LEFT },
@@ -823,7 +823,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
823823
}
824824
}
825825
{
826-
MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG);
826+
MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);
827827
if (map->m_key == MK_NONE)
828828
{
829829
map->m_key = MK_F12;

‎GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class GameMessage : public MemoryPoolObject
258258
MSG_META_END_PREFER_SELECTION, ///< The Shift key has been released.
259259

260260
MSG_META_TAKE_SCREENSHOT, ///< take JPEG screenshot (F12)
261-
MSG_META_TAKE_SCREENSHOT_JPEG, ///< take PNG screenshot (CTRL+F12, lossless)
261+
MSG_META_TAKE_SCREENSHOT_PNG, ///< take PNG screenshot (CTRL+F12, lossless)
262262
MSG_META_ALL_CHEER, ///< Yay! :)
263263
MSG_META_TOGGLE_ATTACKMOVE, ///< enter attack-move mode
264264

‎GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
364364
CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
365365
CASE_LABEL(MSG_META_END_PREFER_SELECTION)
366366
CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
367-
CASE_LABEL(MSG_META_TAKE_SCREENSHOT_JPEG)
367+
CASE_LABEL(MSG_META_TAKE_SCREENSHOT_PNG)
368368
CASE_LABEL(MSG_META_ALL_CHEER)
369369
CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
370370
CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)

‎GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3755,7 +3755,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
37553755
break;
37563756
}
37573757

3758-
case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:
3758+
case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:
37593759
{
37603760
if (TheDisplay)
37613761
TheDisplay->takeScreenShot(SCREENSHOT_PNG);

‎GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
171171
{ "END_PREFER_SELECTION", GameMessage::MSG_META_END_PREFER_SELECTION },
172172

173173
{ "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 },
175175
{ "ALL_CHEER", GameMessage::MSG_META_ALL_CHEER },
176176

177177
{ "BEGIN_CAMERA_ROTATE_LEFT", GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_LEFT },
@@ -881,7 +881,7 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
881881
}
882882
}
883883
{
884-
MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG);
884+
MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);
885885
if (map->m_key == MK_NONE)
886886
{
887887
map->m_key = MK_F12;

0 commit comments

Comments
 (0)