Merge pull request #1 from argoneuscze/modcall_reason

Added support for modcall reasons
AttorneyOnline · Aug 5, 2018 · a8344ce · a8344ce
2 parents 68a3f35 + 806a022
commit a8344ce
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/aoapplication.h b/aoapplication.h
@@ -56,6 +56,7 @@ class AOApplication : public QApplication
   bool improved_loading_enabled = false;
   bool desk_mod_enabled = false;
   bool evidence_enabled = false;
+  bool modcall_reason_enabled = false;
 
   ///////////////loading info///////////////////
 
@@ -224,8 +225,8 @@ class AOApplication : public QApplication
 
 private:
   const int RELEASE = 2;
-  const int MAJOR_VERSION = 4;
-  const int MINOR_VERSION = 10;
+  const int MAJOR_VERSION = 5;
+  const int MINOR_VERSION = 0;
 
   QString current_theme = "default";
 

diff --git a/courtroom.cpp b/courtroom.cpp
@@ -2018,7 +2018,29 @@ void Courtroom::on_spectator_clicked()
 
 void Courtroom::on_call_mod_clicked()
 {
-  ao_app->send_server_packet(new AOPacket("ZZ#%"));
+  if (ao_app->modcall_reason_enabled) {
+    auto box = new QInputDialog();
+    box->setLabelText("Enter a reason:");
+    auto code = box->exec();
+
+    if (code != QDialog::Accepted) {
+      delete box;
+      return;
+    }
+
+    auto text = box->textValue();
+    if (text.isEmpty())
+      text = "N/A";
+
+    delete box;
+
+    QStringList mod_reason;
+    mod_reason.append(text);
+
+    ao_app->send_server_packet(new AOPacket("ZZ", mod_reason));
+  } else {
+    ao_app->send_server_packet(new AOPacket("ZZ#%"));
+  }
 
   ui_ic_chat_message->setFocus();
 }

diff --git a/courtroom.h b/courtroom.h
@@ -43,6 +43,7 @@
 #include <QSignalMapper>
 #include <QMap>
 #include <QTextBrowser>
+#include <QInputDialog>
 
 class AOApplication;
 

diff --git a/lobby.cpp b/lobby.cpp
@@ -12,7 +12,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;
 
-  this->setWindowTitle("Attorney Online 2");
+  this->setWindowTitle("Attorney Online Vidya (AO2)");
 
   ui_background = new AOImage(this, ao_app);
   ui_public_servers = new AOButton(this, ao_app);

diff --git a/packet_distribution.cpp b/packet_distribution.cpp
@@ -195,6 +195,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       desk_mod_enabled = true;
     if (f_packet.contains("evidence",Qt::CaseInsensitive))
       evidence_enabled = true;
+    if (f_packet.contains("modcall_reason",Qt::CaseInsensitive))
+      modcall_reason_enabled = true;
   }
   else if (header == "PN")
   {