Implement Photo Mode (scp-fs2open#7287)

* Implement Photo Mode

* fix gr string errors

* return raw char array

* control conflict groups and better photo param defines

* better param identification in real time

* make photo mode hude dynamically sized

* fix xstrs after all changes

* missed a few

* use modern loop

Author: MjnMixael

code/camera/photomode.cpp

@@ -0,0 +1,16 @@
+#pragma once
+
+void photo_mode_set_active(bool active);
+void photo_mode_do_frame(float frame_time);
+void photo_mode_maybe_render_hud();
+void photo_mode_clear_screenshot_queued_flag();
+void photo_mode_set_screenshot_queued_flag();
+
+// mission-level permission to allow/disallow Photo Mode
+void game_toggle_photo_mode();
+void game_set_photo_mode_allowed(bool allowed);
+bool game_get_photo_mode_allowed();
+bool game_is_photo_mode_active();
+void game_cycle_photo_mode_filter(int direction);
+void game_reset_photo_mode_filters();
+void game_adjust_photo_mode_filter_parameter(int delta);

code/camera/photomode.h

@@ -10,6 +10,7 @@
 
 
 
+#include "camera/photomode.h"
 #include "cfile/cfile.h"
 #include "cmdline/cmdline.h"
 #include "controlconfig/controlsconfig.h"
@@ -620,6 +621,11 @@ void control_config_conflict_check()
 				continue;
 			}
 
+			// Skip conflict check between items in different conflict groups
+			if ((item_i.conflict_groups & item_j.conflict_groups) == 0) {
+				continue;
+			}
+
 			if (item_i.disabled && (item_i.has_first_conflict(item_j) || item_i.has_second_conflict(item_j))) {
 				// item_i conflicts with item_j and is disabled.  Silently clear item_i
 				item_i.clear();
@@ -2837,6 +2843,13 @@ int check_control_used(int id, int key)
 	if (item.disabled || item.locked)
 		return 0;
 
+	// Filter actions based on conflict groups and current mode
+	{
+		int active_group = game_is_photo_mode_active() ? CONFLICT_GROUP_PHOTO_MODE : CONFLICT_GROUP_DEFAULT;
+		if (!(item.conflict_groups & active_group))
+			return 0;
+	}
+
 	short z = item.get_btn(CID_KEYBOARD);	// Get the key that's bound to this control
 
 	if (item.type == CC_TYPE_CONTINUOUS) {

code/controlconfig/controlsconfig.cpp

@@ -308,6 +308,13 @@ enum IoActionId : int {
 
 	CYCLE_PRIMARY_WEAPON_PATTERN,
 
+	TOGGLE_PHOTO_MODE,
+	PHOTO_MODE_FILTER_PREV,
+	PHOTO_MODE_FILTER_NEXT,
+	PHOTO_MODE_FILTER_RESET,
+	PHOTO_MODE_PARAM_DECREASE,
+	PHOTO_MODE_PARAM_INCREASE,
+
 	/*!
 	 * This must always be below the last defined item
 	 */
@@ -585,6 +592,10 @@ class CC_preset {
  * Control configuration item type.
  * @detail Contains binding info, documentation, behavior, etc. for a single control
  */
+// Conflict group bitmasks. Bindings only conflict if their groups overlap (bitwise AND != 0).
+static const int CONFLICT_GROUP_DEFAULT    = (1 << 0);  //!< Standard gameplay bindings
+static const int CONFLICT_GROUP_PHOTO_MODE = (1 << 1);  //!< Bindings used within photo mode
+
 class CCI : public CCB {
 public:
 // Inherited from CCB
@@ -593,6 +604,7 @@ class CCI : public CCB {
 
 // Items Set in menu
 	char tab;               //!< what tab (category) it belongs in
+	int  conflict_groups = CONFLICT_GROUP_DEFAULT;  //!< Bitmask of conflict groups. Bindings only conflict with others sharing at least one group.
 	int  indexXSTR;         //!< what string index we should use to translate this with an XSTR 0 = None, 1= Use item index + CONTROL_CONFIG_XSTR, 2 <= use CCI::indexXSTR directly
 	SCP_string text;        //!< describes the action in the config screen
 
@@ -665,7 +677,7 @@ class CCI_builder {
 	 *   If the type is CC_TYPE_TRIGGER or CC_TYPE_CONTINOUS, the primary is assumed to be a key combo and secondary is assumed to be a joy button.
 	 *   If the type is CC_TYPE_AXIS_ABS, CC_TYPE_AXIS_REL, CC_TYPE_AXIS_BTN_POS, or CC_TYPE_AXIS_BTN_NEG, the primary is a Joy0 axis and the secondary is a Mouse axis
 	 */
-	CCI_builder& operator()(IoActionId action_id, short primary, short secondary, char tab, int indexXSTR, const char *text, CC_type type, bool disabled = false);
+	CCI_builder& operator()(IoActionId action_id, short primary, short secondary, char tab, int indexXSTR, const char *text, CC_type type, bool disabled = false, int conflict_groups = CONFLICT_GROUP_DEFAULT);
 
 private:
 	CCI_builder();	// Only one builder per Control Config, so a default constructor is useless

code/controlconfig/controlsconfig.h

@@ -138,12 +138,12 @@ void control_config_common_init_bindings() {
 	(TARGET_PREV_BOMB,                      KEY_SHIFTED | KEY_B, -1, TARGET_TAB, 1, "Target Previous Hostile Bomb or Bomber", CC_TYPE_TRIGGER)
 
 	// flight controls (Rotation)
-	(BANK_LEFT,                                        KEY_PAD7, -1, SHIP_TAB, 1, "Bank Left",      CC_TYPE_CONTINUOUS)
-	(BANK_RIGHT,                                       KEY_PAD9, -1, SHIP_TAB, 1, "Bank Right",     CC_TYPE_CONTINUOUS)
-	(PITCH_FORWARD,                                    KEY_PAD8, -1, SHIP_TAB, 1, "Pitch Forward",  CC_TYPE_CONTINUOUS)
-	(PITCH_BACK,                                       KEY_PAD2, -1, SHIP_TAB, 1, "Pitch Backward", CC_TYPE_CONTINUOUS)
-	(YAW_LEFT,                                         KEY_PAD4, -1, SHIP_TAB, 1, "Yaw Left",       CC_TYPE_CONTINUOUS)
-	(YAW_RIGHT,                                        KEY_PAD6, -1, SHIP_TAB, 1, "Yaw Right",      CC_TYPE_CONTINUOUS)
+	(BANK_LEFT,                                        KEY_PAD7, -1, SHIP_TAB, 1, "Bank Left",      CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(BANK_RIGHT,                                       KEY_PAD9, -1, SHIP_TAB, 1, "Bank Right",     CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(PITCH_FORWARD,                                    KEY_PAD8, -1, SHIP_TAB, 1, "Pitch Forward",  CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(PITCH_BACK,                                       KEY_PAD2, -1, SHIP_TAB, 1, "Pitch Backward", CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(YAW_LEFT,                                         KEY_PAD4, -1, SHIP_TAB, 1, "Yaw Left",       CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(YAW_RIGHT,                                        KEY_PAD6, -1, SHIP_TAB, 1, "Yaw Right",      CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
 
 	// flight controls (Throttle)
 	(ZERO_THROTTLE,                                  KEY_BACKSP, -1, SHIP_TAB, 1, "Set Throttle to Zero",           CC_TYPE_TRIGGER)
@@ -154,16 +154,16 @@ void control_config_common_init_bindings() {
 	(MINUS_5_PERCENT_THROTTLE,                        KEY_MINUS, -1, SHIP_TAB, 1, "Decrease Throttle 5 Percent",    CC_TYPE_TRIGGER)
 
 	// flight controls (Thrust)
-	(FORWARD_THRUST,                                      KEY_A, -1, SHIP_TAB, 1, "Forward Thrust", CC_TYPE_CONTINUOUS)
-	(REVERSE_THRUST,                                      KEY_Z, -1, SHIP_TAB, 1, "Reverse Thrust", CC_TYPE_CONTINUOUS)
-	(RIGHT_SLIDE_THRUST,                    KEY_SHIFTED | KEY_3, -1, SHIP_TAB, 1, "Right Thrust",   CC_TYPE_CONTINUOUS)
-	(LEFT_SLIDE_THRUST,                     KEY_SHIFTED | KEY_1, -1, SHIP_TAB, 1, "Left Thrust",    CC_TYPE_CONTINUOUS)
-	(UP_SLIDE_THRUST,                 KEY_SHIFTED | KEY_PADPLUS, -1, SHIP_TAB, 1, "Up Thrust",      CC_TYPE_CONTINUOUS)
-	(DOWN_SLIDE_THRUST,              KEY_SHIFTED | KEY_PADENTER, -1, SHIP_TAB, 1, "Down Thrust",    CC_TYPE_CONTINUOUS)
+	(FORWARD_THRUST,                                      KEY_A, -1, SHIP_TAB, 1, "Forward Thrust", CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(REVERSE_THRUST,                                      KEY_Z, -1, SHIP_TAB, 1, "Reverse Thrust", CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(RIGHT_SLIDE_THRUST,                    KEY_SHIFTED | KEY_3, -1, SHIP_TAB, 1, "Right Thrust",   CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(LEFT_SLIDE_THRUST,                     KEY_SHIFTED | KEY_1, -1, SHIP_TAB, 1, "Left Thrust",    CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(UP_SLIDE_THRUST,                 KEY_SHIFTED | KEY_PADPLUS, -1, SHIP_TAB, 1, "Up Thrust",      CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(DOWN_SLIDE_THRUST,              KEY_SHIFTED | KEY_PADENTER, -1, SHIP_TAB, 1, "Down Thrust",    CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
 
 	// flight controls (flight modes)
 	(BANK_WHEN_PRESSED,                                      -1, -1, SHIP_TAB, 1, "Bank When Pressed",  CC_TYPE_CONTINUOUS)
-	(AFTERBURNER,                                       KEY_TAB,  5, SHIP_TAB, 1, "Afterburner",        CC_TYPE_CONTINUOUS)
+	(AFTERBURNER,                                       KEY_TAB,  5, SHIP_TAB, 1, "Afterburner",        CC_TYPE_CONTINUOUS, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
 	(GLIDE_WHEN_PRESSED,                                     -1, -1, SHIP_TAB, 1774, "Glide When Pressed", CC_TYPE_CONTINUOUS)
 	(TOGGLE_GLIDING,                          KEY_ALTED | KEY_G, -1, SHIP_TAB, 1775, "Toggle Gliding",     CC_TYPE_TRIGGER)
 
@@ -267,6 +267,12 @@ void control_config_common_init_bindings() {
 	(TOGGLE_HUD_CONTRAST,                                         KEY_L, -1, COMPUTER_TAB, 1, "Toggle High HUD Contrast",         CC_TYPE_TRIGGER)
 	(TOGGLE_HUD_SHADOWS,                              KEY_ALTED | KEY_L, -1, COMPUTER_TAB, 1781, "Toggle HUD Drop Shadows",          CC_TYPE_TRIGGER)
 	(HUD_TARGETBOX_TOGGLE_WIREFRAME,    KEY_ALTED | KEY_SHIFTED | KEY_Q, -1, COMPUTER_TAB, 1, "Toggle HUD Wireframe Target View", CC_TYPE_TRIGGER)
+	(TOGGLE_PHOTO_MODE,                                KEY_ALTED | KEY_1, -1, COMPUTER_TAB, 1908, "Toggle Photo Mode",                  CC_TYPE_TRIGGER, false, CONFLICT_GROUP_DEFAULT | CONFLICT_GROUP_PHOTO_MODE)
+	(PHOTO_MODE_FILTER_PREV,                                      KEY_UP, -1, COMPUTER_TAB, 1909, "Photo Mode Previous Parameter",         CC_TYPE_TRIGGER, false, CONFLICT_GROUP_PHOTO_MODE)
+	(PHOTO_MODE_FILTER_NEXT,                                    KEY_DOWN, -1, COMPUTER_TAB, 1910, "Photo Mode Next Parameter",             CC_TYPE_TRIGGER, false, CONFLICT_GROUP_PHOTO_MODE)
+	(PHOTO_MODE_FILTER_RESET,                          KEY_ALTED | KEY_2, -1, COMPUTER_TAB, 1911, "Photo Mode Reset Parameters",           CC_TYPE_TRIGGER, false, CONFLICT_GROUP_PHOTO_MODE)
+	(PHOTO_MODE_PARAM_DECREASE,                                 KEY_LEFT, -1, COMPUTER_TAB, 1912, "Photo Mode Decrease Selected Parameter", CC_TYPE_TRIGGER, false, CONFLICT_GROUP_PHOTO_MODE)
+	(PHOTO_MODE_PARAM_INCREASE,                                KEY_RIGHT, -1, COMPUTER_TAB, 1913, "Photo Mode Increase Selected Parameter", CC_TYPE_TRIGGER, false, CONFLICT_GROUP_PHOTO_MODE)
 
 	// Custom Controls
 	(CUSTOM_CONTROL_1,                  KEY_ALTED | KEY_SHIFTED | KEY_1, -1, COMPUTER_TAB, 1784, "Custom Control 1", CC_TYPE_TRIGGER, true)
@@ -434,6 +440,12 @@ SCP_unordered_map<SCP_string, IoActionId> old_text = {
 	{"Up Thrust",                               UP_SLIDE_THRUST},
 	{"Down Thrust",                             DOWN_SLIDE_THRUST},
 	{"Toggle HUD Wireframe Target View",        HUD_TARGETBOX_TOGGLE_WIREFRAME},
+	{"Toggle Photo Mode",                      TOGGLE_PHOTO_MODE},
+	{"Photo Mode Previous Parameter",             PHOTO_MODE_FILTER_PREV},
+	{"Photo Mode Next Parameter",                 PHOTO_MODE_FILTER_NEXT},
+	{"Photo Mode Reset Parameters",               PHOTO_MODE_FILTER_RESET},
+	{"Photo Mode Decrease Selected Parameter",    PHOTO_MODE_PARAM_DECREASE},
+	{"Photo Mode Increase Selected Parameter",    PHOTO_MODE_PARAM_INCREASE},
 	{"Top-Down View",                           VIEW_TOPDOWN},
 	{"Target Padlock View",                     VIEW_TRACK_TARGET},
 
@@ -1153,6 +1165,12 @@ void LoadEnumsIntoActionMap() {
 	ADD_ENUM_TO_ACTION_MAP(UP_SLIDE_THRUST)
 	ADD_ENUM_TO_ACTION_MAP(DOWN_SLIDE_THRUST)
 	ADD_ENUM_TO_ACTION_MAP(HUD_TARGETBOX_TOGGLE_WIREFRAME)
+	ADD_ENUM_TO_ACTION_MAP(TOGGLE_PHOTO_MODE)
+	ADD_ENUM_TO_ACTION_MAP(PHOTO_MODE_FILTER_PREV)
+	ADD_ENUM_TO_ACTION_MAP(PHOTO_MODE_FILTER_NEXT)
+	ADD_ENUM_TO_ACTION_MAP(PHOTO_MODE_FILTER_RESET)
+	ADD_ENUM_TO_ACTION_MAP(PHOTO_MODE_PARAM_DECREASE)
+	ADD_ENUM_TO_ACTION_MAP(PHOTO_MODE_PARAM_INCREASE)
 	ADD_ENUM_TO_ACTION_MAP(VIEW_TOPDOWN)
 	ADD_ENUM_TO_ACTION_MAP(VIEW_TRACK_TARGET)
 
@@ -2820,6 +2838,7 @@ CCI& CCI::operator=(const CCI& A) {
 	locked = A.locked;
 	scriptEnabledByDefault = A.scriptEnabledByDefault;
 	continuous_ongoing = A.continuous_ongoing;
+	conflict_groups = A.conflict_groups;
 
 	return *this;
 };
@@ -2902,7 +2921,7 @@ CCI_builder& CCI_builder::start() {
 
 void CCI_builder::end() {};
 
-CCI_builder& CCI_builder::operator()(IoActionId action_id, short primary, short secondary, char tab, int indexXSTR, const char *text, CC_type type, bool disabled) {
+CCI_builder& CCI_builder::operator()(IoActionId action_id, short primary, short secondary, char tab, int indexXSTR, const char *text, CC_type type, bool disabled, int conflict_groups) {
 	Assert(action_id < CCFG_MAX);
 	CCI& item = ControlConfig[action_id];
 
@@ -2940,6 +2959,9 @@ CCI_builder& CCI_builder::operator()(IoActionId action_id, short primary, short
 		item.disabled = false;
 	}
 
+	// Assign the conflict group
+	item.conflict_groups = conflict_groups;
+
 	return *this;
 }
 

code/controlconfig/controlsconfigcommon.cpp

@@ -2976,6 +2976,11 @@ void gr_request_screenshot(const char* filename)
 	}
 }
 
+bool gr_is_screenshot_requested()
+{
+	return !Pending_screenshot_filename.empty();
+}
+
 void gr_print_timestamp(int x, int y, fix timestamp, int resize_mode)
 {
 	int seconds = f2i(timestamp);

code/graphics/2d.cpp

@@ -1074,6 +1074,7 @@ extern void gr_activate(int active);
 #define gr_dump_envmap		GR_CALL(gr_screen.gf_dump_envmap)
 
 void gr_request_screenshot(const char* filename);
+bool gr_is_screenshot_requested();
 
 //#define gr_flip				GR_CALL(gr_screen.gf_flip)
 void gr_flip(bool execute_scripting = true);

code/graphics/2d.h

@@ -13,6 +13,7 @@
 #include "globalincs/pstypes.h"
 #include "globalincs/globals.h"
 #include "globalincs/linklist.h"
+#include "camera/photomode.h"
 #include "io/key.h"
 #include "io/joy.h"
 #include "io/timer.h"
@@ -328,6 +329,12 @@ int Normal_key_set[] = {
 	MULTI_SELF_DESTRUCT,
 
 	TOGGLE_HUD,
+	TOGGLE_PHOTO_MODE,
+	PHOTO_MODE_FILTER_PREV,
+	PHOTO_MODE_FILTER_NEXT,
+	PHOTO_MODE_FILTER_RESET,
+	PHOTO_MODE_PARAM_DECREASE,
+	PHOTO_MODE_PARAM_INCREASE,
 
 	HUD_TARGETBOX_TOGGLE_WIREFRAME,
 	AUTO_PILOT_TOGGLE,
@@ -475,6 +482,12 @@ int Non_critical_key_set[] = {
 	MULTI_SELF_DESTRUCT,
 
 	TOGGLE_HUD,
+	TOGGLE_PHOTO_MODE,
+	PHOTO_MODE_FILTER_PREV,
+	PHOTO_MODE_FILTER_NEXT,
+	PHOTO_MODE_FILTER_RESET,
+	PHOTO_MODE_PARAM_DECREASE,
+	PHOTO_MODE_PARAM_INCREASE,
 
 	HUD_TARGETBOX_TOGGLE_WIREFRAME,
 	AUTO_PILOT_TOGGLE,
@@ -1536,9 +1549,13 @@ void game_do_end_mission_popup()
 			if (Game_subspace_effect) {
 				game_start_subspace_ambient_sound();
 			}
-			audiostream_unpause_all();
+
+			if (!game_is_photo_mode_active()) {
+				audiostream_unpause_all();
+				message_resume_all();
+			}
+
 			weapon_unpause_sounds();
-			message_resume_all();
 			break;
 		}
 
@@ -2230,10 +2247,12 @@ int button_function_demo_valid(int n)
 
 	case TIME_SLOW_DOWN:
 		ret = 1;
-		if ( Game_mode & GM_NORMAL && !Time_compression_locked ) {
+		if (Game_mode & GM_NORMAL && (!Time_compression_locked || game_is_photo_mode_active())) {
+			const auto min_compression = game_is_photo_mode_active() ? fl2f(0.01f) : (F1_0 / (Cmdline_retail_time_compression_range ? MAX_TIME_DIVIDER_RETAIL : MAX_TIME_DIVIDER));
+
 			// Goober5000 - time dilation only available in cheat mode (see above);
 			// now you can do it with or without pressing the tilde, per Kazan's request
-			if ((Game_time_compression > F1_0) || (Cheats_enabled && (Game_time_compression > (F1_0 / (Cmdline_retail_time_compression_range ? MAX_TIME_DIVIDER_RETAIL : MAX_TIME_DIVIDER))))) {
+			if ((Game_time_compression > F1_0) || (Game_time_compression > min_compression && (Cheats_enabled || game_is_photo_mode_active()))) {
 				change_time_compression(0.5f);
 				break;
 			}
@@ -2243,7 +2262,7 @@ int button_function_demo_valid(int n)
 
 	case TIME_SPEED_UP:
 		ret = 1;
-		if ( Game_mode & GM_NORMAL && !Time_compression_locked ) {
+		if (Game_mode & GM_NORMAL && (!Time_compression_locked || game_is_photo_mode_active())) {
 			if (Game_time_compression < (F1_0 * (Cmdline_retail_time_compression_range ? MAX_TIME_MULTIPLIER_RETAIL : MAX_TIME_MULTIPLIER))) {
 				change_time_compression(2.0f);
 				break;
@@ -2582,6 +2601,30 @@ int button_function(int n)
 			hud_toggle_draw();
 			break;
 
+		case TOGGLE_PHOTO_MODE:
+			game_toggle_photo_mode();
+			break;
+
+		case PHOTO_MODE_FILTER_PREV:
+			game_cycle_photo_mode_filter(-1);
+			break;
+
+		case PHOTO_MODE_FILTER_NEXT:
+			game_cycle_photo_mode_filter(1);
+			break;
+
+		case PHOTO_MODE_FILTER_RESET:
+			game_reset_photo_mode_filters();
+			break;
+
+		case PHOTO_MODE_PARAM_DECREASE:
+			game_adjust_photo_mode_filter_parameter(-1);
+			break;
+
+		case PHOTO_MODE_PARAM_INCREASE:
+			game_adjust_photo_mode_filter_parameter(1);
+			break;
+
 		case HUD_TARGETBOX_TOGGLE_WIREFRAME:
 			if (!Lock_targetbox_mode) {
 				gamesnd_play_iface(InterfaceSounds::USER_SELECT);

code/io/keycontrol.cpp

@@ -64,7 +64,7 @@ bool *Lcl_unexpected_tstring_check = nullptr;
 // NOTE: with map storage of XSTR strings, the indexes no longer need to be contiguous,
 // but internal strings should still increment XSTR_SIZE to avoid collisions.
 // retail XSTR_SIZE = 1570
-// #define XSTR_SIZE	1892 // This is the next available ID
+// #define XSTR_SIZE	1915 // This is the next available ID
 
 // struct to allow for strings.tbl-determined x offset
 // offset is 0 for english, by default

code/localization/localize.cpp

@@ -12,6 +12,7 @@
 
 #include "controlconfig/controlsconfig.h"
 #include "freespace.h"
+#include "camera/photomode.h"
 #include "gamesequence/gamesequence.h"
 #include "globalincs/alphacolors.h"
 #include "graphics/font.h"
@@ -254,8 +255,10 @@ void pause_close()
 	// unpause all weapon sounds
 	weapon_unpause_sounds();
 
-	// unpause voices
-	message_resume_all();
+	// unpause voices unless Photo Mode is keeping playback paused
+	if (!game_is_photo_mode_active()) {
+		message_resume_all();
+	}
 
 	// deinit stuff
 	if(Pause_saved_screen != -1) {
@@ -273,8 +276,10 @@ void pause_close()
 
 	io::mouse::CursorManager::get()->popStatus();
 
-	// unpause all the music
-	audiostream_unpause_all();		
+	// unpause all the music unless Photo Mode is keeping playback paused
+	if (!game_is_photo_mode_active()) {
+		audiostream_unpause_all();
+	}
 
 	Paused = false;
 }