aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h4
-rw-r--r--include/aopacket.h4
-rw-r--r--include/courtroom.h12
-rw-r--r--include/encryption_functions.h15
-rw-r--r--include/hex_functions.h16
-rw-r--r--include/lobby.h1
6 files changed, 12 insertions, 40 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 60d945e..c06f3f9 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -63,14 +63,10 @@ public:
/////////////////server metadata//////////////////
- unsigned int s_decryptor = 5;
- bool encryption_needed = true;
-
bool yellow_text_enabled = false;
bool prezoom_enabled = false;
bool flipping_enabled = false;
bool custom_objection_enabled = false;
- bool improved_loading_enabled = false;
bool desk_mod_enabled = false;
bool evidence_enabled = false;
bool cccc_ic_support_enabled = false;
diff --git a/include/aopacket.h b/include/aopacket.h
index 4097be8..e636998 100644
--- a/include/aopacket.h
+++ b/include/aopacket.h
@@ -15,14 +15,10 @@ public:
QStringList &get_contents() { return m_contents; }
QString to_string();
- void encrypt_header(unsigned int p_key);
- void decrypt_header(unsigned int p_key);
-
void net_encode();
void net_decode();
private:
- bool encrypted = false;
QString m_header;
QStringList m_contents;
diff --git a/include/courtroom.h b/include/courtroom.h
index 38621c8..f05b15a 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -280,9 +280,12 @@ private:
// The character ID of the character this user wants to appear alongside with.
int other_charid = -1;
- // The offset this user has given if they want to appear alongside someone.
+ // The horizontal offset this user has given if they want to appear alongside someone.
int char_offset = 0;
+ // The vertical offset this user has given.
+ int char_vert_offset = 0;
+
// 0 = in front, 1 = behind
int pair_order = 0;
@@ -424,8 +427,12 @@ private:
// List of all currently available pos
QStringList pos_dropdown_list;
+ // is the message we're about to send supposed to present evidence?
bool is_presenting_evidence = false;
+ // have we already presented evidence for this message?
+ bool evidence_presented = false;
+
QString effect = "";
// Music effect flags we want to send to server when we play music
@@ -520,6 +527,7 @@ private:
AOButton *ui_pair_button;
QListWidget *ui_pair_list;
QSpinBox *ui_pair_offset_spinbox;
+ QSpinBox *ui_pair_vert_offset_spinbox;
QComboBox *ui_pair_order_dropdown;
@@ -701,6 +709,7 @@ private slots:
void music_random();
void music_list_expand_all();
void music_list_collapse_all();
+ void music_stop();
void on_area_list_double_clicked(QTreeWidgetItem *p_item, int column);
void select_emote(int p_id);
@@ -774,6 +783,7 @@ private slots:
void on_log_limit_changed(int value);
void on_pair_offset_changed(int value);
+ void on_pair_vert_offset_changed(int value);
void on_ooc_toggle_clicked();
diff --git a/include/encryption_functions.h b/include/encryption_functions.h
deleted file mode 100644
index b70e8e6..0000000
--- a/include/encryption_functions.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ENCRYPTION_FUNCTIONS_H
-#define ENCRYPTION_FUNCTIONS_H
-
-#include <QString>
-
-#include <QVector>
-#include <cstddef>
-#include <iomanip>
-#include <sstream>
-#include <stdlib.h>
-
-QString fanta_encrypt(QString p_input, unsigned int key);
-QString fanta_decrypt(QString p_input, unsigned int key);
-
-#endif // ENCRYPTION_FUNCTIONS_H
diff --git a/include/hex_functions.h b/include/hex_functions.h
deleted file mode 100644
index d178ba1..0000000
--- a/include/hex_functions.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef HEX_OPERATIONS_H
-#define HEX_OPERATIONS_H
-
-#include <algorithm>
-#include <bitset>
-#include <cstdint>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-namespace omni {
-std::string int_to_hex(unsigned int input);
-}
-
-#endif // HEX_OPERATIONS_H
diff --git a/include/lobby.h b/include/lobby.h
index 42f5297..4278534 100644
--- a/include/lobby.h
+++ b/include/lobby.h
@@ -46,6 +46,7 @@ public:
void set_loading_value(int p_value);
bool public_servers_selected = true;
+ bool doubleclicked = false;
~Lobby();