From e1c1b6cbc400ccd791e6dc43138143fb11a3e610 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 26 Apr 2005 08:40:27 +0000 Subject: [PATCH] add secondary screenshot code --- stepmania/Themes/default/metrics.ini | 3 ++- stepmania/src/CodeDetector.cpp | 3 ++- stepmania/src/CodeDetector.h | 3 ++- stepmania/src/ScreenEvaluation.cpp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 534431b665..dcdc2eefde 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2814,7 +2814,8 @@ NextBannerGroup=MenuUp,MenuRight,MenuRight NextBannerGroup2=MenuUp,MenuDown,MenuUp,MenuDown Hidden= RandomVanish= -SaveScreenshot=MenuLeft+MenuRight +SaveScreenshot1=MenuLeft+MenuRight +SaveScreenshot2= CancelAllPlayerOptions= BackInEventMode= diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp index d35c4473fa..b9e22e6d88 100644 --- a/stepmania/src/CodeDetector.cpp +++ b/stepmania/src/CodeDetector.cpp @@ -50,7 +50,8 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = { "NextGame2", "NextBannerGroup", "NextBannerGroup2", - "SaveScreenshot", + "SaveScreenshot1", + "SaveScreenshot2", "CancelAllPlayerOptions", "BackInEventMode", }; diff --git a/stepmania/src/CodeDetector.h b/stepmania/src/CodeDetector.h index 103f3ea6e5..b063974447 100644 --- a/stepmania/src/CodeDetector.h +++ b/stepmania/src/CodeDetector.h @@ -64,7 +64,8 @@ public: CODE_NEXT_GAME2, CODE_BW_NEXT_GROUP, CODE_BW_NEXT_GROUP2, - CODE_SAVE_SCREENSHOT, + CODE_SAVE_SCREENSHOT1, + CODE_SAVE_SCREENSHOT2, CODE_CANCEL_ALL_PLAYER_OPTIONS, CODE_BACK_IN_EVENT_MODE, NUM_CODES // leave this at the end diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 1a6bce4c6d..3dbccb6dfc 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -1310,7 +1310,8 @@ void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType t HighScore &hs = m_HighScore[pn]; - if( CodeDetector::EnteredCode(GameI.controller, CodeDetector::CODE_SAVE_SCREENSHOT) ) + if( CodeDetector::EnteredCode(GameI.controller, CodeDetector::CODE_SAVE_SCREENSHOT1) || + CodeDetector::EnteredCode(GameI.controller, CodeDetector::CODE_SAVE_SCREENSHOT2) ) { if( !m_bSavedScreenshot[pn] && // only allow one screenshot PROFILEMAN->IsUsingProfile(pn) )