Skip to content

Commit 1126357

Browse files
bobtistabobtista
committed
Change F12 to JPEG and add CTRL+F12 for PNG screenshots
1 parent 7daf782 commit 1126357

File tree

16 files changed

+40
-30
lines changed

16 files changed

+40
-30
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ class GameMessage : public MemoryPoolObject
257257
MSG_META_BEGIN_PREFER_SELECTION, ///< The Shift key has been depressed alone
258258
MSG_META_END_PREFER_SELECTION, ///< The Shift key has been released.
259259

260-
MSG_META_TAKE_SCREENSHOT, ///< take screenshot
261-
MSG_META_TAKE_SCREENSHOT_COMPRESSED, ///< take compressed screenshot without stalling
260+
MSG_META_TAKE_SCREENSHOT, ///< take screenshot (JPEG)
261+
MSG_META_TAKE_SCREENSHOT_PNG, ///< take PNG screenshot
262262
MSG_META_ALL_CHEER, ///< Yay! :)
263263
MSG_META_TOGGLE_ATTACKMOVE, ///< enter attack-move mode
264264

‎Generals/Code/GameEngine/Include/GameClient/Display.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ class Display : public SubsystemInterface
168168
virtual void preloadModelAssets( AsciiString model ) = 0; ///< preload model asset
169169
virtual void preloadTextureAssets( AsciiString texture ) = 0; ///< preload texture asset
170170

171-
virtual void takeScreenShot(void) = 0; ///< saves screenshot to a file
172-
virtual void takeScreenShotCompressed(void) = 0; ///< saves compressed screenshot without stalling
171+
virtual void takeScreenShotCompressed(void) = 0; ///< saves JPEG screenshot
172+
virtual void takeScreenShotPNG(void) = 0; ///< saves PNG screenshot
173173
virtual void toggleMovieCapture(void) = 0; ///< starts saving frames to an avi or frame sequence
174174
virtual void toggleLetterBox(void) = 0; ///< enabled letter-boxed display
175175
virtual void enableLetterBox(Bool enable) = 0; ///< forces letter-boxed display on/off

‎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_COMPRESSED)
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3418,14 +3418,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
34183418
case GameMessage::MSG_META_TAKE_SCREENSHOT:
34193419
{
34203420
if (TheDisplay)
3421-
TheDisplay->takeScreenShot();
3421+
TheDisplay->takeScreenShotCompressed();
34223422
break;
34233423
}
34243424

3425-
case GameMessage::MSG_META_TAKE_SCREENSHOT_COMPRESSED:
3425+
case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:
34263426
{
34273427
if (TheDisplay)
3428-
TheDisplay->takeScreenShotCompressed();
3428+
TheDisplay->takeScreenShotPNG();
34293429
disp = DESTROY_MESSAGE;
34303430
break;
34313431
}

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

Lines changed: 4 additions & 4 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_COMPRESSED", GameMessage::MSG_META_TAKE_SCREENSHOT_COMPRESSED },
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 },
@@ -813,12 +813,12 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
813813
}
814814
}
815815
{
816-
MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_COMPRESSED);
816+
MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);
817817
if (map->m_key == MK_NONE)
818818
{
819-
map->m_key = MK_F11;
819+
map->m_key = MK_F12;
820820
map->m_transition = DOWN;
821-
map->m_modState = NONE;
821+
map->m_modState = CTRL;
822822
map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
823823
}
824824
}

‎Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class W3DDisplay : public Display
120120

121121
virtual VideoBuffer* createVideoBuffer( void ) ; ///< Create a video buffer that can be used for this display
122122

123-
virtual void takeScreenShot(void); //save screenshot to file
124-
virtual void takeScreenShotCompressed(void); //save compressed screenshot to file (JPG/PNG) without stalling
123+
virtual void takeScreenShotCompressed(void); //save JPEG screenshot
124+
virtual void takeScreenShotPNG(void); //save PNG screenshot
125125
virtual void toggleMovieCapture(void); //enable AVI or frame capture mode.
126126

127127
virtual void toggleLetterBox(void); ///<enabled letter-boxed display

‎Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3021,6 +3021,11 @@ void W3DDisplay::takeScreenShotCompressed(void)
30213021
W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG, 80);
30223022
}
30233023

3024+
void W3DDisplay::takeScreenShotPNG(void)
3025+
{
3026+
W3D_TakeCompressedScreenshot(SCREENSHOT_PNG, 0);
3027+
}
3028+
30243029
/** Start/Stop capturing an AVI movie*/
30253030
void W3DDisplay::toggleMovieCapture(void)
30263031
{

‎Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ class GUIEditDisplay : public Display
101101
virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) { }
102102
virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
103103
Int endX, Int endY ) { }
104-
virtual void takeScreenShot(void){ }
105104
virtual void takeScreenShotCompressed(void){ }
105+
virtual void takeScreenShotPNG(void){ }
106106
virtual void toggleMovieCapture(void) {}
107107

108108
// methods that we need to stub

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ class GameMessage : public MemoryPoolObject
257257
MSG_META_BEGIN_PREFER_SELECTION, ///< The Shift key has been depressed alone
258258
MSG_META_END_PREFER_SELECTION, ///< The Shift key has been released.
259259

260-
MSG_META_TAKE_SCREENSHOT, ///< take screenshot
261-
MSG_META_TAKE_SCREENSHOT_COMPRESSED, ///< take compressed screenshot without stalling
260+
MSG_META_TAKE_SCREENSHOT, ///< take screenshot (JPEG)
261+
MSG_META_TAKE_SCREENSHOT_PNG, ///< take PNG screenshot
262262
MSG_META_ALL_CHEER, ///< Yay! :)
263263
MSG_META_TOGGLE_ATTACKMOVE, ///< enter attack-move mode
264264

‎GeneralsMD/Code/GameEngine/Include/GameClient/Display.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ class Display : public SubsystemInterface
168168
virtual void preloadModelAssets( AsciiString model ) = 0; ///< preload model asset
169169
virtual void preloadTextureAssets( AsciiString texture ) = 0; ///< preload texture asset
170170

171-
virtual void takeScreenShot(void) = 0; ///< saves screenshot to a file
172-
virtual void takeScreenShotCompressed(void) = 0; ///< saves compressed screenshot without stalling
171+
virtual void takeScreenShotCompressed(void) = 0; ///< saves JPEG screenshot
172+
virtual void takeScreenShotPNG(void) = 0; ///< saves PNG screenshot
173173
virtual void toggleMovieCapture(void) = 0; ///< starts saving frames to an avi or frame sequence
174174
virtual void toggleLetterBox(void) = 0; ///< enabled letter-boxed display
175175
virtual void enableLetterBox(Bool enable) = 0; ///< forces letter-boxed display on/off

0 commit comments

Comments
 (0)