Merge branch 'master' into feature/mounting

7 files changed, 32 insertions, 13 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index e800bb5c..b0ab972c 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -299,6 +299,9 @@ public:
   // Returns whether the user would like to have custom shownames on by default.
   bool get_showname_enabled_by_default();
 
+  //Returns the showname the user may have set in config.ini.
+  QString get_default_showname();
+
   // Returns the list of words in callwords.ini
   QStringList get_call_words();
 
@@ -401,10 +404,6 @@ public:
   // Returns the preanim duration of p_char's p_emote
   int get_preanim_duration(QString p_char, QString p_emote);
 
-  // Same as above, but only returns if it has a % in front(refer to Preanims
-  // section in the manual)
-  int get_ao2_preanim_duration(QString p_char, QString p_emote);
-
   // Not in use
   int get_text_delay(QString p_char, QString p_emote);
 
@@ -513,6 +512,9 @@ public:
   // Get if the theme is animated
   bool get_animated_theme();
 
+  // Get the default scaling method
+  QString get_default_scaling();
+
   // Get a list of custom mount paths
   QStringList get_mount_paths();
 
@@ -525,6 +527,16 @@ public:
   // The file name of the log file in base/logs.
   QString log_filename;
 
+  /**
+   * @brief A QString of an URL that defines the content repository
+   *        send by the server.
+   *
+   * @details Introduced in Version 2.9.2.
+   *        Addresses the issue of contenturl devlivery for WebAO
+   *        without relying on someone adding the link manually.
+   */
+  QString asset_url;
+
   void initBASS();
   static void load_bass_opus_plugin();
   static void CALLBACK BASSreset(HSTREAM handle, DWORD channel, DWORD data,
@@ -537,7 +549,7 @@ public:
 private:
   const int RELEASE = 2;
   const int MAJOR_VERSION = 9;
-  const int MINOR_VERSION = 0;
+  const int MINOR_VERSION = 1;
 
   QVector<server_type> server_list;
   QVector<server_type> favorite_list;
diff --git a/include/aoimage.h b/include/aoimage.h
index 70ff1fc0..b75eee19 100644
--- a/include/aoimage.h
+++ b/include/aoimage.h
@@ -11,7 +11,7 @@
 
 class AOImage : public QLabel {
 public:
-  AOImage(QWidget *parent, AOApplication *p_ao_app);
+  AOImage(QWidget *parent, AOApplication *p_ao_app, bool make_static = false);
   ~AOImage();
 
   QWidget *m_parent;
@@ -20,6 +20,8 @@ public:
 
   QString path;
 
+  bool is_static = false;
+
   bool set_image(QString p_image, QString p_misc = "");
   void set_size_and_pos(QString identifier);
 };
diff --git a/include/aolayer.h b/include/aolayer.h
index 90108afc..7a8e2fd9 100644
--- a/include/aolayer.h
+++ b/include/aolayer.h
@@ -53,6 +53,7 @@ public:
   bool force_continuous = false;
   Qt::TransformationMode transform_mode = Qt::FastTransformation; // transformation mode to use for this image
   bool stretch = false; // Should we stretch/squash this image to fill the screen?
+  bool masked = true; // Set a mask to the dimensions of the widget?
 
   // Set the movie's image to provided paths, preparing for playback.
   void start_playback(QString p_image);
@@ -104,10 +105,6 @@ protected:
 
   QElapsedTimer actual_time;
 
-  // Usually used to turn seconds into milliseconds such as for [Time] tag in
-  // char.ini (which is no longer used)
-  const int tick_ms = 60;
-
   // These are the X and Y values before they are fixed based on the sprite's
   // width.
   int x = 0;
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 36031f16..f899b9a2 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -25,7 +25,7 @@ public:
   int loop_end[4] = {0, 0, 0, 0};
 
 public slots:
-  void play(QString p_song, int channel = 0, bool loop = false,
+  int play(QString p_song, int channel = 0, bool loop = false,
             int effect_flags = 0);
   void stop(int channel = 0);
 
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 3ea8ccc3..4568b1ed 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -79,6 +79,8 @@ private:
   QLabel *ui_username_lbl;
   QLabel *ui_showname_lbl;
   QCheckBox *ui_showname_cb;
+  QLabel *ui_default_showname_lbl;
+  QLineEdit *ui_default_showname_textbox;
   QFrame *ui_net_divider;
   QLabel *ui_ms_lbl;
   QLineEdit *ui_ms_textbox;
@@ -86,6 +88,8 @@ private:
   QCheckBox *ui_discord_cb;
   QLabel *ui_language_label;
   QComboBox *ui_language_combobox;
+  QLabel *ui_scaling_label;
+  QComboBox *ui_scaling_combobox;
 
   QLabel *ui_shake_lbl;
   QCheckBox *ui_shake_cb;
diff --git a/include/courtroom.h b/include/courtroom.h
index 21191e58..9da465ab 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -226,13 +226,16 @@ public:
   // Parse the chat message packet and unpack it into the m_chatmessage[ITEM] format
   void unpack_chatmessage(QStringList p_contents);
 
+  // Skip the current queue, adding all the queue messages to the logs if desynchronized logs are disabled
+  void skip_chatmessage_queue();
+
   enum LogMode {
     IO_ONLY,
     DISPLAY_ONLY,
     DISPLAY_AND_IO
   };
   // Log the message contents and information such as evidence presenting etc. into the log file, the IC log, or both.
-  void log_chatmessage(QString f_message, int f_char_id, QString f_showname = "", int f_color = 0, LogMode f_log_mode=IO_ONLY);
+  void log_chatmessage(QString f_message, int f_char_id, QString f_showname = "", QString f_char = "", QString f_objection_mod = "", int f_evi_id = 0, int f_color = 0, LogMode f_log_mode=IO_ONLY);
 
   // Log the message contents and information such as evidence presenting etc. into the IC logs
   void handle_callwords();
@@ -752,7 +755,6 @@ private:
 
   QVector<AOCharButton *> ui_char_button_list;
   QVector<AOCharButton *> ui_char_button_list_filtered;
-  AOImage *ui_selector;
 
   AOButton *ui_back_to_lobby;
 
diff --git a/include/demoserver.h b/include/demoserver.h
index 3dc645be..cadc52dd 100644
--- a/include/demoserver.h
+++ b/include/demoserver.h
@@ -10,6 +10,7 @@
 #include <QTcpSocket>
 #include <QTimer>
 #include <QFileDialog>
+#include <QMessageBox>
 
 class DemoServer : public QObject
 {
@@ -24,6 +25,7 @@ public:
 private:
     void handle_packet(AOPacket packet);
     void load_demo(QString filename);
+    void reset_state();
 
     QTcpServer* tcp_server;
     QTcpSocket* client_sock = nullptr;