From 3c0cedbe922c9fcacd0d171423f83e375f66e178 Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Fri, 18 Jan 2019 19:08:56 -0800 Subject: Add screenshake, frame-specific effects, looping SFX, and clientside music looping Committed by patch since Goof is currently banned on GitHub for no good reason. --- include/aoapplication.h | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 44aef7a..cff0afb 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -74,6 +74,7 @@ public: bool arup_enabled = false; bool casing_alerts_enabled = false; bool modcall_reason_enabled = false; + bool looping_sfx_support_enabled = false; ///////////////loading info/////////////////// @@ -94,9 +95,9 @@ public: //////////////////versioning/////////////// - constexpr int get_release() const { return RELEASE; } - constexpr int get_major_version() const { return MAJOR_VERSION; } - constexpr int get_minor_version() const { return MINOR_VERSION; } + int get_release() const { return RELEASE; } + int get_major_version() const { return MAJOR_VERSION; } + int get_minor_version() const { return MINOR_VERSION; } QString get_version_string(); /////////////////////////////////////////// @@ -146,6 +147,12 @@ public: //Returns true if blank blips is enabled in config.ini and false otherwise bool get_blank_blip(); + //Returns true if looping sound effects are enabled in the config.ini + bool get_looping_sfx(); + + //Returns true if kill music on object is enabled in the config.ini + bool get_objectmusic(); + //Returns the value of default_music in config.ini int get_default_music(); @@ -257,6 +264,18 @@ public: //Returns the sfx of p_char's p_emote QString get_sfx_name(QString p_char, int p_emote); + //Returns if an emote loops it's SFX + QString get_sfx_looping(QString p_char, int p_emote); + + //Returns if an emote has a frame specific SFX for it + QString get_frame_sfx_name(QString p_char, QString p_emote, int n_frame); + + //Returns if an emote has a frame specific SFX for it + QString get_realization_frame(QString p_char, QString p_emote, int n_frame); + + //Returns if an emote has a frame specific SFX for it + QString get_screenshake_frame(QString p_char, QString p_emote, int n_frame); + //Not in use int get_sfx_delay(QString p_char, int p_emote); @@ -299,8 +318,8 @@ public: private: const int RELEASE = 2; - const int MAJOR_VERSION = 6; - const int MINOR_VERSION = 1; + const int MAJOR_VERSION = 7; + const int MINOR_VERSION = 0; QString current_theme = "default"; -- cgit From 248444307ff7cbe87ec4fe4024073cddb999dabc Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Fri, 18 Jan 2019 22:05:21 -0800 Subject: Fix bug with simultaneous shakes --- include/aoapplication.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index cff0afb..2ae1655 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -319,7 +319,7 @@ public: private: const int RELEASE = 2; const int MAJOR_VERSION = 7; - const int MINOR_VERSION = 0; + const int MINOR_VERSION = 1; QString current_theme = "default"; -- cgit From a7a614482e379ad13f8e0ca1e7f3e31c33bb1c21 Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Mon, 21 Jan 2019 15:45:51 -0800 Subject: final commit --- include/aoapplication.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 2ae1655..7a5e633 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -166,6 +166,10 @@ public: // from the config.ini. bool is_discord_enabled(); + // Returns the value of whether shaking and flashing should be enabled. + // from the config.ini. + bool is_shakeandflash_enabled(); + // Returns the value of the maximum amount of lines the IC chatlog // may contain, from config.ini. int get_max_log_size(); -- cgit From 13bc82094f76011eef371ece3b3894d7cc20eaf9 Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Wed, 23 Jan 2019 00:14:47 -0800 Subject: >>>>multi-threading the frame sfx/screenshake/flashes --- include/aoapplication.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 7a5e633..22c6c23 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -23,6 +23,11 @@ #include #include +#include +#include +#include +#include + class NetworkManager; class Lobby; class Courtroom; -- cgit From f9406d0a7f2363843d9d7c09a9e8d3422c967a64 Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Wed, 23 Jan 2019 01:56:56 -0800 Subject: multithread the music **harder** --- include/aoapplication.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 22c6c23..095dafd 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -95,6 +95,7 @@ public: int loaded_evidence = 0; int music_list_size = 0; int loaded_music = 0; + int area_count = 0; bool courtroom_loaded = false; -- cgit From fc984fcfe2a4416274810de81a8f36fe77b0dba9 Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Fri, 1 Feb 2019 16:28:14 -0800 Subject: bugfixes and shit --- include/aoapplication.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 095dafd..19eb474 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -323,6 +323,9 @@ public: // Same for CM. bool get_casing_cm_enabled(); + // Same for witnesses. + bool get_casing_wit_enabled(); + // Get the message for the CM for casing alerts. QString get_casing_can_host_cases(); -- cgit From 0dcf8a7f179069dabae8aa61ba69675ad5182d76 Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Fri, 1 Feb 2019 17:20:08 -0800 Subject: bump the version number to 2.7.2 --- include/aoapplication.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 19eb474..f1c4190 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -332,7 +332,7 @@ public: private: const int RELEASE = 2; const int MAJOR_VERSION = 7; - const int MINOR_VERSION = 1; + const int MINOR_VERSION = 2; QString current_theme = "default"; -- cgit From cb1ed6d60dc394f293f90f06ad9988de053feecb Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 21 Feb 2020 16:43:40 +0100 Subject: put minor version back --- include/aoapplication.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 280b731..e4f2ee6 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -342,6 +342,7 @@ public: private: const int RELEASE = 2; const int MAJOR_VERSION = 7; + const int MINOR_VERSION = 0; QString current_theme = "default"; -- cgit