Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/controlconfig/controlsconfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,11 @@ const char *control_config_tooltip_handler(const char *str)
return NULL;
}

bool control_config_special_mode()
{
return (Binding_mode || Search_mode);
}

void control_config_init(bool API_Access)
{
int i;
Expand Down
5 changes: 5 additions & 0 deletions code/controlconfig/controlsconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,11 @@ void control_config_common_init();
*/
void control_config_common_close();

/*!
* @brief detect whether control config is in search or binding modes
*/
bool control_config_special_mode();

/*!
* @brief init config menu
*/
Expand Down
5 changes: 5 additions & 0 deletions code/cutscene/movie.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "tracing/tracing.h"
#include "io/timer.h"
#include "io/key.h"
#include "io/gamepad.h"
#include "mod_table/mod_table.h"
#include "network/multi.h"
#include "scripting/global_hooks.h"
Expand Down Expand Up @@ -244,6 +245,10 @@ void movie_display_loop(Player* player, PlaybackState* state) {

processEvents();

if (io::gamepad::action_or_cancel()) {
state->playing = false;
}

// NOTE: This does not update mission time! If movies get enabled in places
// other than through cutscenes then some refactoring should be done
// to account for normal time progression rather than just timestamps
Expand Down
1 change: 1 addition & 0 deletions code/globalincs/toolchain/clang.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
#define PUSH_SUPPRESS_WARNINGS \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wattributes\"") \
_Pragma("clang diagnostic ignored \"-Wshadow\"") \

/**
* @brief Restored previous warning settings
Expand Down
1 change: 1 addition & 0 deletions code/globalincs/toolchain/gcc.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
#define PUSH_SUPPRESS_WARNINGS \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wattributes\"") \
_Pragma("GCC diagnostic ignored \"-Wshadow\"") \

/**
* @brief Restored previous warning settings
Expand Down
1 change: 1 addition & 0 deletions code/globalincs/toolchain/mingw.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
#define PUSH_SUPPRESS_WARNINGS \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wattributes\"") \
_Pragma("GCC diagnostic ignored \"-Wshadow\"") \

/**
* @brief Restored previous warning settings
Expand Down
Loading
Loading