Run clang-format on entire project

Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style.
Lines reflow at 80 characters. One-line method bodies are on the same
line as the signature. Space always after `//`. No indentation
on preprocessor macros. Includes are sorted lexicographically.

If you don't want to see this commit on blames, use the hidden
whitespace option on GitHub, or use `-w` in git-blame.
This commit is contained in:
oldmud0 2020-04-17 21:57:16 -05:00
parent faac191f0b
commit 13942345c6
72 changed files with 9033 additions and 9134 deletions

View File

@ -16,6 +16,7 @@ HEADERS += $$files($$PWD/include/*.h)
LIBS += -L$$PWD/lib LIBS += -L$$PWD/lib
#DEFINES += DISCORD #DEFINES += DISCORD
contains(DEFINES, DISCORD) { contains(DEFINES, DISCORD) {

View File

@ -1,381 +1,381 @@
#ifndef AOAPPLICATION_H #ifndef AOAPPLICATION_H
#define AOAPPLICATION_H #define AOAPPLICATION_H
#include "aopacket.h" #include "aopacket.h"
#include "datatypes.h" #include "datatypes.h"
#include "discord_rich_presence.h" #include "discord_rich_presence.h"
#include <QApplication> #include <QApplication>
#include <QVector> #include <QFile>
#include <QFile> #include <QSettings>
#include <QSettings> #include <QVector>
#include <QDebug> #include <QDebug>
#include <QRect> #include <QDesktopWidget>
#include <QDesktopWidget> #include <QRect>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QDir> #include <QDir>
#include <QStandardPaths> #include <QStandardPaths>
#include <QTextStream> #include <QColor>
#include <QStringList> #include <QScreen>
#include <QColor> #include <QStringList>
#include <QScreen> #include <QTextStream>
#ifdef QTAUDIO #ifdef QTAUDIO
#include <QAudioDeviceInfo> #include <QAudioDeviceInfo>
#endif #endif
#include <QtConcurrent/QtConcurrent> #include <QFuture>
#include <QThread> #include <QThread>
#include <QThreadPool> #include <QThreadPool>
#include <QFuture> #include <QtConcurrent/QtConcurrent>
class NetworkManager; class NetworkManager;
class Lobby; class Lobby;
class Courtroom; class Courtroom;
class AOApplication : public QApplication {
class AOApplication : public QApplication Q_OBJECT
{
Q_OBJECT public:
AOApplication(int &argc, char **argv);
public: ~AOApplication();
AOApplication(int &argc, char **argv);
~AOApplication(); NetworkManager *net_manager;
Lobby *w_lobby;
NetworkManager *net_manager; Courtroom *w_courtroom;
Lobby *w_lobby; AttorneyOnline::Discord *discord;
Courtroom *w_courtroom;
AttorneyOnline::Discord *discord; bool lobby_constructed = false;
bool courtroom_constructed = false;
bool lobby_constructed = false;
bool courtroom_constructed = false; void construct_lobby();
void destruct_lobby();
void construct_lobby();
void destruct_lobby(); void construct_courtroom();
void destruct_courtroom();
void construct_courtroom();
void destruct_courtroom(); bool is_music_track(QString trackname);
bool is_music_track(QString trackname); void ms_packet_received(AOPacket *p_packet);
void server_packet_received(AOPacket *p_packet);
void ms_packet_received(AOPacket *p_packet);
void server_packet_received(AOPacket *p_packet); void send_ms_packet(AOPacket *p_packet);
void send_server_packet(AOPacket *p_packet, bool encoded = true);
void send_ms_packet(AOPacket *p_packet);
void send_server_packet(AOPacket *p_packet, bool encoded = true); void call_settings_menu();
void call_announce_menu(Courtroom *court);
void call_settings_menu();
void call_announce_menu(Courtroom *court); /////////////////server metadata//////////////////
/////////////////server metadata////////////////// unsigned int s_decryptor = 5;
bool encryption_needed = true;
unsigned int s_decryptor = 5;
bool encryption_needed = true; bool yellow_text_enabled = false;
bool prezoom_enabled = false;
bool yellow_text_enabled = false; bool flipping_enabled = false;
bool prezoom_enabled = false; bool custom_objection_enabled = false;
bool flipping_enabled = false; bool improved_loading_enabled = false;
bool custom_objection_enabled = false; bool desk_mod_enabled = false;
bool improved_loading_enabled = false; bool evidence_enabled = false;
bool desk_mod_enabled = false; bool cccc_ic_support_enabled = false;
bool evidence_enabled = false; bool arup_enabled = false;
bool cccc_ic_support_enabled = false; bool casing_alerts_enabled = false;
bool arup_enabled = false; bool modcall_reason_enabled = false;
bool casing_alerts_enabled = false; bool looping_sfx_support_enabled = false;
bool modcall_reason_enabled = false;
bool looping_sfx_support_enabled = false; ///////////////loading info///////////////////
///////////////loading info/////////////////// // player number, it's hardly used but might be needed for some old servers
int s_pv = 0;
//player number, it's hardly used but might be needed for some old servers
int s_pv = 0; QString server_software = "";
QString server_software = ""; int char_list_size = 0;
int loaded_chars = 0;
int char_list_size = 0; int generated_chars = 0;
int loaded_chars = 0; int evidence_list_size = 0;
int generated_chars = 0; int loaded_evidence = 0;
int evidence_list_size = 0; int music_list_size = 0;
int loaded_evidence = 0; int loaded_music = 0;
int music_list_size = 0; int area_count = 0;
int loaded_music = 0; bool courtroom_loaded = false;
int area_count = 0;
//////////////////versioning///////////////
bool courtroom_loaded = false;
int get_release() const { return RELEASE; }
//////////////////versioning/////////////// int get_major_version() const { return MAJOR_VERSION; }
int get_minor_version() const { return MINOR_VERSION; }
int get_release() const { return RELEASE; } QString get_version_string();
int get_major_version() const { return MAJOR_VERSION; }
int get_minor_version() const { return MINOR_VERSION; } ///////////////////////////////////////////
QString get_version_string();
void set_favorite_list();
/////////////////////////////////////////// QVector<server_type> &get_favorite_list() { return favorite_list; }
void add_favorite_server(int p_server);
void set_favorite_list();
QVector<server_type>& get_favorite_list() {return favorite_list;} void set_server_list();
void add_favorite_server(int p_server); QVector<server_type> &get_server_list() { return server_list; }
void set_server_list(); // reads the theme from config.ini and sets it accordingly
QVector<server_type>& get_server_list() {return server_list;} void reload_theme();
//reads the theme from config.ini and sets it accordingly // Returns the character the player has currently selected
void reload_theme(); QString get_current_char();
//Returns the character the player has currently selected // implementation in path_functions.cpp
QString get_current_char(); QString get_base_path();
QString get_data_path();
//implementation in path_functions.cpp QString get_theme_path(QString p_file);
QString get_base_path(); QString get_default_theme_path(QString p_file);
QString get_data_path(); QString get_custom_theme_path(QString p_theme, QString p_file);
QString get_theme_path(QString p_file); QString get_character_path(QString p_char, QString p_file);
QString get_default_theme_path(QString p_file); QString get_sounds_path(QString p_file);
QString get_custom_theme_path(QString p_theme, QString p_file); QString get_music_path(QString p_song);
QString get_character_path(QString p_char, QString p_file); QString get_background_path(QString p_file);
QString get_sounds_path(QString p_file); QString get_default_background_path(QString p_file);
QString get_music_path(QString p_song); QString get_evidence_path(QString p_file);
QString get_background_path(QString p_file); QString get_case_sensitive_path(QString p_file);
QString get_default_background_path(QString p_file);
QString get_evidence_path(QString p_file); ////// Functions for reading and writing files //////
QString get_case_sensitive_path(QString p_file); // Implementations file_functions.cpp
////// Functions for reading and writing files ////// // Instead of reinventing the wheel, we'll use a QSettings class.
// Implementations file_functions.cpp QSettings *configini;
// Instead of reinventing the wheel, we'll use a QSettings class. // Reads the theme from config.ini and loads it into the current_theme
QSettings *configini; // variable
QString read_theme();
//Reads the theme from config.ini and loads it into the current_theme variable
QString read_theme(); // Returns the value of ooc_name in config.ini
QString get_ooc_name();
//Returns the value of ooc_name in config.ini
QString get_ooc_name(); // Returns the blip rate from config.ini
int read_blip_rate();
//Returns the blip rate from config.ini
int read_blip_rate(); // Returns true if blank blips is enabled in config.ini and false otherwise
bool get_blank_blip();
//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 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 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();
//Returns the value of default_music in config.ini
int get_default_music(); // Returns the value of default_sfx in config.ini
int get_default_sfx();
//Returns the value of default_sfx in config.ini
int get_default_sfx(); // Returns the value of default_blip in config.ini
int get_default_blip();
//Returns the value of default_blip in config.ini
int get_default_blip(); // Returns the value of whether Discord should be enabled on startup
// from the config.ini.
// Returns the value of whether Discord should be enabled on startup bool is_discord_enabled();
// from the config.ini.
bool is_discord_enabled(); // Returns the value of whether shaking and flashing should be enabled.
// from the config.ini.
// Returns the value of whether shaking and flashing should be enabled. bool is_shakeandflash_enabled();
// from the config.ini.
bool is_shakeandflash_enabled(); // Returns whether evidence should be maintained ic
bool is_keepevi_enabled();
// Returns whether evidence should be maintained ic
bool is_keepevi_enabled(); // Returns the value of the maximum amount of lines the IC chatlog
// may contain, from config.ini.
// Returns the value of the maximum amount of lines the IC chatlog int get_max_log_size();
// may contain, from config.ini.
int get_max_log_size(); // Gets the punctuation delay modifier
int get_pundelay();
// Gets the punctuation delay modifier
int get_pundelay(); // Returns whether the log should go upwards (new behaviour)
// or downwards (vanilla behaviour).
// Returns whether the log should go upwards (new behaviour) bool get_log_goes_downwards();
// or downwards (vanilla behaviour).
bool get_log_goes_downwards(); // Returns the username the user may have set in config.ini.
QString get_default_username();
// Returns the username the user may have set in config.ini.
QString get_default_username(); // Returns the audio device used for the client.
QString get_audio_output_device();
// Returns the audio device used for the client. #ifdef QTAUDIO
QString get_audio_output_device(); QAudioDeviceInfo QtAudioDevice;
#ifdef QTAUDIO #endif
QAudioDeviceInfo QtAudioDevice;
#endif // Returns whether the user would like to have custom shownames on by default.
bool get_showname_enabled_by_default();
// Returns whether the user would like to have custom shownames on by default.
bool get_showname_enabled_by_default(); // Returns the list of words in callwords.ini
QStringList get_call_words();
//Returns the list of words in callwords.ini
QStringList get_call_words(); // Appends the argument string to serverlist.txt
void write_to_serverlist_txt(QString p_line);
//Appends the argument string to serverlist.txt
void write_to_serverlist_txt(QString p_line); // Returns the contents of serverlist.txt
QVector<server_type> read_serverlist_txt();
//Returns the contents of serverlist.txt
QVector<server_type> read_serverlist_txt(); // Returns the value of p_identifier in the design.ini file in p_design_path
QString read_design_ini(QString p_identifier, QString p_design_path);
//Returns the value of p_identifier in the design.ini file in p_design_path
QString read_design_ini(QString p_identifier, QString p_design_path); // Returns the coordinates of widget with p_identifier from p_file
QPoint get_button_spacing(QString p_identifier, QString p_file);
//Returns the coordinates of widget with p_identifier from p_file
QPoint get_button_spacing(QString p_identifier, QString p_file); // Returns the dimensions of widget with specified identifier from p_file
pos_size_type get_element_dimensions(QString p_identifier, QString p_file);
//Returns the dimensions of widget with specified identifier from p_file
pos_size_type get_element_dimensions(QString p_identifier, QString p_file); // Returns the name of the font with p_identifier from p_file
QString get_font_name(QString p_identifier, QString p_file);
//Returns the name of the font with p_identifier from p_file
QString get_font_name(QString p_identifier, QString p_file); // Returns the value of font_size with p_identifier from p_file
int get_font_size(QString p_identifier, QString p_file);
//Returns the value of font_size with p_identifier from p_file
int get_font_size(QString p_identifier, QString p_file); // Returns the color with p_identifier from p_file
QColor get_color(QString p_identifier, QString p_file);
//Returns the color with p_identifier from p_file
QColor get_color(QString p_identifier, QString p_file); // Returns the colour from the misc folder.
QColor get_chat_color(QString p_identifier, QString p_chat);
// Returns the colour from the misc folder.
QColor get_chat_color(QString p_identifier, QString p_chat); // Returns the sfx with p_identifier from sounds.ini in the current theme path
QString get_sfx(QString p_identifier);
//Returns the sfx with p_identifier from sounds.ini in the current theme path
QString get_sfx(QString p_identifier); // Figure out if we can opus this or if we should fall back to wav
QString get_sfx_suffix(QString sound_to_check);
//Figure out if we can opus this or if we should fall back to wav
QString get_sfx_suffix(QString sound_to_check); // figure out if we can find what prefix this song uses
QString get_music_prefix(QString song_to_check);
// figure out if we can find what prefix this song uses
QString get_music_prefix(QString song_to_check);
// Can we use APNG for this? If not, WEBP? if not, GIF? If not, fall back to a // Can we use APNG for this? If not, WEBP? if not, GIF? If not, fall back to a
// gif. // gif.
QString get_image_suffix(QString path_to_check); QString get_image_suffix(QString path_to_check);
//Returns the value of p_search_line within target_tag and terminator_tag // Returns the value of p_search_line within target_tag and terminator_tag
QString read_char_ini(QString p_char, QString p_search_line, QString target_tag); QString read_char_ini(QString p_char, QString p_search_line,
QString target_tag);
//Returns the side of the p_char character from that characters ini file
QString get_char_side(QString p_char); // Returns the side of the p_char character from that characters ini file
QString get_char_side(QString p_char);
//Returns the showname from the ini of p_char
QString get_showname(QString p_char); // Returns the showname from the ini of p_char
QString get_showname(QString p_char);
//Returns the value of chat from the specific p_char's ini file
QString get_chat(QString p_char); // Returns the value of chat from the specific p_char's ini file
QString get_chat(QString p_char);
//Returns the value of shouts from the specified p_char's ini file
QString get_char_shouts(QString p_char); // Returns the value of shouts from the specified p_char's ini file
QString get_char_shouts(QString p_char);
//Returns the preanim duration of p_char's p_emote
int get_preanim_duration(QString p_char, QString p_emote); // 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); // Same as above, but only returns if it has a % in front(refer to Preanims
// section in the manual)
//Not in use int get_ao2_preanim_duration(QString p_char, QString p_emote);
int get_text_delay(QString p_char, QString p_emote);
// Not in use
// Returns the custom realisation used by the character. int get_text_delay(QString p_char, QString p_emote);
QString get_custom_realization(QString p_char);
// Returns the custom realisation used by the character.
//Returns the name of p_char QString get_custom_realization(QString p_char);
QString get_char_name(QString p_char);
// Returns the name of p_char
//Returns the total amount of emotes of p_char QString get_char_name(QString p_char);
int get_emote_number(QString p_char);
// Returns the total amount of emotes of p_char
//Returns the emote comment of p_char's p_emote int get_emote_number(QString p_char);
QString get_emote_comment(QString p_char, int p_emote);
// Returns the emote comment of p_char's p_emote
//Returns the base name of p_char's p_emote QString get_emote_comment(QString p_char, int p_emote);
QString get_emote(QString p_char, int p_emote);
// Returns if an emote loops it's SFX
//Returns the preanimation name of p_char's p_emote QString get_sfx_looping(QString p_char, int p_emote);
QString get_pre_emote(QString p_char, int p_emote);
// Returns if an emote has a frame specific SFX for it
//Returns the sfx of p_char's p_emote QString get_frame_sfx_name(QString p_char, QString p_emote, int n_frame);
QString get_sfx_name(QString p_char, int p_emote);
// Returns if an emote has a frame specific SFX for it
//Returns if an emote loops it's SFX QString get_realization_frame(QString p_char, QString p_emote, int n_frame);
QString get_sfx_looping(QString p_char, int p_emote);
// Returns if an emote has a frame specific SFX for it
//Returns if an emote has a frame specific SFX for it QString get_screenshake_frame(QString p_char, QString p_emote, int n_frame);
QString get_frame_sfx_name(QString p_char, QString p_emote, int n_frame);
// Returns the base name of p_char's p_emote
//Returns if an emote has a frame specific SFX for it QString get_emote(QString p_char, int p_emote);
QString get_realization_frame(QString p_char, QString p_emote, int n_frame);
// Returns the preanimation name of p_char's p_emote
//Returns if an emote has a frame specific SFX for it QString get_pre_emote(QString p_char, int p_emote);
QString get_screenshake_frame(QString p_char, QString p_emote, int n_frame);
// Returns the sfx of p_char's p_emote
//Not in use QString get_sfx_name(QString p_char, int p_emote);
int get_sfx_delay(QString p_char, int p_emote);
// Not in use
//Returns the modifier for p_char's p_emote int get_sfx_delay(QString p_char, int p_emote);
int get_emote_mod(QString p_char, int p_emote);
// Returns the modifier for p_char's p_emote
//Returns the desk modifier for p_char's p_emote int get_emote_mod(QString p_char, int p_emote);
int get_desk_mod(QString p_char, int p_emote);
// Returns the desk modifier for p_char's p_emote
//Returns p_char's gender int get_desk_mod(QString p_char, int p_emote);
QString get_gender(QString p_char);
// Returns p_char's gender
// ====== QString get_gender(QString p_char);
// These are all casing-related settings.
// ====== // ======
// These are all casing-related settings.
// Returns if the user has casing alerts enabled. // ======
bool get_casing_enabled();
// Returns if the user has casing alerts enabled.
// Returns if the user wants to get alerts for the defence role. bool get_casing_enabled();
bool get_casing_defence_enabled();
// Returns if the user wants to get alerts for the defence role.
// Same for prosecution. bool get_casing_defence_enabled();
bool get_casing_prosecution_enabled();
// Same for prosecution.
// Same for judge. bool get_casing_prosecution_enabled();
bool get_casing_judge_enabled();
// Same for judge.
// Same for juror. bool get_casing_judge_enabled();
bool get_casing_juror_enabled();
// Same for witnesses.
// Same for steno. bool get_casing_wit_enabled();
bool get_casing_steno_enabled();
// Same for juror.
// Same for CM. bool get_casing_juror_enabled();
bool get_casing_cm_enabled();
// Same for steno.
// Same for witnesses. bool get_casing_steno_enabled();
bool get_casing_wit_enabled();
// Same for CM.
// Get the message for the CM for casing alerts. bool get_casing_cm_enabled();
QString get_casing_can_host_cases();
// Get the message for the CM for casing alerts.
// Get if html for ic log is enabled QString get_casing_can_host_cases();
bool get_colored_iclog_enabled();
// Get if html for ic log is enabled
// Get if ic log mirror is enabled bool get_colored_iclog_enabled();
bool get_iclmir_enabled();
// Get if ic log mirror is enabled
// Get if only inline coloring should be shown in log bool get_iclmir_enabled();
bool colorlog_restricted_enabled();
// Get if only inline coloring should be shown in log
private: bool colorlog_restricted_enabled();
const int RELEASE = 2;
const int MAJOR_VERSION = 7; private:
const int MINOR_VERSION = 0; const int RELEASE = 2;
const int MAJOR_VERSION = 7;
QString current_theme = "default"; const int MINOR_VERSION = 0;
QVector<server_type> server_list; QString current_theme = "default";
QVector<server_type> favorite_list;
QVector<server_type> server_list;
private slots: QVector<server_type> favorite_list;
void ms_connect_finished(bool connected, bool will_retry);
private slots:
public slots: void ms_connect_finished(bool connected, bool will_retry);
void server_disconnected();
void loading_cancelled(); public slots:
}; void server_disconnected();
void loading_cancelled();
#endif // AOAPPLICATION_H };
#endif // AOAPPLICATION_H

View File

@ -9,13 +9,11 @@
#include "aoapplication.h" #include "aoapplication.h"
#include <QDebug>
#include <QWidget> #include <QWidget>
#include <string.h> #include <string.h>
#include <QDebug>
class AOBlipPlayer {
class AOBlipPlayer
{
public: public:
AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app);
@ -32,11 +30,11 @@ private:
void set_volume_internal(qreal p_volume); void set_volume_internal(qreal p_volume);
#if defined(BASSAUDIO) #if defined(BASSAUDIO)
HSTREAM m_stream_list[5]; HSTREAM m_stream_list[5];
#elif defined(QTAUDIO) #elif defined(QTAUDIO)
QSoundEffect m_blips; QSoundEffect m_blips;
#endif #endif
}; };
#endif // AOBLIPPLAYER_H #endif // AOBLIPPLAYER_H

View File

@ -3,11 +3,10 @@
#include "aoapplication.h" #include "aoapplication.h"
#include <QPushButton>
#include <QDebug> #include <QDebug>
#include <QPushButton>
class AOButton : public QPushButton class AOButton : public QPushButton {
{
Q_OBJECT Q_OBJECT
public: public:

View File

@ -4,20 +4,21 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "courtroom.h" #include "courtroom.h"
#include <QtWidgets/QDialog>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QCheckBox> #include <QtWidgets/QCheckBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QLabel> #include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit> #include <QtWidgets/QLineEdit>
#include <QtWidgets/QVBoxLayout>
class AOCaseAnnouncerDialog : public QDialog class AOCaseAnnouncerDialog : public QDialog {
{
Q_OBJECT Q_OBJECT
public: public:
explicit AOCaseAnnouncerDialog(QWidget *parent = nullptr, AOApplication *p_ao_app = nullptr, Courtroom *p_court = nullptr); explicit AOCaseAnnouncerDialog(QWidget *parent = nullptr,
AOApplication *p_ao_app = nullptr,
Courtroom *p_court = nullptr);
private: private:
AOApplication *ao_app; AOApplication *ao_app;

View File

@ -4,17 +4,17 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "aoimage.h" #include "aoimage.h"
#include <QFile>
#include <QPushButton> #include <QPushButton>
#include <QString> #include <QString>
#include <QWidget> #include <QWidget>
#include <QFile>
class AOCharButton : public QPushButton class AOCharButton : public QPushButton {
{
Q_OBJECT Q_OBJECT
public: public:
AOCharButton(QWidget *parent, AOApplication *p_ao_app, int x_pos, int y_pos, bool is_taken); AOCharButton(QWidget *parent, AOApplication *p_ao_app, int x_pos, int y_pos,
bool is_taken);
AOApplication *ao_app; AOApplication *ao_app;

View File

@ -1,19 +1,17 @@
#ifndef AOCHARMOVIE_H #ifndef AOCHARMOVIE_H
#define AOCHARMOVIE_H #define AOCHARMOVIE_H
#include <QMovie>
#include <QLabel>
#include <QTimer>
#include <QDebug>
#include <QImageReader>
#include <QPainter>
#include "include/aosfxplayer.h" #include "include/aosfxplayer.h"
#include "include/courtroom.h" #include "include/courtroom.h"
#include <QDebug>
#include <QImageReader>
#include <QLabel>
#include <QMovie>
#include <QPainter>
#include <QTimer>
class AOApplication; class AOApplication;
class AOCharMovie : public QLabel class AOCharMovie : public QLabel {
{
Q_OBJECT Q_OBJECT
public: public:
@ -24,12 +22,10 @@ public:
void play_talking(QString p_char, QString p_emote); void play_talking(QString p_char, QString p_emote);
void play_idle(QString p_char, QString p_emote); void play_idle(QString p_char, QString p_emote);
void set_flipped(bool p_flipped) {m_flipped = p_flipped;} void set_flipped(bool p_flipped) { m_flipped = p_flipped; }
void LoadImageWithStupidMethodForFlipSupport(QImage image); void LoadImageWithStupidMethodForFlipSupport(QImage image);
void stop(); void stop();
void move(int ax, int ay);
void combo_resize(int w, int h);
void play_frame_sfx(); void play_frame_sfx();
void sfx_two_network_boogaloo(); void sfx_two_network_boogaloo();
@ -42,6 +38,10 @@ public:
QString frame_screenshake_hellstring = ""; QString frame_screenshake_hellstring = "";
QString frame_realization_hellstring = ""; QString frame_realization_hellstring = "";
bool use_networked_framehell = false; bool use_networked_framehell = false;
void move(int ax, int ay);
void combo_resize(int w, int h);
private: private:
AOApplication *ao_app; AOApplication *ao_app;
@ -52,14 +52,15 @@ private:
QString last_path; QString last_path;
QString current_emote; QString current_emote;
QString current_char; QString current_char;
int default_w;
int default_h;
const int time_mod = 62; const int time_mod = 62;
// These are the X and Y values before they are fixed based on the sprite's width. // These are the X and Y values before they are fixed based on the sprite's
// width.
int x = 0; int x = 0;
int y = 0; int y = 0;
int default_w;
int default_h;
bool m_flipped = false; bool m_flipped = false;

View File

@ -3,22 +3,21 @@
#include "aoapplication.h" #include "aoapplication.h"
#include <QPushButton>
#include <QDebug> #include <QDebug>
#include <QPushButton>
class AOEmoteButton : public QPushButton class AOEmoteButton : public QPushButton {
{
Q_OBJECT Q_OBJECT
public: public:
AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y); AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y);
//void set_on(QString p_char, int p_emote); // void set_on(QString p_char, int p_emote);
//void set_off(QString p_char, int p_emote); // void set_off(QString p_char, int p_emote);
void set_image(QString p_char, int p_emote, QString suffix); void set_image(QString p_char, int p_emote, QString suffix);
void set_id(int p_id) {m_id = p_id;} void set_id(int p_id) { m_id = p_id; }
int get_id() {return m_id;} int get_id() { return m_id; }
private: private:
QWidget *parent; QWidget *parent;

View File

@ -4,21 +4,21 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "aoimage.h" #include "aoimage.h"
#include <QDebug>
#include <QPushButton> #include <QPushButton>
#include <QString> #include <QString>
#include <QDebug>
class AOEvidenceButton : public QPushButton class AOEvidenceButton : public QPushButton {
{
Q_OBJECT Q_OBJECT
public: public:
AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y); AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x,
int p_y);
void reset(); void reset();
void set_image(QString p_image); void set_image(QString p_image);
void set_theme_image(QString p_image); void set_theme_image(QString p_image);
void set_id(int p_id) {m_id = p_id;} void set_id(int p_id) { m_id = p_id; }
void set_selected(bool p_selected); void set_selected(bool p_selected);

View File

@ -4,19 +4,18 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "aosfxplayer.h" #include "aosfxplayer.h"
#include <QDebug>
#include <QLabel> #include <QLabel>
#include <QMovie> #include <QMovie>
#include <QDebug>
class AOEvidenceDisplay : public QLabel class AOEvidenceDisplay : public QLabel {
{
Q_OBJECT Q_OBJECT
public: public:
AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app); AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app);
void show_evidence(QString p_evidence_image, bool is_left_side, int p_volume); void show_evidence(QString p_evidence_image, bool is_left_side, int p_volume);
QLabel* get_evidence_icon(); QLabel *get_evidence_icon();
void reset(); void reset();
private: private:

View File

@ -1,15 +1,14 @@
//This class represents a static theme-dependent image // This class represents a static theme-dependent image
#ifndef AOIMAGE_H #ifndef AOIMAGE_H
#define AOIMAGE_H #define AOIMAGE_H
#include "aoapplication.h" #include "aoapplication.h"
#include <QLabel>
#include <QDebug> #include <QDebug>
#include <QLabel>
class AOImage : public QLabel class AOImage : public QLabel {
{
public: public:
AOImage(QWidget *parent, AOApplication *p_ao_app); AOImage(QWidget *parent, AOApplication *p_ao_app);
~AOImage(); ~AOImage();

View File

@ -4,8 +4,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QMouseEvent> #include <QMouseEvent>
class AOLineEdit : public QLineEdit class AOLineEdit : public QLineEdit {
{
Q_OBJECT Q_OBJECT
public: public:
@ -19,8 +18,6 @@ signals:
private slots: private slots:
void on_enter_pressed(); void on_enter_pressed();
}; };
#endif // AOLINEEDIT_H #endif // AOLINEEDIT_H

View File

@ -7,8 +7,7 @@
class Courtroom; class Courtroom;
class AOApplication; class AOApplication;
class AOMovie : public QLabel class AOMovie : public QLabel {
{
Q_OBJECT Q_OBJECT
public: public:

View File

@ -9,15 +9,14 @@
#include "aoapplication.h" #include "aoapplication.h"
#include <QDebug>
#include <QObject>
#include <QTimer>
#include <QWidget> #include <QWidget>
#include <string.h> #include <string.h>
#include <QDebug>
#include <QTimer>
#include <QObject>
#if defined(BASSAUDIO) #if defined(BASSAUDIO)
class AOMusicPlayer : public QObject class AOMusicPlayer : public QObject {
{
Q_OBJECT Q_OBJECT
public: public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
@ -38,11 +37,9 @@ private:
QString f_path; QString f_path;
HSTREAM m_stream; HSTREAM m_stream;
}; };
#elif defined(QTAUDIO) #elif defined(QTAUDIO)
class AOMusicPlayer : public QObject class AOMusicPlayer : public QObject {
{
public: public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
~AOMusicPlayer(); ~AOMusicPlayer();
@ -64,8 +61,7 @@ private:
QString f_path; QString f_path;
}; };
#else #else
class AOMusicPlayer : public QObject class AOMusicPlayer : public QObject {
{
public: public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
~AOMusicPlayer(); ~AOMusicPlayer();

View File

@ -1,150 +1,152 @@
#ifndef AOOPTIONSDIALOG_H #ifndef AOOPTIONSDIALOG_H
#define AOOPTIONSDIALOG_H #define AOOPTIONSDIALOG_H
#include "aoapplication.h" #include "aoapplication.h"
#ifdef BASSAUDIO #ifdef BASSAUDIO
#include "bass.h" #include "bass.h"
#elif defined QTAUDIO #elif defined QTAUDIO
#include <QAudio> #include <QAudio>
#include <QAudioDeviceInfo> #include <QAudioDeviceInfo>
#endif #endif
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox> #include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox> #include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog> #include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox> #include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFormLayout> #include <QtWidgets/QFormLayout>
#include <QtWidgets/QFrame> #include <QtWidgets/QFrame>
#include <QtWidgets/QLabel> #include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit> #include <QtWidgets/QLineEdit>
#include <QtWidgets/QPlainTextEdit> #include <QtWidgets/QPlainTextEdit>
#include <QtWidgets/QSpinBox> #include <QtWidgets/QSpinBox>
#include <QtWidgets/QTabWidget> #include <QtWidgets/QTabWidget>
#include <QtWidgets/QVBoxLayout> #include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include <QDirIterator> #include <QDirIterator>
#include <QTextStream> #include <QTextStream>
class AOOptionsDialog: public QDialog class AOOptionsDialog : public QDialog {
{ Q_OBJECT
Q_OBJECT public:
public: explicit AOOptionsDialog(QWidget *parent = nullptr,
explicit AOOptionsDialog(QWidget *parent = nullptr, AOApplication *p_ao_app = nullptr); AOApplication *p_ao_app = nullptr);
private: private:
AOApplication *ao_app; AOApplication *ao_app;
QVBoxLayout *ui_vertical_layout; QVBoxLayout *ui_vertical_layout;
QTabWidget *ui_settings_tabs; QTabWidget *ui_settings_tabs;
QWidget *ui_gameplay_tab; QWidget *ui_gameplay_tab;
QWidget *ui_form_layout_widget; QWidget *ui_form_layout_widget;
QFormLayout *ui_gameplay_form; QFormLayout *ui_gameplay_form;
QLabel *ui_theme_label; QLabel *ui_theme_label;
QComboBox *ui_theme_combobox; QComboBox *ui_theme_combobox;
QFrame *ui_theme_log_divider; QFrame *ui_theme_log_divider;
QLabel *ui_downwards_lbl; QLabel *ui_downwards_lbl;
QCheckBox *ui_downwards_cb; QCheckBox *ui_downwards_cb;
QLabel *ui_length_lbl; QLabel *ui_length_lbl;
QSpinBox *ui_length_spinbox; QSpinBox *ui_length_spinbox;
QLabel *ui_pun_delay; QLabel *ui_pun_delay;
QSpinBox *ui_pun_delay_spinbox; QSpinBox *ui_pun_delay_spinbox;
QFrame *ui_log_names_divider; QFrame *ui_log_names_divider;
QLineEdit *ui_username_textbox; QLineEdit *ui_username_textbox;
QLabel *ui_username_lbl; QLabel *ui_username_lbl;
QLabel *ui_showname_lbl; QLabel *ui_showname_lbl;
QCheckBox *ui_showname_cb; QCheckBox *ui_showname_cb;
QFrame *ui_net_divider; QFrame *ui_net_divider;
QLabel *ui_ms_lbl; QLabel *ui_ms_lbl;
QLineEdit *ui_ms_textbox; QLineEdit *ui_ms_textbox;
QLabel *ui_discord_lbl; QLabel *ui_discord_lbl;
QCheckBox *ui_discord_cb; QLabel *ui_epilepsy_lbl;
QLabel *ui_epilepsy_lbl; QCheckBox *ui_epilepsy_cb;
QCheckBox *ui_epilepsy_cb;
QLabel *ui_language_label; QCheckBox *ui_discord_cb;
QComboBox *ui_language_combobox; QLabel *ui_language_label;
QComboBox *ui_language_combobox;
QLabel *ui_keepevi_lbl; QLabel *ui_keepevi_lbl;
QCheckBox *ui_keepevi_cb; QCheckBox *ui_keepevi_cb;
QLabel *ui_keepcobj_lbl; QLabel *ui_keepcobj_lbl;
QCheckBox *ui_keepcobj_cb; QCheckBox *ui_keepcobj_cb;
QWidget *ui_callwords_tab; QWidget *ui_callwords_tab;
QWidget *ui_callwords_widget; QWidget *ui_callwords_widget;
QVBoxLayout *ui_callwords_layout; QVBoxLayout *ui_callwords_layout;
QPlainTextEdit *ui_callwords_textbox; QPlainTextEdit *ui_callwords_textbox;
QLabel *ui_callwords_explain_lbl; QLabel *ui_callwords_explain_lbl;
QCheckBox *ui_callwords_char_textbox; QCheckBox *ui_callwords_char_textbox;
QWidget *ui_audio_tab; QWidget *ui_audio_tab;
QWidget *ui_audio_widget; QWidget *ui_audio_widget;
QFormLayout *ui_audio_layout; QFormLayout *ui_audio_layout;
QLabel *ui_audio_device_lbl; QLabel *ui_audio_device_lbl;
QComboBox *ui_audio_device_combobox; QComboBox *ui_audio_device_combobox;
QFrame *ui_audio_volume_divider; QFrame *ui_audio_volume_divider;
QSpinBox *ui_music_volume_spinbox; QSpinBox *ui_music_volume_spinbox;
QLabel *ui_music_volume_lbl; QLabel *ui_music_volume_lbl;
QSpinBox *ui_sfx_volume_spinbox; QSpinBox *ui_sfx_volume_spinbox;
QSpinBox *ui_blips_volume_spinbox; QLabel *ui_loopsfx_lbl;
QLabel *ui_sfx_volume_lbl; QCheckBox *ui_loopsfx_cb;
QLabel *ui_blips_volume_lbl; QLabel *ui_objectmusic_lbl;
QFrame *ui_volume_blip_divider; QCheckBox *ui_objectmusic_cb;
QSpinBox *ui_bliprate_spinbox;
QLabel *ui_bliprate_lbl; QSpinBox *ui_blips_volume_spinbox;
QCheckBox *ui_blank_blips_cb; QLabel *ui_sfx_volume_lbl;
QLabel *ui_blank_blips_lbl; QLabel *ui_blips_volume_lbl;
QLabel *ui_loopsfx_lbl; QFrame *ui_volume_blip_divider;
QCheckBox *ui_loopsfx_cb; QSpinBox *ui_bliprate_spinbox;
QLabel *ui_objectmusic_lbl; QLabel *ui_bliprate_lbl;
QCheckBox *ui_objectmusic_cb; QCheckBox *ui_blank_blips_cb;
QDialogButtonBox *ui_settings_buttons; QLabel *ui_blank_blips_lbl;
QDialogButtonBox *ui_settings_buttons;
QWidget *ui_casing_tab;
QWidget *ui_casing_widget; QWidget *ui_casing_tab;
QFormLayout *ui_casing_layout; QWidget *ui_casing_widget;
QLabel *ui_casing_supported_lbl; QFormLayout *ui_casing_layout;
QLabel *ui_casing_enabled_lbl; QLabel *ui_casing_supported_lbl;
QCheckBox *ui_casing_enabled_cb; QLabel *ui_casing_enabled_lbl;
QLabel *ui_casing_def_lbl; QCheckBox *ui_casing_enabled_cb;
QCheckBox *ui_casing_def_cb; QLabel *ui_casing_def_lbl;
QLabel *ui_casing_pro_lbl; QCheckBox *ui_casing_def_cb;
QCheckBox *ui_casing_pro_cb; QLabel *ui_casing_pro_lbl;
QLabel *ui_casing_jud_lbl; QCheckBox *ui_casing_pro_cb;
QCheckBox *ui_casing_jud_cb; QLabel *ui_casing_jud_lbl;
QLabel *ui_casing_jur_lbl; QCheckBox *ui_casing_jud_cb;
QCheckBox *ui_casing_jur_cb; QLabel *ui_casing_jur_lbl;
QLabel *ui_casing_steno_lbl; QCheckBox *ui_casing_jur_cb;
QCheckBox *ui_casing_steno_cb; QLabel *ui_casing_steno_lbl;
QLabel *ui_casing_cm_lbl; QCheckBox *ui_casing_steno_cb;
QCheckBox *ui_casing_cm_cb; QLabel *ui_casing_cm_lbl;
QLabel *ui_casing_wit_lbl; QCheckBox *ui_casing_cm_cb;
QCheckBox *ui_casing_wit_cb; QLabel *ui_casing_wit_lbl;
QLabel *ui_casing_cm_cases_lbl; QCheckBox *ui_casing_wit_cb;
QLineEdit *ui_casing_cm_cases_textbox; QLabel *ui_casing_cm_cases_lbl;
QLineEdit *ui_casing_cm_cases_textbox;
QWidget *ui_other_tab;
QWidget *ui_other_widget; QWidget *ui_other_tab;
QFormLayout *ui_other_layout; QWidget *ui_other_widget;
QLabel *ui_other_fancy_icl_enabled_lb; QFormLayout *ui_other_layout;
QCheckBox *ui_other_fancy_icl_enabled_cb; QLabel *ui_other_fancy_icl_enabled_lb;
QLabel *ui_other_mirror_icl_enabled_lb; QCheckBox *ui_other_fancy_icl_enabled_cb;
QCheckBox *ui_other_mirror_icl_enabled_cb; QLabel *ui_other_mirror_icl_enabled_lb;
QCheckBox *ui_other_mirror_icl_enabled_cb;
QLabel *ui_other_fancy_icl_limit_lb;
QCheckBox *ui_other_fancy_icl_limit_cb; QLabel *ui_other_fancy_icl_limit_lb;
QCheckBox *ui_other_fancy_icl_limit_cb;
bool needs_default_audiodev(); bool needs_default_audiodev();
signals: signals:
public slots: public slots:
void save_pressed(); void save_pressed();
void discard_pressed(); void discard_pressed();
}; };
#endif // AOOPTIONSDIALOG_H #endif // AOOPTIONSDIALOG_H

View File

@ -1,19 +1,18 @@
#ifndef AOPACKET_H #ifndef AOPACKET_H
#define AOPACKET_H #define AOPACKET_H
#include <QDebug>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QDebug>
class AOPacket class AOPacket {
{
public: public:
AOPacket(QString p_packet_string); AOPacket(QString p_packet_string);
AOPacket(QString header, QStringList &p_contents); AOPacket(QString header, QStringList &p_contents);
~AOPacket(); ~AOPacket();
QString get_header() {return m_header;} QString get_header() { return m_header; }
QStringList &get_contents() {return m_contents;} QStringList &get_contents() { return m_contents; }
QString to_string(); QString to_string();
void encrypt_header(unsigned int p_key); void encrypt_header(unsigned int p_key);

View File

@ -1,15 +1,14 @@
#ifndef AOSCENE_H #ifndef AOSCENE_H
#define AOSCENE_H #define AOSCENE_H
#include <QLabel>
#include <QDebug> #include <QDebug>
#include <QLabel>
#include <QMovie> #include <QMovie>
class Courtroom; class Courtroom;
class AOApplication; class AOApplication;
class AOScene : public QLabel class AOScene : public QLabel {
{
Q_OBJECT Q_OBJECT
public: public:
explicit AOScene(QWidget *parent, AOApplication *p_ao_app); explicit AOScene(QWidget *parent, AOApplication *p_ao_app);

View File

@ -9,13 +9,12 @@
#include "aoapplication.h" #include "aoapplication.h"
#include <QWidget>
#include <string.h>
#include <QDebug> #include <QDebug>
#include <QTimer> #include <QTimer>
#include <QWidget>
#include <string.h>
class AOSfxPlayer : public QObject class AOSfxPlayer : public QObject {
{
Q_OBJECT Q_OBJECT
public: public:
AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app);
@ -33,11 +32,11 @@ private:
void set_volume_internal(qreal p_volume); void set_volume_internal(qreal p_volume);
#if defined(BASSAUDIO) #if defined(BASSAUDIO)
HSTREAM m_stream; HSTREAM m_stream;
#elif defined(QTAUDIO) #elif defined(QTAUDIO)
QSoundEffect m_sfx; QSoundEffect m_sfx;
#endif #endif
}; };
#endif // AOSFXPLAYER_H #endif // AOSFXPLAYER_H

View File

@ -1,14 +1,13 @@
#ifndef AOTEXTAREA_H #ifndef AOTEXTAREA_H
#define AOTEXTAREA_H #define AOTEXTAREA_H
#include <QTextBrowser>
#include <QScrollBar>
#include <QTextCursor>
#include <QRegExp>
#include <QDebug> #include <QDebug>
#include <QRegExp>
#include <QScrollBar>
#include <QTextBrowser>
#include <QTextCursor>
class AOTextArea : public QTextBrowser class AOTextArea : public QTextBrowser {
{
public: public:
AOTextArea(QWidget *p_parent = nullptr); AOTextArea(QWidget *p_parent = nullptr);
@ -19,7 +18,8 @@ public:
private: private:
const QRegExp omnis_dank_url_regex = QRegExp("\\b(https?://\\S+\\.\\S+)\\b"); const QRegExp omnis_dank_url_regex = QRegExp("\\b(https?://\\S+\\.\\S+)\\b");
void auto_scroll(QTextCursor old_cursor, int scrollbar_value, bool is_scrolled_down); void auto_scroll(QTextCursor old_cursor, int scrollbar_value,
bool is_scrolled_down);
}; };
#endif // AOTEXTAREA_H #endif // AOTEXTAREA_H

View File

@ -3,8 +3,7 @@
#include <QPlainTextEdit> #include <QPlainTextEdit>
class AOTextEdit : public QPlainTextEdit class AOTextEdit : public QPlainTextEdit {
{
Q_OBJECT Q_OBJECT
public: public:
AOTextEdit(QWidget *parent); AOTextEdit(QWidget *parent);
@ -17,7 +16,6 @@ signals:
private slots: private slots:
void on_enter_pressed(); void on_enter_pressed();
}; };
#endif // AOTEXTEDIT_H #endif // AOTEXTEDIT_H

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,10 @@
#ifndef CHATLOGPIECE_H #ifndef CHATLOGPIECE_H
#define CHATLOGPIECE_H #define CHATLOGPIECE_H
#include <QString>
#include <QDateTime> #include <QDateTime>
#include <QString>
class chatlogpiece class chatlogpiece {
{
public: public:
chatlogpiece(); chatlogpiece();
chatlogpiece(QString p_name, QString p_showname, QString p_message, chatlogpiece(QString p_name, QString p_showname, QString p_message,

File diff suppressed because it is too large Load Diff

View File

@ -3,16 +3,14 @@
#include <QString> #include <QString>
struct server_type struct server_type {
{
QString name; QString name;
QString desc; QString desc;
QString ip; QString ip;
int port; int port;
}; };
struct emote_type struct emote_type {
{
QString comment; QString comment;
QString preanim; QString preanim;
QString anim; QString anim;
@ -22,23 +20,20 @@ struct emote_type
int sfx_duration; int sfx_duration;
}; };
struct char_type struct char_type {
{
QString name; QString name;
QString description; QString description;
QString evidence_string; QString evidence_string;
bool taken; bool taken;
}; };
struct evi_type struct evi_type {
{
QString name; QString name;
QString description; QString description;
QString image; QString image;
}; };
struct chatmessage_type struct chatmessage_type {
{
QString message; QString message;
QString character; QString character;
QString side; QString side;
@ -55,29 +50,25 @@ struct chatmessage_type
int flip; int flip;
}; };
struct area_type struct area_type {
{
QString name; QString name;
QString background; QString background;
bool passworded; bool passworded;
}; };
struct pos_type struct pos_type {
{
int x; int x;
int y; int y;
}; };
struct pos_size_type struct pos_size_type {
{
int x = 0; int x = 0;
int y = 0; int y = 0;
int width = 0; int width = 0;
int height = 0; int height = 0;
}; };
enum CHAT_MESSAGE enum CHAT_MESSAGE {
{
DESK_MOD = 0, DESK_MOD = 0,
PRE_EMOTE, PRE_EMOTE,
CHAR_NAME, CHAR_NAME,
@ -108,17 +99,6 @@ enum CHAT_MESSAGE
FRAME_SFX FRAME_SFX
}; };
enum COLOR enum COLOR { WHITE = 0, GREEN, RED, ORANGE, BLUE, YELLOW, RAINBOW, PINK, CYAN };
{
WHITE = 0,
GREEN,
RED,
ORANGE,
BLUE,
YELLOW,
RAINBOW,
PINK,
CYAN
};
#endif // DATATYPES_H #endif // DATATYPES_H

View File

@ -1,8 +1,8 @@
#ifndef DEBUG_FUNCTIONS_H #ifndef DEBUG_FUNCTIONS_H
#define DEBUG_FUNCTIONS_H #define DEBUG_FUNCTIONS_H
#include <QString>
#include <QMessageBox> #include <QMessageBox>
#include <QString>
void call_error(QString message); void call_error(QString message);
void call_notice(QString message); void call_notice(QString message);

View File

@ -24,61 +24,63 @@ extern "C" {
#endif #endif
typedef struct DiscordRichPresence { typedef struct DiscordRichPresence {
const char* state; /* max 128 bytes */ const char *state; /* max 128 bytes */
const char* details; /* max 128 bytes */ const char *details; /* max 128 bytes */
int64_t startTimestamp; int64_t startTimestamp;
int64_t endTimestamp; int64_t endTimestamp;
const char* largeImageKey; /* max 32 bytes */ const char *largeImageKey; /* max 32 bytes */
const char* largeImageText; /* max 128 bytes */ const char *largeImageText; /* max 128 bytes */
const char* smallImageKey; /* max 32 bytes */ const char *smallImageKey; /* max 32 bytes */
const char* smallImageText; /* max 128 bytes */ const char *smallImageText; /* max 128 bytes */
const char* partyId; /* max 128 bytes */ const char *partyId; /* max 128 bytes */
int partySize; int partySize;
int partyMax; int partyMax;
const char* matchSecret; /* max 128 bytes */ const char *matchSecret; /* max 128 bytes */
const char* joinSecret; /* max 128 bytes */ const char *joinSecret; /* max 128 bytes */
const char* spectateSecret; /* max 128 bytes */ const char *spectateSecret; /* max 128 bytes */
int8_t instance; int8_t instance;
} DiscordRichPresence; } DiscordRichPresence;
typedef struct DiscordJoinRequest { typedef struct DiscordJoinRequest {
const char* userId; const char *userId;
const char* username; const char *username;
const char* discriminator; const char *discriminator;
const char* avatar; const char *avatar;
} DiscordJoinRequest; } DiscordJoinRequest;
typedef struct DiscordEventHandlers { typedef struct DiscordEventHandlers {
void (*ready)(void); void (*ready)(void);
void (*disconnected)(int errorCode, const char* message); void (*disconnected)(int errorCode, const char *message);
void (*errored)(int errorCode, const char* message); void (*errored)(int errorCode, const char *message);
void (*joinGame)(const char* joinSecret); void (*joinGame)(const char *joinSecret);
void (*spectateGame)(const char* spectateSecret); void (*spectateGame)(const char *spectateSecret);
void (*joinRequest)(const DiscordJoinRequest* request); void (*joinRequest)(const DiscordJoinRequest *request);
} DiscordEventHandlers; } DiscordEventHandlers;
#define DISCORD_REPLY_NO 0 #define DISCORD_REPLY_NO 0
#define DISCORD_REPLY_YES 1 #define DISCORD_REPLY_YES 1
#define DISCORD_REPLY_IGNORE 2 #define DISCORD_REPLY_IGNORE 2
DISCORD_EXPORT void Discord_Initialize(const char* applicationId, DISCORD_EXPORT void Discord_Initialize(const char *applicationId,
DiscordEventHandlers* handlers, DiscordEventHandlers *handlers,
int autoRegister, int autoRegister,
const char* optionalSteamId); const char *optionalSteamId);
DISCORD_EXPORT void Discord_Shutdown(void); DISCORD_EXPORT void Discord_Shutdown(void);
/* checks for incoming messages, dispatches callbacks */ /* checks for incoming messages, dispatches callbacks */
DISCORD_EXPORT void Discord_RunCallbacks(void); DISCORD_EXPORT void Discord_RunCallbacks(void);
/* If you disable the lib starting its own io thread, you'll need to call this from your own */ /* If you disable the lib starting its own io thread, you'll need to call this
* from your own */
#ifdef DISCORD_DISABLE_IO_THREAD #ifdef DISCORD_DISABLE_IO_THREAD
DISCORD_EXPORT void Discord_UpdateConnection(void); DISCORD_EXPORT void Discord_UpdateConnection(void);
#endif #endif
DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence); DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence *presence);
DISCORD_EXPORT void Discord_ClearPresence(void); DISCORD_EXPORT void Discord_ClearPresence(void);
DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply); DISCORD_EXPORT void Discord_Respond(const char *userid,
/* DISCORD_REPLY_ */ int reply);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

View File

@ -1,25 +1,27 @@
#pragma once #pragma once
#if defined(DISCORD_DYNAMIC_LIB) #if defined(DISCORD_DYNAMIC_LIB)
# if defined(_WIN32) #if defined(_WIN32)
# if defined(DISCORD_BUILDING_SDK) #if defined(DISCORD_BUILDING_SDK)
# define DISCORD_EXPORT __declspec(dllexport) #define DISCORD_EXPORT __declspec(dllexport)
# else
# define DISCORD_EXPORT __declspec(dllimport)
# endif
# else
# define DISCORD_EXPORT __attribute__((visibility("default")))
# endif
#else #else
# define DISCORD_EXPORT #define DISCORD_EXPORT __declspec(dllimport)
#endif
#else
#define DISCORD_EXPORT __attribute__((visibility("default")))
#endif
#else
#define DISCORD_EXPORT
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command); DISCORD_EXPORT void Discord_Register(const char *applicationId,
DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId); const char *command);
DISCORD_EXPORT void Discord_RegisterSteamGame(const char *applicationId,
const char *steamId);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -1,11 +1,11 @@
#ifndef DISCORD_RICH_PRESENCE_H #ifndef DISCORD_RICH_PRESENCE_H
#define DISCORD_RICH_PRESENCE_H #define DISCORD_RICH_PRESENCE_H
#include <QCoreApplication>
#include <QDebug>
#include <cstring> #include <cstring>
#include <ctime> #include <ctime>
#include <QDebug>
#include <string> #include <string>
#include <QCoreApplication>
#include <discord-rpc.h> #include <discord-rpc.h>
@ -16,14 +16,14 @@
namespace AttorneyOnline { namespace AttorneyOnline {
class Discord class Discord {
{
Q_DECLARE_TR_FUNCTIONS(Discord) Q_DECLARE_TR_FUNCTIONS(Discord)
private: private:
const char* APPLICATION_ID = "399779271737868288"; const char *APPLICATION_ID = "399779271737868288";
std::string server_name, server_id; std::string server_name, server_id;
int64_t timestamp; int64_t timestamp;
public: public:
Discord(); Discord();
~Discord(); ~Discord();
@ -34,5 +34,5 @@ public:
void state_spectate(); void state_spectate();
}; };
} } // namespace AttorneyOnline
#endif // DISCORD_RICH_PRESENCE_H #endif // DISCORD_RICH_PRESENCE_H

View File

@ -24,63 +24,65 @@ extern "C" {
#endif #endif
typedef struct DiscordRichPresence { typedef struct DiscordRichPresence {
const char* state; /* max 128 bytes */ const char *state; /* max 128 bytes */
const char* details; /* max 128 bytes */ const char *details; /* max 128 bytes */
int64_t startTimestamp; int64_t startTimestamp;
int64_t endTimestamp; int64_t endTimestamp;
const char* largeImageKey; /* max 32 bytes */ const char *largeImageKey; /* max 32 bytes */
const char* largeImageText; /* max 128 bytes */ const char *largeImageText; /* max 128 bytes */
const char* smallImageKey; /* max 32 bytes */ const char *smallImageKey; /* max 32 bytes */
const char* smallImageText; /* max 128 bytes */ const char *smallImageText; /* max 128 bytes */
const char* partyId; /* max 128 bytes */ const char *partyId; /* max 128 bytes */
int partySize; int partySize;
int partyMax; int partyMax;
const char* matchSecret; /* max 128 bytes */ const char *matchSecret; /* max 128 bytes */
const char* joinSecret; /* max 128 bytes */ const char *joinSecret; /* max 128 bytes */
const char* spectateSecret; /* max 128 bytes */ const char *spectateSecret; /* max 128 bytes */
int8_t instance; int8_t instance;
} DiscordRichPresence; } DiscordRichPresence;
typedef struct DiscordUser { typedef struct DiscordUser {
const char* userId; const char *userId;
const char* username; const char *username;
const char* discriminator; const char *discriminator;
const char* avatar; const char *avatar;
} DiscordUser; } DiscordUser;
typedef struct DiscordEventHandlers { typedef struct DiscordEventHandlers {
void (*ready)(const DiscordUser* request); void (*ready)(const DiscordUser *request);
void (*disconnected)(int errorCode, const char* message); void (*disconnected)(int errorCode, const char *message);
void (*errored)(int errorCode, const char* message); void (*errored)(int errorCode, const char *message);
void (*joinGame)(const char* joinSecret); void (*joinGame)(const char *joinSecret);
void (*spectateGame)(const char* spectateSecret); void (*spectateGame)(const char *spectateSecret);
void (*joinRequest)(const DiscordUser* request); void (*joinRequest)(const DiscordUser *request);
} DiscordEventHandlers; } DiscordEventHandlers;
#define DISCORD_REPLY_NO 0 #define DISCORD_REPLY_NO 0
#define DISCORD_REPLY_YES 1 #define DISCORD_REPLY_YES 1
#define DISCORD_REPLY_IGNORE 2 #define DISCORD_REPLY_IGNORE 2
DISCORD_EXPORT void Discord_Initialize(const char* applicationId, DISCORD_EXPORT void Discord_Initialize(const char *applicationId,
DiscordEventHandlers* handlers, DiscordEventHandlers *handlers,
int autoRegister, int autoRegister,
const char* optionalSteamId); const char *optionalSteamId);
DISCORD_EXPORT void Discord_Shutdown(void); DISCORD_EXPORT void Discord_Shutdown(void);
/* checks for incoming messages, dispatches callbacks */ /* checks for incoming messages, dispatches callbacks */
DISCORD_EXPORT void Discord_RunCallbacks(void); DISCORD_EXPORT void Discord_RunCallbacks(void);
/* If you disable the lib starting its own io thread, you'll need to call this from your own */ /* If you disable the lib starting its own io thread, you'll need to call this
* from your own */
#ifdef DISCORD_DISABLE_IO_THREAD #ifdef DISCORD_DISABLE_IO_THREAD
DISCORD_EXPORT void Discord_UpdateConnection(void); DISCORD_EXPORT void Discord_UpdateConnection(void);
#endif #endif
DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence); DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence *presence);
DISCORD_EXPORT void Discord_ClearPresence(void); DISCORD_EXPORT void Discord_ClearPresence(void);
DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply); DISCORD_EXPORT void Discord_Respond(const char *userid,
/* DISCORD_REPLY_ */ int reply);
DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers* handlers); DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers *handlers);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

View File

@ -3,11 +3,11 @@
#include <QString> #include <QString>
#include <cstddef>
#include <stdlib.h>
#include <sstream>
#include <iomanip>
#include <QVector> #include <QVector>
#include <cstddef>
#include <iomanip>
#include <sstream>
#include <stdlib.h>
QString fanta_encrypt(QString p_input, unsigned int key); QString fanta_encrypt(QString p_input, unsigned int key);
QString fanta_decrypt(QString p_input, unsigned int key); QString fanta_decrypt(QString p_input, unsigned int key);

View File

@ -1,8 +1,8 @@
#ifndef FILE_FUNCTIONS_H #ifndef FILE_FUNCTIONS_H
#define FILE_FUNCTIONS_H #define FILE_FUNCTIONS_H
#include <QFileInfo>
#include <QDir> #include <QDir>
#include <QFileInfo>
#include <QString> #include <QString>
bool file_exists(QString file_path); bool file_exists(QString file_path);

View File

@ -1,17 +1,16 @@
#ifndef HEX_OPERATIONS_H #ifndef HEX_OPERATIONS_H
#define HEX_OPERATIONS_H #define HEX_OPERATIONS_H
#include <algorithm>
#include <bitset> #include <bitset>
#include <cstdint> #include <cstdint>
#include <iostream>
#include <algorithm>
#include <string>
#include <iomanip> #include <iomanip>
#include <iostream>
#include <sstream> #include <sstream>
#include <string>
namespace omni namespace omni {
{ std::string int_to_hex(unsigned int input);
std::string int_to_hex(unsigned int input);
} }
#endif //HEX_OPERATIONS_H #endif // HEX_OPERATIONS_H

View File

@ -1,16 +1,16 @@
#ifndef LOBBY_H #ifndef LOBBY_H
#define LOBBY_H #define LOBBY_H
#include "aoimage.h"
#include "aobutton.h" #include "aobutton.h"
#include "aoimage.h"
#include "aopacket.h" #include "aopacket.h"
#include "aotextarea.h" #include "aotextarea.h"
#include <QMainWindow>
#include <QListWidget>
#include <QLabel> #include <QLabel>
#include <QPlainTextEdit>
#include <QLineEdit> #include <QLineEdit>
#include <QListWidget>
#include <QMainWindow>
#include <QPlainTextEdit>
#include <QProgressBar> #include <QProgressBar>
#include <QTextBrowser> #include <QTextBrowser>
@ -19,8 +19,7 @@
class AOApplication; class AOApplication;
class Lobby : public QMainWindow class Lobby : public QMainWindow {
{
Q_OBJECT Q_OBJECT
public: public:
@ -33,8 +32,8 @@ public:
void append_error(QString f_message); void append_error(QString f_message);
void set_player_count(int players_online, int max_players); void set_player_count(int players_online, int max_players);
void set_loading_text(QString p_text); void set_loading_text(QString p_text);
void show_loading_overlay(){ui_loading_background->show();} void show_loading_overlay() { ui_loading_background->show(); }
void hide_loading_overlay(){ui_loading_background->hide();} void hide_loading_overlay() { ui_loading_background->hide(); }
QString get_chatlog(); QString get_chatlog();
int get_selected_server(); int get_selected_server();
void enable_connect_button(); void enable_connect_button();

View File

@ -1,8 +1,8 @@
#ifndef MISC_FUNCTIONS_H #ifndef MISC_FUNCTIONS_H
#define MISC_FUNCTIONS_H #define MISC_FUNCTIONS_H
#include <QTime>
#include <QCoreApplication> #include <QCoreApplication>
#include <QTime>
void delay(int p_milliseconds); void delay(int p_milliseconds);

View File

@ -1,8 +1,8 @@
#ifndef NETWORKMANAGER_H #ifndef NETWORKMANAGER_H
#define NETWORKMANAGER_H #define NETWORKMANAGER_H
// Qt for Android has stubbed QDnsLookup. This is not documented in any part of their wiki. // Qt for Android has stubbed QDnsLookup. This is not documented in any part of
// This prevents SRV lookup/failover behavior from functioning. // their wiki. This prevents SRV lookup/failover behavior from functioning.
// https://bugreports.qt.io/browse/QTBUG-56143 // https://bugreports.qt.io/browse/QTBUG-56143
#ifndef ANDROID #ifndef ANDROID
#define MS_FAILOVER_SUPPORTED #define MS_FAILOVER_SUPPORTED
@ -14,17 +14,16 @@
#undef MS_FAILOVER_SUPPORTED #undef MS_FAILOVER_SUPPORTED
#endif #endif
#include "aopacket.h"
#include "aoapplication.h" #include "aoapplication.h"
#include "aopacket.h"
#include <QTcpSocket>
#include <QDnsLookup> #include <QDnsLookup>
#include <QTcpSocket>
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
#include <cstring> #include <cstring>
class NetworkManager : public QObject class NetworkManager : public QObject {
{
Q_OBJECT Q_OBJECT
public: public:

View File

@ -3,11 +3,11 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "file_functions.h" #include "file_functions.h"
#include <QTextStream>
#include <QStringList>
#include <QVector>
#include <QDebug>
#include <QColor> #include <QColor>
#include <QDebug>
#include <QSettings> #include <QSettings>
#include <QStringList>
#include <QTextStream>
#include <QVector>
#endif // TEXT_FILE_FUNCTIONS_H #endif // TEXT_FILE_FUNCTIONS_H

View File

@ -9,6 +9,7 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/"
cd "${ROOT_DIR}" cd "${ROOT_DIR}"
#need some openGL stuff #need some openGL stuff
sudo apt install libgl1-mesa-dev sudo apt install libgl1-mesa-dev
#install curl incase of fresh vm #install curl incase of fresh vm

View File

@ -1,17 +1,17 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "lobby.h"
#include "courtroom.h"
#include "networkmanager.h"
#include "debug_functions.h"
#include "aooptionsdialog.h"
#include "aocaseannouncerdialog.h" #include "aocaseannouncerdialog.h"
#include "aooptionsdialog.h"
#include "courtroom.h"
#include "debug_functions.h"
#include "lobby.h"
#include "networkmanager.h"
AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv) AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
{ {
// Create the QSettings class that points to the config.ini. // Create the QSettings class that points to the config.ini.
configini = new QSettings(get_base_path() + "config.ini", QSettings::IniFormat); configini =
new QSettings(get_base_path() + "config.ini", QSettings::IniFormat);
net_manager = new NetworkManager(this); net_manager = new NetworkManager(this);
discord = new AttorneyOnline::Discord(); discord = new AttorneyOnline::Discord();
@ -28,8 +28,7 @@ AOApplication::~AOApplication()
void AOApplication::construct_lobby() void AOApplication::construct_lobby()
{ {
if (lobby_constructed) if (lobby_constructed) {
{
qDebug() << "W: lobby was attempted constructed when it already exists"; qDebug() << "W: lobby was attempted constructed when it already exists";
return; return;
} }
@ -38,8 +37,8 @@ void AOApplication::construct_lobby()
lobby_constructed = true; lobby_constructed = true;
QRect geometry = QGuiApplication::primaryScreen()->geometry(); QRect geometry = QGuiApplication::primaryScreen()->geometry();
int x = (geometry.width()-w_lobby->width()) / 2; int x = (geometry.width() - w_lobby->width()) / 2;
int y = (geometry.height()-w_lobby->height()) / 2; int y = (geometry.height() - w_lobby->height()) / 2;
w_lobby->move(x, y); w_lobby->move(x, y);
if (is_discord_enabled()) if (is_discord_enabled())
@ -50,8 +49,7 @@ void AOApplication::construct_lobby()
void AOApplication::destruct_lobby() void AOApplication::destruct_lobby()
{ {
if(!lobby_constructed) if (!lobby_constructed) {
{
qDebug() << "W: lobby was attempted destructed when it did not exist"; qDebug() << "W: lobby was attempted destructed when it did not exist";
return; return;
} }
@ -63,8 +61,7 @@ void AOApplication::destruct_lobby()
void AOApplication::construct_courtroom() void AOApplication::construct_courtroom()
{ {
if (courtroom_constructed) if (courtroom_constructed) {
{
qDebug() << "W: courtroom was attempted constructed when it already exists"; qDebug() << "W: courtroom was attempted constructed when it already exists";
return; return;
} }
@ -73,15 +70,14 @@ void AOApplication::construct_courtroom()
courtroom_constructed = true; courtroom_constructed = true;
QRect geometry = QGuiApplication::primaryScreen()->geometry(); QRect geometry = QGuiApplication::primaryScreen()->geometry();
int x = (geometry.width()-w_courtroom->width()) / 2; int x = (geometry.width() - w_courtroom->width()) / 2;
int y = (geometry.height()-w_courtroom->height()) / 2; int y = (geometry.height() - w_courtroom->height()) / 2;
w_courtroom->move(x, y); w_courtroom->move(x, y);
} }
void AOApplication::destruct_courtroom() void AOApplication::destruct_courtroom()
{ {
if (!courtroom_constructed) if (!courtroom_constructed) {
{
qDebug() << "W: courtroom was attempted destructed when it did not exist"; qDebug() << "W: courtroom was attempted destructed when it did not exist";
return; return;
} }
@ -93,16 +89,11 @@ void AOApplication::destruct_courtroom()
QString AOApplication::get_version_string() QString AOApplication::get_version_string()
{ {
return return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." +
QString::number(RELEASE) + "." + QString::number(MINOR_VERSION);
QString::number(MAJOR_VERSION) + "." +
QString::number(MINOR_VERSION);
} }
void AOApplication::reload_theme() void AOApplication::reload_theme() { current_theme = read_theme(); }
{
current_theme = read_theme();
}
void AOApplication::set_favorite_list() void AOApplication::set_favorite_list()
{ {
@ -133,8 +124,7 @@ void AOApplication::add_favorite_server(int p_server)
void AOApplication::server_disconnected() void AOApplication::server_disconnected()
{ {
if (courtroom_constructed) if (courtroom_constructed) {
{
beep(); beep();
call_notice(tr("Disconnected from server.")); call_notice(tr("Disconnected from server."));
construct_lobby(); construct_lobby();
@ -145,43 +135,44 @@ void AOApplication::server_disconnected()
void AOApplication::loading_cancelled() void AOApplication::loading_cancelled()
{ {
destruct_courtroom(); destruct_courtroom();
w_lobby->hide_loading_overlay(); w_lobby->hide_loading_overlay();
} }
void AOApplication::ms_connect_finished(bool connected, bool will_retry) void AOApplication::ms_connect_finished(bool connected, bool will_retry)
{ {
if (connected) if (connected) {
{
AOPacket *f_packet = new AOPacket("ALL#%"); AOPacket *f_packet = new AOPacket("ALL#%");
send_ms_packet(f_packet); send_ms_packet(f_packet);
} }
else else {
{ if (will_retry) {
if (will_retry)
{
if (lobby_constructed) if (lobby_constructed)
w_lobby->append_error(tr("Error connecting to master server. Will try again in %1 seconds.").arg(QString::number(net_manager->ms_reconnect_delay))); w_lobby->append_error(
tr("Error connecting to master server. Will try again in %1 "
"seconds.")
.arg(QString::number(net_manager->ms_reconnect_delay)));
} }
else else {
{
call_error(tr("There was an error connecting to the master server.\n" call_error(tr("There was an error connecting to the master server.\n"
"We deploy multiple master servers to mitigate any possible downtime, " "We deploy multiple master servers to mitigate any "
"but the client appears to have exhausted all possible methods of finding " "possible downtime, "
"and connecting to one.\n" "but the client appears to have exhausted all possible "
"Please check your Internet connection and firewall, and please try again.")); "methods of finding "
"and connecting to one.\n"
"Please check your Internet connection and firewall, and "
"please try again."));
} }
} }
} }
void AOApplication::call_settings_menu() void AOApplication::call_settings_menu()
{ {
AOOptionsDialog settings(nullptr, this); AOOptionsDialog settings(nullptr, this);
settings.exec(); settings.exec();
} }
void AOApplication::call_announce_menu(Courtroom *court) void AOApplication::call_announce_menu(Courtroom *court)
{ {
AOCaseAnnouncerDialog announcer(nullptr, this, court); AOCaseAnnouncerDialog announcer(nullptr, this, court);
announcer.exec(); announcer.exec();
} }

View File

@ -1,6 +1,6 @@
#include "aoblipplayer.h" #include "aoblipplayer.h"
#if defined(BASSAUDIO) //Using bass.dll for the blips #if defined(BASSAUDIO) // Using bass.dll for the blips
AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app) AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
{ {
m_parent = parent; m_parent = parent;
@ -11,11 +11,11 @@ void AOBlipPlayer::set_blips(QString p_sfx)
{ {
QString f_path = ao_app->get_sounds_path(p_sfx); QString f_path = ao_app->get_sounds_path(p_sfx);
for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) for (int n_stream = 0; n_stream < 5; ++n_stream) {
{
BASS_StreamFree(m_stream_list[n_stream]); BASS_StreamFree(m_stream_list[n_stream]);
m_stream_list[n_stream] = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE); m_stream_list[n_stream] = BASS_StreamCreateFile(
FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE);
} }
set_volume_internal(m_volume); set_volume_internal(m_volume);
@ -44,12 +44,11 @@ void AOBlipPlayer::set_volume_internal(qreal p_value)
{ {
float volume = p_value; float volume = p_value;
for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) for (int n_stream = 0; n_stream < 5; ++n_stream) {
{
BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume); BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume);
} }
} }
#elif defined(QTAUDIO) //Using Qt's QSoundEffect class #elif defined(QTAUDIO) // Using Qt's QSoundEffect class
AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app) AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
{ {
m_parent = parent; m_parent = parent;
@ -60,8 +59,7 @@ void AOBlipPlayer::set_blips(QString p_sfx)
{ {
QString f_path = ao_app->get_sounds_path(p_sfx); QString f_path = ao_app->get_sounds_path(p_sfx);
for (int n_stream = 0 ; n_stream < 5 ; ++n_stream) for (int n_stream = 0; n_stream < 5; ++n_stream) {
{
m_blips.setSource(QUrl::fromLocalFile(f_path)); m_blips.setSource(QUrl::fromLocalFile(f_path));
} }
@ -88,30 +86,18 @@ void AOBlipPlayer::set_volume_internal(qreal p_value)
{ {
m_blips.setVolume(m_volume); m_blips.setVolume(m_volume);
} }
#else //No audio #else // No audio
AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app) AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
} }
void AOBlipPlayer::set_blips(QString p_sfx) void AOBlipPlayer::set_blips(QString p_sfx) {}
{
} void AOBlipPlayer::blip_tick() {}
void AOBlipPlayer::blip_tick() void AOBlipPlayer::set_volume(qreal p_value) {}
{
} void AOBlipPlayer::set_volume_internal(qreal p_value) {}
void AOBlipPlayer::set_volume(qreal p_value)
{
}
void AOBlipPlayer::set_volume_internal(qreal p_value)
{
}
#endif #endif

View File

@ -3,15 +3,13 @@
#include "debug_functions.h" #include "debug_functions.h"
#include "file_functions.h" #include "file_functions.h"
AOButton::AOButton(QWidget *parent, AOApplication *p_ao_app) : QPushButton(parent) AOButton::AOButton(QWidget *parent, AOApplication *p_ao_app)
: QPushButton(parent)
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
} }
AOButton::~AOButton() AOButton::~AOButton() {}
{
}
void AOButton::set_image(QString p_image) void AOButton::set_image(QString p_image)
{ {
@ -23,4 +21,3 @@ void AOButton::set_image(QString p_image)
else else
this->setStyleSheet("border-image:url(\"" + default_image_path + "\")"); this->setStyleSheet("border-image:url(\"" + default_image_path + "\")");
} }

View File

@ -1,7 +1,9 @@
#include "aocaseannouncerdialog.h" #include "aocaseannouncerdialog.h"
AOCaseAnnouncerDialog::AOCaseAnnouncerDialog(QWidget *parent, AOApplication *p_ao_app, Courtroom *p_court) AOCaseAnnouncerDialog::AOCaseAnnouncerDialog(QWidget *parent,
: QDialog(parent) AOApplication *p_ao_app,
Courtroom *p_court)
: QDialog(parent)
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
court = p_court; court = p_court;
@ -14,21 +16,27 @@ AOCaseAnnouncerDialog::AOCaseAnnouncerDialog(QWidget *parent, AOApplication *p_a
QSizePolicy sizepolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); QSizePolicy sizepolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
sizepolicy.setHorizontalStretch(0); sizepolicy.setHorizontalStretch(0);
sizepolicy.setVerticalStretch(0); sizepolicy.setVerticalStretch(0);
sizepolicy.setHeightForWidth(ui_announcer_buttons->sizePolicy().hasHeightForWidth()); sizepolicy.setHeightForWidth(
ui_announcer_buttons->sizePolicy().hasHeightForWidth());
ui_announcer_buttons->setSizePolicy(sizepolicy); ui_announcer_buttons->setSizePolicy(sizepolicy);
ui_announcer_buttons->setOrientation(Qt::Horizontal); ui_announcer_buttons->setOrientation(Qt::Horizontal);
ui_announcer_buttons->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); ui_announcer_buttons->setStandardButtons(QDialogButtonBox::Ok |
QDialogButtonBox::Cancel);
QObject::connect(ui_announcer_buttons, SIGNAL(accepted()), this, SLOT(ok_pressed())); QObject::connect(ui_announcer_buttons, SIGNAL(accepted()), this,
QObject::connect(ui_announcer_buttons, SIGNAL(rejected()), this, SLOT(cancel_pressed())); SLOT(ok_pressed()));
QObject::connect(ui_announcer_buttons, SIGNAL(rejected()), this,
SLOT(cancel_pressed()));
setUpdatesEnabled(false); setUpdatesEnabled(false);
ui_vbox_layout = new QVBoxLayout(this); ui_vbox_layout = new QVBoxLayout(this);
ui_form_layout = new QFormLayout(this); ui_form_layout = new QFormLayout(this);
ui_form_layout->setLabelAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter); ui_form_layout->setLabelAlignment(Qt::AlignLeading | Qt::AlignLeft |
ui_form_layout->setFormAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop); Qt::AlignVCenter);
ui_form_layout->setFormAlignment(Qt::AlignLeading | Qt::AlignLeft |
Qt::AlignTop);
ui_form_layout->setContentsMargins(6, 6, 6, 6); ui_form_layout->setContentsMargins(6, 6, 6, 6);
ui_vbox_layout->addItem(ui_form_layout); ui_vbox_layout->addItem(ui_form_layout);
@ -69,18 +77,13 @@ AOCaseAnnouncerDialog::AOCaseAnnouncerDialog(QWidget *parent, AOApplication *p_a
void AOCaseAnnouncerDialog::ok_pressed() void AOCaseAnnouncerDialog::ok_pressed()
{ {
court->announce_case(ui_case_title_textbox->text(), court->announce_case(
ui_defense_needed->isChecked(), ui_case_title_textbox->text(), ui_defense_needed->isChecked(),
ui_prosecutor_needed->isChecked(), ui_prosecutor_needed->isChecked(), ui_judge_needed->isChecked(),
ui_judge_needed->isChecked(), ui_juror_needed->isChecked(), ui_steno_needed->isChecked(),
ui_juror_needed->isChecked(), ui_witness_needed->isChecked());
ui_steno_needed->isChecked(),
ui_witness_needed->isChecked());
done(0); done(0);
} }
void AOCaseAnnouncerDialog::cancel_pressed() void AOCaseAnnouncerDialog::cancel_pressed() { done(0); }
{
done(0);
}

View File

@ -2,7 +2,9 @@
#include "file_functions.h" #include "file_functions.h"
AOCharButton::AOCharButton(QWidget *parent, AOApplication *p_ao_app, int x_pos, int y_pos, bool is_taken) : QPushButton(parent) AOCharButton::AOCharButton(QWidget *parent, AOApplication *p_ao_app, int x_pos,
int y_pos, bool is_taken)
: QPushButton(parent)
{ {
m_parent = parent; m_parent = parent;
@ -40,45 +42,35 @@ void AOCharButton::reset()
ui_selector->hide(); ui_selector->hide();
} }
void AOCharButton::set_taken(bool is_taken) void AOCharButton::set_taken(bool is_taken) { taken = is_taken; }
{
taken = is_taken;
}
void AOCharButton::apply_taken_image() void AOCharButton::apply_taken_image()
{ {
if (taken) if (taken) {
{ ui_taken->move(0, 0);
ui_taken->move(0,0);
ui_taken->show(); ui_taken->show();
} }
else else {
{
ui_taken->hide(); ui_taken->hide();
} }
} }
void AOCharButton::set_passworded() void AOCharButton::set_passworded() { ui_passworded->show(); }
{
ui_passworded->show();
}
void AOCharButton::set_image(QString p_character) void AOCharButton::set_image(QString p_character)
{ {
QString image_path = ao_app->get_character_path(p_character, "char_icon.png"); QString image_path = ao_app->get_character_path(p_character, "char_icon.png");
this->setText(""); this->setText("");
if (file_exists(image_path)) if (file_exists(image_path))
this->setStyleSheet("border-image:url(\"" + image_path + "\")"); this->setStyleSheet("border-image:url(\"" + image_path + "\")");
else else {
{
this->setStyleSheet("border-image:url()"); this->setStyleSheet("border-image:url()");
this->setText(p_character); this->setText(p_character);
} }
} }
void AOCharButton::enterEvent(QEvent * e) void AOCharButton::enterEvent(QEvent *e)
{ {
ui_selector->move(this->x() - 1, this->y() - 1); ui_selector->move(this->x() - 1, this->y() - 1);
ui_selector->raise(); ui_selector->raise();
@ -88,10 +80,8 @@ void AOCharButton::enterEvent(QEvent * e)
QPushButton::enterEvent(e); QPushButton::enterEvent(e);
} }
void AOCharButton::leaveEvent(QEvent * e) void AOCharButton::leaveEvent(QEvent *e)
{ {
ui_selector->hide(); ui_selector->hide();
QPushButton::leaveEvent(e); QPushButton::leaveEvent(e);
} }

View File

@ -1,10 +1,11 @@
#include "aocharmovie.h" #include "aocharmovie.h"
#include "misc_functions.h"
#include "file_functions.h"
#include "aoapplication.h" #include "aoapplication.h"
#include "file_functions.h"
#include "misc_functions.h"
AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent) AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app)
: QLabel(p_parent)
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
m_movie = new QMovie(this); m_movie = new QMovie(this);
@ -19,17 +20,22 @@ AOCharMovie::AOCharMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_
void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix)
{ {
apng = false; apng = false;
QString original_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".gif");
QString alt_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".png"); QString original_path =
ao_app->get_character_path(p_char, emote_prefix + p_emote + ".gif");
QString alt_path =
ao_app->get_character_path(p_char, emote_prefix + p_emote + ".png");
QString apng_path =
ao_app->get_character_path(p_char, emote_prefix + p_emote + ".apng");
QString alt_path_still = ao_app->get_character_path(p_char, p_emote + ".png"); QString alt_path_still = ao_app->get_character_path(p_char, p_emote + ".png");
QString apng_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".apng");
QString placeholder_path = ao_app->get_theme_path("placeholder.gif"); QString placeholder_path = ao_app->get_theme_path("placeholder.gif");
QString placeholder_default_path = ao_app->get_default_theme_path("placeholder.gif"); QString placeholder_default_path =
ao_app->get_default_theme_path("placeholder.gif");
QString gif_path; QString gif_path;
current_emote = emote_prefix + p_emote; current_emote = emote_prefix + p_emote;
current_char = p_char; current_char = p_char;
if (file_exists(apng_path)) if (file_exists(apng_path)) {
{
gif_path = apng_path; gif_path = apng_path;
apng = true; apng = true;
} }
@ -53,7 +59,8 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix)
this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage()); this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage());
this->show(); this->show();
this->play_frame_sfx(); this->play_frame_sfx();
// if the frame count is 0 (i.e. it's a static PNG) don't try to play the next frame, ya goofus // if the frame count is 0 (i.e. it's a static PNG) don't try to play the next
// frame, ya goofus
if (m_movie->frameCount() != 0) { if (m_movie->frameCount() != 0) {
ticker->start(m_movie->nextFrameDelay()); ticker->start(m_movie->nextFrameDelay());
} }
@ -62,148 +69,147 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix)
void AOCharMovie::play_frame_sfx() void AOCharMovie::play_frame_sfx()
{ {
int current_frame = m_movie->currentFrameNumber(); int current_frame = m_movie->currentFrameNumber();
QString sfx_to_play = ao_app->get_frame_sfx_name(current_char, current_emote, current_frame); QString sfx_to_play =
QString screenshake_to_play = ao_app->get_screenshake_frame(current_char, current_emote, current_frame); ao_app->get_frame_sfx_name(current_char, current_emote, current_frame);
QString realization_to_play = ao_app->get_realization_frame(current_char, current_emote, current_frame); QString screenshake_to_play =
if(sfx_to_play != "" && !use_networked_framehell) ao_app->get_screenshake_frame(current_char, current_emote, current_frame);
{ QString realization_to_play =
ao_app->get_realization_frame(current_char, current_emote, current_frame);
if (sfx_to_play != "" && !use_networked_framehell) {
frame_specific_sfx_player->play(ao_app->get_sfx_suffix(sfx_to_play)); frame_specific_sfx_player->play(ao_app->get_sfx_suffix(sfx_to_play));
} }
else if(use_networked_framehell) else if (use_networked_framehell) {
{ this->sfx_two_network_boogaloo();
this->sfx_two_network_boogaloo();
} }
if(screenshake_to_play != "" && !use_networked_framehell) if (screenshake_to_play != "" && !use_networked_framehell) {
{
mycourtroom->doScreenShake(); mycourtroom->doScreenShake();
} }
else if(use_networked_framehell) else if (use_networked_framehell) {
{ this->screenshake_two_network_boogaloo();
this->screenshake_two_network_boogaloo();
} }
if(realization_to_play != "" && !use_networked_framehell) if (realization_to_play != "" && !use_networked_framehell) {
{
mycourtroom->doRealization(); mycourtroom->doRealization();
} }
else if(use_networked_framehell) else if (use_networked_framehell) {
{ this->realization_two_network_boogaloo();
this->realization_two_network_boogaloo();
} }
} }
void AOCharMovie::realization_two_network_boogaloo() void AOCharMovie::realization_two_network_boogaloo()
{ {
int current_frame = m_movie->currentFrameNumber(); int current_frame = m_movie->currentFrameNumber();
QStringList realizationList = this->frame_realization_hellstring.split("^"); QStringList realizationList = this->frame_realization_hellstring.split("^");
for (int i = 0; i < realizationList.length(); i++) { for (int i = 0; i < realizationList.length(); i++) {
QString screenshakeList = realizationList.at(i); QString screenshakeList = realizationList.at(i);
QStringList extra_garbage = screenshakeList.split("|"); QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){ if (extra_garbage.at(0) != current_emote) {
continue; continue;
}
for (int ii = 1; ii < extra_garbage.length(); ii++) {
QString levels_of_garbage = extra_garbage.at(ii);
QStringList that_shouldnt_be_possible = levels_of_garbage.split("=");
if(that_shouldnt_be_possible.at(0).toInt() == current_frame && that_shouldnt_be_possible.at(1) != "") {
mycourtroom->doRealization();
}
}
} }
for (int ii = 1; ii < extra_garbage.length(); ii++) {
QString levels_of_garbage = extra_garbage.at(ii);
QStringList that_shouldnt_be_possible = levels_of_garbage.split("=");
if (that_shouldnt_be_possible.at(0).toInt() == current_frame &&
that_shouldnt_be_possible.at(1) != "") {
mycourtroom->doRealization();
}
}
}
} }
void AOCharMovie::screenshake_two_network_boogaloo() void AOCharMovie::screenshake_two_network_boogaloo()
{ {
int current_frame = m_movie->currentFrameNumber(); int current_frame = m_movie->currentFrameNumber();
QStringList realizationList = this->frame_screenshake_hellstring.split("^"); QStringList realizationList = this->frame_screenshake_hellstring.split("^");
for (int i = 0; i < realizationList.length(); i++) { for (int i = 0; i < realizationList.length(); i++) {
QString screenshakeList = realizationList.at(i); QString screenshakeList = realizationList.at(i);
QStringList extra_garbage = screenshakeList.split("|"); QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){ if (extra_garbage.at(0) != current_emote) {
continue; continue;
}
for (int ii = 1; ii < extra_garbage.length(); ii++) {
QString levels_of_garbage = extra_garbage.at(ii);
QStringList that_shouldnt_be_possible = levels_of_garbage.split("=");
if(that_shouldnt_be_possible.at(0).toInt() == current_frame && that_shouldnt_be_possible.at(1) != "") {
mycourtroom->doScreenShake();
}
}
} }
for (int ii = 1; ii < extra_garbage.length(); ii++) {
QString levels_of_garbage = extra_garbage.at(ii);
QStringList that_shouldnt_be_possible = levels_of_garbage.split("=");
if (that_shouldnt_be_possible.at(0).toInt() == current_frame &&
that_shouldnt_be_possible.at(1) != "") {
mycourtroom->doScreenShake();
}
}
}
} }
void AOCharMovie::sfx_two_network_boogaloo() void AOCharMovie::sfx_two_network_boogaloo()
{ {
int current_frame = m_movie->currentFrameNumber(); int current_frame = m_movie->currentFrameNumber();
QStringList realizationList = this->frame_sfx_hellstring.split("^"); QStringList realizationList = this->frame_sfx_hellstring.split("^");
for (int i = 0; i < realizationList.length(); i++) { for (int i = 0; i < realizationList.length(); i++) {
QString screenshakeList = realizationList.at(i); QString screenshakeList = realizationList.at(i);
QStringList extra_garbage = screenshakeList.split("|"); QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){ if (extra_garbage.at(0) != current_emote) {
continue; continue;
}
for (int ii = 1; ii < extra_garbage.length(); ii++) {
QString levels_of_garbage = extra_garbage.at(ii);
QStringList that_shouldnt_be_possible = levels_of_garbage.split("=");
if(that_shouldnt_be_possible.at(0).toInt() == current_frame && that_shouldnt_be_possible.at(1) != "") {
frame_specific_sfx_player->play(ao_app->get_sfx_suffix(that_shouldnt_be_possible.at(1)));
}
}
} }
for (int ii = 1; ii < extra_garbage.length(); ii++) {
QString levels_of_garbage = extra_garbage.at(ii);
QStringList that_shouldnt_be_possible = levels_of_garbage.split("=");
if (that_shouldnt_be_possible.at(0).toInt() == current_frame &&
that_shouldnt_be_possible.at(1) != "") {
frame_specific_sfx_player->play(
ao_app->get_sfx_suffix(that_shouldnt_be_possible.at(1)));
}
}
}
} }
void AOCharMovie::movie_ticker() void AOCharMovie::movie_ticker()
{ {
if(m_movie->currentFrameNumber() == m_movie->frameCount() - 1) if (m_movie->currentFrameNumber() == m_movie->frameCount() - 1) {
{
delete m_movie; delete m_movie;
m_movie = new QMovie(this); m_movie = new QMovie(this);
m_movie->stop(); m_movie->stop();
this->clear(); this->clear();
m_movie->setFileName(last_path); m_movie->setFileName(last_path);
m_movie->jumpToFrame(0); m_movie->jumpToFrame(0);
if(play_once) if (play_once) {
{ timer_done();
timer_done();
} }
} }
else else {
{
m_movie->jumpToNextFrame(); m_movie->jumpToNextFrame();
} }
this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage()); this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage());
// imagine if QT had sane stuff like "mirror on QMovie" or "resize the image on QT" or "interface with the current QMovie image" or anything else // imagine if QT had sane stuff like "mirror on QMovie" or "resize the image
// on QT" or "interface with the current QMovie image" or anything else
this->play_frame_sfx(); this->play_frame_sfx();
if (m_movie->frameCount() == 0) if (m_movie->frameCount() == 0) {
{
return; return;
} }
else if (!apng) else if (!apng) {
{
ticker->start(m_movie->nextFrameDelay()); ticker->start(m_movie->nextFrameDelay());
} }
} }
void AOCharMovie::LoadImageWithStupidMethodForFlipSupport(QImage image) void AOCharMovie::LoadImageWithStupidMethodForFlipSupport(QImage image)
{ {
QPixmap f_pixmap; QPixmap f_pixmap;
if(m_flipped) if (m_flipped)
f_pixmap = QPixmap::fromImage(image.mirrored(true, false)); f_pixmap = QPixmap::fromImage(image.mirrored(true, false));
else else
f_pixmap = QPixmap::fromImage(image); f_pixmap = QPixmap::fromImage(image);
auto aspect_ratio = Qt::KeepAspectRatio; auto aspect_ratio = Qt::KeepAspectRatio;
if (f_pixmap.size().width() > f_pixmap.size().height()) if (f_pixmap.size().width() > f_pixmap.size().height())
aspect_ratio = Qt::KeepAspectRatioByExpanding; aspect_ratio = Qt::KeepAspectRatioByExpanding;
if (f_pixmap.size().width() > this->size().width() || f_pixmap.size().height() > this->size().height()) if (f_pixmap.size().width() > this->size().width() ||
this->setPixmap(f_pixmap.scaled(this->width(), this->height(), aspect_ratio, Qt::SmoothTransformation)); f_pixmap.size().height() > this->size().height())
else this->setPixmap(f_pixmap.scaled(this->width(), this->height(), aspect_ratio,
this->setPixmap(f_pixmap.scaled(this->width(), this->height(), aspect_ratio, Qt::FastTransformation)); Qt::SmoothTransformation));
else
this->setPixmap(f_pixmap.scaled(this->width(), this->height(), aspect_ratio,
Qt::FastTransformation));
QLabel::move(x + (this->width() - this->pixmap()->width())/2, y); QLabel::move(x + (this->width() - this->pixmap()->width()) / 2, y);
} }
void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration) void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration)
@ -231,7 +237,8 @@ void AOCharMovie::play_idle(QString p_char, QString p_emote)
void AOCharMovie::stop() void AOCharMovie::stop()
{ {
//for all intents and purposes, stopping is the same as hiding. at no point do we want a frozen gif to display // for all intents and purposes, stopping is the same as hiding. at no point
// do we want a frozen gif to display
m_movie->stop(); m_movie->stop();
frame_specific_sfx_player->stop(); frame_specific_sfx_player->stop();
this->hide(); this->hide();
@ -250,7 +257,4 @@ void AOCharMovie::move(int ax, int ay)
QLabel::move(x, y); QLabel::move(x, y);
} }
void AOCharMovie::timer_done() void AOCharMovie::timer_done() { done(); }
{
done();
}

View File

@ -2,7 +2,9 @@
#include "file_functions.h" #include "file_functions.h"
AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent) AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app,
int p_x, int p_y)
: QPushButton(p_parent)
{ {
parent = p_parent; parent = p_parent;
ao_app = p_ao_app; ao_app = p_ao_app;
@ -16,21 +18,17 @@ AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x
void AOEmoteButton::set_image(QString p_char, int p_emote, QString suffix) void AOEmoteButton::set_image(QString p_char, int p_emote, QString suffix)
{ {
QString emotion_number = QString::number(p_emote + 1); QString emotion_number = QString::number(p_emote + 1);
QString image_path = ao_app->get_character_path(p_char, "emotions/button" + emotion_number + suffix); QString image_path = ao_app->get_character_path(
p_char, "emotions/button" + emotion_number + suffix);
if (file_exists(image_path)) if (file_exists(image_path)) {
{
this->setText(""); this->setText("");
this->setStyleSheet("border-image:url(\"" + image_path + "\")"); this->setStyleSheet("border-image:url(\"" + image_path + "\")");
} }
else else {
{
this->setText(ao_app->get_emote_comment(p_char, p_emote)); this->setText(ao_app->get_emote_comment(p_char, p_emote));
this->setStyleSheet("border-image:url(\"\")"); this->setStyleSheet("border-image:url(\"\")");
} }
} }
void AOEmoteButton::on_clicked() void AOEmoteButton::on_clicked() { emote_clicked(m_id); }
{
emote_clicked(m_id);
}

View File

@ -2,7 +2,9 @@
#include "file_functions.h" #include "file_functions.h"
AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x, int p_y) : QPushButton(p_parent) AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app,
int p_x, int p_y)
: QPushButton(p_parent)
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
m_parent = p_parent; m_parent = p_parent;
@ -39,13 +41,11 @@ void AOEvidenceButton::set_image(QString p_image)
{ {
QString image_path = ao_app->get_evidence_path(p_image); QString image_path = ao_app->get_evidence_path(p_image);
if (file_exists(image_path)) if (file_exists(image_path)) {
{
this->setText(""); this->setText("");
this->setStyleSheet("border-image:url(\"" + image_path + "\")"); this->setStyleSheet("border-image:url(\"" + image_path + "\")");
} }
else else {
{
this->setText(p_image); this->setText(p_image);
this->setStyleSheet(""); this->setStyleSheet("");
} }
@ -75,10 +75,7 @@ void AOEvidenceButton::set_selected(bool p_selected)
ui_selected->hide(); ui_selected->hide();
} }
void AOEvidenceButton::on_clicked() void AOEvidenceButton::on_clicked() { evidence_clicked(m_id); }
{
evidence_clicked(m_id);
}
void AOEvidenceButton::mouseDoubleClickEvent(QMouseEvent *e) void AOEvidenceButton::mouseDoubleClickEvent(QMouseEvent *e)
{ {
@ -98,7 +95,7 @@ void AOEvidenceButton::dragEnterEvent(QMouseEvent *e)
} }
*/ */
void AOEvidenceButton::enterEvent(QEvent * e) void AOEvidenceButton::enterEvent(QEvent *e)
{ {
ui_selector->show(); ui_selector->show();
@ -108,7 +105,7 @@ void AOEvidenceButton::enterEvent(QEvent * e)
QPushButton::enterEvent(e); QPushButton::enterEvent(e);
} }
void AOEvidenceButton::leaveEvent(QEvent * e) void AOEvidenceButton::leaveEvent(QEvent *e)
{ {
ui_selector->hide(); ui_selector->hide();

View File

@ -1,10 +1,11 @@
#include "aoevidencedisplay.h" #include "aoevidencedisplay.h"
#include "file_functions.h"
#include "datatypes.h" #include "datatypes.h"
#include "file_functions.h"
#include "misc_functions.h" #include "misc_functions.h"
AOEvidenceDisplay::AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent) AOEvidenceDisplay::AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app)
: QLabel(p_parent)
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
@ -12,10 +13,12 @@ AOEvidenceDisplay::AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app)
evidence_icon = new QLabel(this); evidence_icon = new QLabel(this);
sfx_player = new AOSfxPlayer(this, ao_app); sfx_player = new AOSfxPlayer(this, ao_app);
connect(evidence_movie, SIGNAL(frameChanged(int)), this, SLOT(frame_change(int))); connect(evidence_movie, SIGNAL(frameChanged(int)), this,
SLOT(frame_change(int)));
} }
void AOEvidenceDisplay::show_evidence(QString p_evidence_image, bool is_left_side, int p_volume) void AOEvidenceDisplay::show_evidence(QString p_evidence_image,
bool is_left_side, int p_volume)
{ {
this->reset(); this->reset();
@ -29,23 +32,23 @@ void AOEvidenceDisplay::show_evidence(QString p_evidence_image, bool is_left_sid
QString gif_name; QString gif_name;
QString icon_identifier; QString icon_identifier;
if (is_left_side) if (is_left_side) {
{
icon_identifier = "left_evidence_icon"; icon_identifier = "left_evidence_icon";
gif_name = "evidence_appear_left.gif"; gif_name = "evidence_appear_left.gif";
} }
else else {
{
icon_identifier = "right_evidence_icon"; icon_identifier = "right_evidence_icon";
gif_name = "evidence_appear_right.gif"; gif_name = "evidence_appear_right.gif";
} }
pos_size_type icon_dimensions = ao_app->get_element_dimensions(icon_identifier, "courtroom_design.ini"); pos_size_type icon_dimensions =
ao_app->get_element_dimensions(icon_identifier, "courtroom_design.ini");
evidence_icon->move(icon_dimensions.x, icon_dimensions.y); evidence_icon->move(icon_dimensions.x, icon_dimensions.y);
evidence_icon->resize(icon_dimensions.width, icon_dimensions.height); evidence_icon->resize(icon_dimensions.width, icon_dimensions.height);
evidence_icon->setPixmap(f_pixmap.scaled(evidence_icon->width(), evidence_icon->height(), Qt::IgnoreAspectRatio)); evidence_icon->setPixmap(f_pixmap.scaled(
evidence_icon->width(), evidence_icon->height(), Qt::IgnoreAspectRatio));
QString f_default_gif_path = ao_app->get_default_theme_path(gif_name); QString f_default_gif_path = ao_app->get_default_theme_path(gif_name);
QString f_gif_path = ao_app->get_theme_path(gif_name); QString f_gif_path = ao_app->get_theme_path(gif_name);
@ -57,7 +60,7 @@ void AOEvidenceDisplay::show_evidence(QString p_evidence_image, bool is_left_sid
evidence_movie->setFileName(final_gif_path); evidence_movie->setFileName(final_gif_path);
if(evidence_movie->frameCount() < 1) if (evidence_movie->frameCount() < 1)
return; return;
this->setMovie(evidence_movie); this->setMovie(evidence_movie);
@ -68,9 +71,8 @@ void AOEvidenceDisplay::show_evidence(QString p_evidence_image, bool is_left_sid
void AOEvidenceDisplay::frame_change(int p_frame) void AOEvidenceDisplay::frame_change(int p_frame)
{ {
if (p_frame == (evidence_movie->frameCount() - 1)) if (p_frame == (evidence_movie->frameCount() - 1)) {
{ // we need this or else the last frame wont show
//we need this or else the last frame wont show
delay(evidence_movie->nextFrameDelay()); delay(evidence_movie->nextFrameDelay());
evidence_movie->stop(); evidence_movie->stop();
@ -88,9 +90,4 @@ void AOEvidenceDisplay::reset()
this->clear(); this->clear();
} }
QLabel* AOEvidenceDisplay::get_evidence_icon() QLabel *AOEvidenceDisplay::get_evidence_icon() { return evidence_icon; }
{
return evidence_icon;
}

View File

@ -8,10 +8,7 @@ AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
ao_app = p_ao_app; ao_app = p_ao_app;
} }
AOImage::~AOImage() AOImage::~AOImage() {}
{
}
void AOImage::set_image(QString p_image) void AOImage::set_image(QString p_image)
{ {
@ -27,7 +24,8 @@ void AOImage::set_image(QString p_image)
QPixmap f_pixmap(final_image_path); QPixmap f_pixmap(final_image_path);
this->setPixmap(f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio)); this->setPixmap(
f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio));
} }
void AOImage::set_image_from_path(QString p_path) void AOImage::set_image_from_path(QString p_path)
@ -43,5 +41,6 @@ void AOImage::set_image_from_path(QString p_path)
QPixmap f_pixmap(final_path); QPixmap f_pixmap(final_path);
this->setPixmap(f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio)); this->setPixmap(
f_pixmap.scaled(this->width(), this->height(), Qt::IgnoreAspectRatio));
} }

View File

@ -15,7 +15,4 @@ void AOLineEdit::mouseDoubleClickEvent(QMouseEvent *e)
this->setReadOnly(false); this->setReadOnly(false);
} }
void AOLineEdit::on_enter_pressed() void AOLineEdit::on_enter_pressed() { this->setReadOnly(true); }
{
this->setReadOnly(true);
}

View File

@ -1,119 +1,116 @@
#include "aomovie.h" #include "aomovie.h"
#include "courtroom.h" #include "courtroom.h"
#include "file_functions.h" #include "file_functions.h"
#include "misc_functions.h" #include "misc_functions.h"
AOMovie::AOMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent) AOMovie::AOMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent)
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
m_movie = new QMovie(); m_movie = new QMovie();
this->setMovie(m_movie); this->setMovie(m_movie);
timer = new QTimer(this); timer = new QTimer(this);
timer->setTimerType(Qt::PreciseTimer); timer->setTimerType(Qt::PreciseTimer);
timer->setSingleShot(true); timer->setSingleShot(true);
connect(m_movie, SIGNAL(frameChanged(int)), this, SLOT(frame_change(int))); connect(m_movie, SIGNAL(frameChanged(int)), this, SLOT(frame_change(int)));
connect(timer, SIGNAL(timeout()), this, SLOT(timer_done())); connect(timer, SIGNAL(timeout()), this, SLOT(timer_done()));
} }
void AOMovie::set_play_once(bool p_play_once) void AOMovie::set_play_once(bool p_play_once) { play_once = p_play_once; }
{ void AOMovie::start_timer(int delay) { timer->start(delay); }
play_once = p_play_once;
} void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme,
void AOMovie::start_timer(int delay) { timer->start(delay); } int duration)
{
void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme,
int duration) m_movie->stop();
{ // this->timer_done();
QString shout_path = p_gif;
m_movie->stop(); QList<QString> pathlist;
// this->timer_done();
QString shout_path = p_gif; if (ao_app->get_character_path(p_char, p_gif)
QList<QString> pathlist; .contains(
"custom_objections")) // checks if the file is located within the
if (ao_app->get_character_path(p_char, p_gif) // folder of custom objections
.contains( pathlist << ao_app->get_character_path(
"custom_objections")) // checks if the file is located within the p_char,
// folder of custom objections p_gif); // get_image_suffix is unecessery as it is already given.
pathlist << ao_app->get_character_path( else if (p_gif == "custom")
p_char, pathlist << ao_app->get_image_suffix(
p_gif); // get_image_suffix is unecessery as it is already given. ao_app->get_character_path(p_char, p_gif));
else if (p_gif == "custom") else
pathlist << ao_app->get_image_suffix( pathlist << ao_app->get_image_suffix(
ao_app->get_character_path(p_char, p_gif)); ao_app->get_character_path(p_char, p_gif + "_bubble"));
else
pathlist << ao_app->get_image_suffix( QString misc_path = ao_app->get_base_path() + "misc/" + p_custom_theme + "/" +
ao_app->get_character_path(p_char, p_gif + "_bubble")); p_gif + "_bubble.gif";
QString custom_theme_path =
QString misc_path = ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + ao_app->get_custom_theme_path(p_custom_theme, p_gif + ".gif");
p_gif + "_bubble.gif"; QString theme_path = ao_app->get_theme_path(p_gif + ".gif");
QString custom_theme_path = QString default_theme_path = ao_app->get_default_theme_path(p_gif + ".gif");
ao_app->get_custom_theme_path(p_custom_theme, p_gif + ".gif"); QString placeholder_path = ao_app->get_theme_path("placeholder.gif");
QString theme_path = ao_app->get_theme_path(p_gif + ".gif"); QString default_placeholder_path =
QString default_theme_path = ao_app->get_default_theme_path(p_gif + ".gif"); ao_app->get_default_theme_path("placeholder.gif");
QString placeholder_path = ao_app->get_theme_path("placeholder.gif");
QString default_placeholder_path = pathlist << ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" +
ao_app->get_default_theme_path("placeholder.gif"); p_custom_theme + "/" + p_gif + "_bubble")
<< // Misc path
pathlist << ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" + ao_app->get_image_suffix(
p_custom_theme + "/" + p_gif + "_bubble") ao_app->get_custom_theme_path(p_custom_theme, p_gif))
<< // Misc path << // Custom theme path
ao_app->get_image_suffix( ao_app->get_image_suffix(ao_app->get_theme_path(p_gif)) << // Theme path
ao_app->get_custom_theme_path(p_custom_theme, p_gif)) ao_app->get_image_suffix(ao_app->get_default_theme_path(p_gif))
<< // Custom theme path << // Default theme path
ao_app->get_image_suffix(ao_app->get_theme_path(p_gif)) << // Theme path ao_app->get_image_suffix(ao_app->get_theme_path("placeholder"))
ao_app->get_image_suffix(ao_app->get_default_theme_path(p_gif)) << // Placeholder path
<< // Default theme path ao_app->get_image_suffix(ao_app->get_default_theme_path(
ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")) "placeholder")); // Default placeholder path
<< // Placeholder path
ao_app->get_image_suffix(ao_app->get_default_theme_path( for (QString path : pathlist) {
"placeholder")); // Default placeholder path if (file_exists(path)) {
shout_path = path;
for (QString path : pathlist) { break;
if (file_exists(path)) { }
shout_path = path; }
break; m_movie->setFileName(shout_path);
} if (m_movie->loopCount() == 0)
} play_once = true;
m_movie->setFileName(shout_path);
if (m_movie->loopCount() == 0) this->show();
play_once = true; m_movie->start();
if (m_movie->frameCount() == 0 && duration > 0)
this->show(); timer->start(duration);
m_movie->start(); }
if (m_movie->frameCount() == 0 && duration > 0)
timer->start(duration); void AOMovie::stop()
} {
m_movie->stop();
void AOMovie::stop() this->hide();
{ }
m_movie->stop();
this->hide(); void AOMovie::frame_change(int n_frame)
} {
// If it's a "static movie" (only one frame - png image), we can't change
void AOMovie::frame_change(int n_frame) // frames - ignore this function (use timer instead). If the frame didn't
{ // reach the last frame or the movie is continuous, don't stop the movie.
// If it's a "static movie" (only one frame - png image), we can't change if (m_movie->frameCount() == 0 || n_frame < (m_movie->frameCount() - 1) ||
// frames - ignore this function (use timer instead). If the frame didn't !play_once)
// reach the last frame or the movie is continuous, don't stop the movie. return;
if (m_movie->frameCount() == 0 || n_frame < (m_movie->frameCount() - 1) || // we need this or else the last frame wont show
!play_once) timer->start(m_movie->nextFrameDelay());
return; }
// we need this or else the last frame wont show
timer->start(m_movie->nextFrameDelay()); void AOMovie::timer_done()
} {
this->stop();
void AOMovie::timer_done() done();
{ }
this->stop();
done(); void AOMovie::combo_resize(int w, int h)
} {
QSize f_size(w, h);
void AOMovie::combo_resize(int w, int h) this->resize(f_size);
{ m_movie->setScaledSize(f_size);
QSize f_size(w, h); }
this->resize(f_size);
m_movie->setScaledSize(f_size);
}

View File

@ -1,16 +1,14 @@
#include "aomusicplayer.h" #include "aomusicplayer.h"
#if defined(BASSAUDIO) #if defined(BASSAUDIO)
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app): QObject() AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
: QObject()
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
} }
AOMusicPlayer::~AOMusicPlayer() AOMusicPlayer::~AOMusicPlayer() { kill_loop(); }
{
kill_loop();
}
void AOMusicPlayer::play(QString p_song) void AOMusicPlayer::play(QString p_song)
{ {
@ -18,24 +16,21 @@ void AOMusicPlayer::play(QString p_song)
f_path = ao_app->get_music_path(p_song); f_path = ao_app->get_music_path(p_song);
m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE); m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0,
BASS_STREAM_AUTOFREE | BASS_UNICODE |
BASS_ASYNCFILE);
this->set_volume(m_volume); this->set_volume(m_volume);
if (ao_app->get_audio_output_device() != "default") if (ao_app->get_audio_output_device() != "default")
BASS_ChannelSetDevice(m_stream, BASS_GetDevice()); BASS_ChannelSetDevice(m_stream, BASS_GetDevice());
if(enable_looping) if (enable_looping) {
{
BASS_ChannelFlags(m_stream, BASS_SAMPLE_LOOP, BASS_SAMPLE_LOOP); BASS_ChannelFlags(m_stream, BASS_SAMPLE_LOOP, BASS_SAMPLE_LOOP);
} }
else else {
{
BASS_ChannelFlags(m_stream, 0, BASS_SAMPLE_LOOP); BASS_ChannelFlags(m_stream, 0, BASS_SAMPLE_LOOP);
} }
BASS_ChannelPlay(m_stream, false); BASS_ChannelPlay(m_stream, false);
} }
void AOMusicPlayer::set_volume(int p_value) void AOMusicPlayer::set_volume(int p_value)
@ -45,27 +40,19 @@ void AOMusicPlayer::set_volume(int p_value)
BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume); BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
} }
QString AOMusicPlayer::get_path() QString AOMusicPlayer::get_path() { return f_path; }
{
return f_path;
}
void AOMusicPlayer::kill_loop() void AOMusicPlayer::kill_loop() { BASS_ChannelStop(m_stream); }
{
BASS_ChannelStop(m_stream);
}
#elif defined(QTAUDIO) #elif defined(QTAUDIO)
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app): QObject() AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
: QObject()
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
} }
AOMusicPlayer::~AOMusicPlayer() AOMusicPlayer::~AOMusicPlayer() { m_player.stop(); }
{
m_player.stop();
}
void AOMusicPlayer::play(QString p_song) void AOMusicPlayer::play(QString p_song)
{ {
@ -88,47 +75,27 @@ void AOMusicPlayer::set_volume(int p_value)
QAudio::LogarithmicVolumeScale, QAudio::LogarithmicVolumeScale,
QAudio::LinearVolumeScale); QAudio::LinearVolumeScale);
m_player.setVolume(linearVolume*100); m_player.setVolume(linearVolume * 100);
} }
QString AOMusicPlayer::get_path() QString AOMusicPlayer::get_path() { return f_path; }
{
return f_path;
}
void AOMusicPlayer::kill_loop() void AOMusicPlayer::kill_loop() { m_player.stop(); }
{
m_player.stop();
}
#else #else
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app): QObject() AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
: QObject()
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
} }
AOMusicPlayer::~AOMusicPlayer() AOMusicPlayer::~AOMusicPlayer() {}
{
} void AOMusicPlayer::play(QString p_song) {}
void AOMusicPlayer::play(QString p_song) void AOMusicPlayer::set_volume(int p_value) {}
{
} QString AOMusicPlayer::get_path() { return f_path; }
void AOMusicPlayer::set_volume(int p_value) void AOMusicPlayer::kill_loop() {}
{
}
QString AOMusicPlayer::get_path()
{
return f_path;
}
void AOMusicPlayer::kill_loop()
{
}
#endif #endif

View File

@ -8,8 +8,7 @@ AOPacket::AOPacket(QString p_packet_string)
m_header = packet_contents.at(0); m_header = packet_contents.at(0);
for(int n_string = 1 ; n_string < packet_contents.size() - 1 ; ++n_string) for (int n_string = 1; n_string < packet_contents.size() - 1; ++n_string) {
{
m_contents.append(packet_contents.at(n_string)); m_contents.append(packet_contents.at(n_string));
} }
} }
@ -20,23 +19,18 @@ AOPacket::AOPacket(QString p_header, QStringList &p_contents)
m_contents = p_contents; m_contents = p_contents;
} }
AOPacket::~AOPacket() AOPacket::~AOPacket() {}
{
}
QString AOPacket::to_string() QString AOPacket::to_string()
{ {
QString f_string = m_header; QString f_string = m_header;
for (QString i_string : m_contents) for (QString i_string : m_contents) {
{
f_string += ("#" + i_string); f_string += ("#" + i_string);
} }
f_string += "#%"; f_string += "#%";
if (encrypted) if (encrypted)
return "#" + f_string; return "#" + f_string;
else else
@ -59,10 +53,12 @@ void AOPacket::decrypt_header(unsigned int p_key)
void AOPacket::net_encode() void AOPacket::net_encode()
{ {
for (int n_element = 0 ; n_element < m_contents.size() ; ++n_element) for (int n_element = 0; n_element < m_contents.size(); ++n_element) {
{
QString f_element = m_contents.at(n_element); QString f_element = m_contents.at(n_element);
f_element.replace("#", "<num>").replace("%", "<percent>").replace("$", "<dollar>").replace("&", "<and>"); f_element.replace("#", "<num>")
.replace("%", "<percent>")
.replace("$", "<dollar>")
.replace("&", "<and>");
m_contents.removeAt(n_element); m_contents.removeAt(n_element);
m_contents.insert(n_element, f_element); m_contents.insert(n_element, f_element);
@ -71,13 +67,14 @@ void AOPacket::net_encode()
void AOPacket::net_decode() void AOPacket::net_decode()
{ {
for (int n_element = 0 ; n_element < m_contents.size() ; ++n_element) for (int n_element = 0; n_element < m_contents.size(); ++n_element) {
{
QString f_element = m_contents.at(n_element); QString f_element = m_contents.at(n_element);
f_element.replace("<num>", "#").replace("<percent>", "%").replace("<dollar>", "$").replace("<and>", "&"); f_element.replace("<num>", "#")
.replace("<percent>", "%")
.replace("<dollar>", "$")
.replace("<and>", "&");
m_contents.removeAt(n_element); m_contents.removeAt(n_element);
m_contents.insert(n_element, f_element); m_contents.insert(n_element, f_element);
} }
} }

View File

@ -1,8 +1,8 @@
#include "aosfxplayer.h" #include "aosfxplayer.h"
#include "file_functions.h" #include "file_functions.h"
#if defined(BASSAUDIO) //Using bass.dll for sfx #if defined(BASSAUDIO) // Using bass.dll for sfx
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject() AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
@ -11,7 +11,7 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
{ {
BASS_ChannelStop(m_stream); BASS_ChannelStop(m_stream);
QString misc_path = ""; QString misc_path = "";
QString char_path = ""; QString char_path = "";
QString sound_path = ao_app->get_sounds_path(p_sfx); QString sound_path = ao_app->get_sounds_path(p_sfx);
@ -24,38 +24,35 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
QString f_path; QString f_path;
if (file_exists(char_path)) if (file_exists(char_path))
f_path = char_path; f_path = char_path;
else if (file_exists(misc_path)) else if (file_exists(misc_path))
f_path = misc_path; f_path = misc_path;
else else
f_path = sound_path; f_path = sound_path;
BASS_ChannelStop(m_stream); BASS_ChannelStop(m_stream);
m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE); m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0,
BASS_STREAM_AUTOFREE | BASS_UNICODE |
BASS_ASYNCFILE);
set_volume_internal(m_volume); set_volume_internal(m_volume);
if (ao_app->get_audio_output_device() != "default") if (ao_app->get_audio_output_device() != "default")
BASS_ChannelSetDevice(m_stream, BASS_GetDevice()); BASS_ChannelSetDevice(m_stream, BASS_GetDevice());
BASS_ChannelPlay(m_stream, false); BASS_ChannelPlay(m_stream, false);
if(looping_sfx && ao_app->get_looping_sfx()) if (looping_sfx && ao_app->get_looping_sfx()) {
{
BASS_ChannelFlags(m_stream, BASS_SAMPLE_LOOP, BASS_SAMPLE_LOOP); BASS_ChannelFlags(m_stream, BASS_SAMPLE_LOOP, BASS_SAMPLE_LOOP);
} }
else else {
{
BASS_ChannelFlags(m_stream, 0, BASS_SAMPLE_LOOP); BASS_ChannelFlags(m_stream, 0, BASS_SAMPLE_LOOP);
} }
} }
void AOSfxPlayer::setLooping(bool is_looping) void AOSfxPlayer::setLooping(bool is_looping)
{ {
this->looping_sfx = is_looping; this->looping_sfx = is_looping;
} }
void AOSfxPlayer::stop() void AOSfxPlayer::stop() { BASS_ChannelStop(m_stream); }
{
BASS_ChannelStop(m_stream);
}
void AOSfxPlayer::set_volume(qreal p_value) void AOSfxPlayer::set_volume(qreal p_value)
{ {
@ -65,11 +62,11 @@ void AOSfxPlayer::set_volume(qreal p_value)
void AOSfxPlayer::set_volume_internal(qreal p_value) void AOSfxPlayer::set_volume_internal(qreal p_value)
{ {
float volume = p_value; float volume = p_value;
BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume); BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
} }
#elif defined(QTAUDIO) //Using Qt's QSoundEffect class #elif defined(QTAUDIO) // Using Qt's QSoundEffect class
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject() AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
@ -91,35 +88,32 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
QString f_path; QString f_path;
if (file_exists(char_path)) if (file_exists(char_path))
f_path = char_path; f_path = char_path;
else if (file_exists(misc_path)) else if (file_exists(misc_path))
f_path = misc_path; f_path = misc_path;
else else
f_path = sound_path; f_path = sound_path;
if (file_exists(f_path)) //if its missing, it will glitch out if (file_exists(f_path)) // if its missing, it will glitch out
{ {
m_sfx.setSource(QUrl::fromLocalFile(f_path)); m_sfx.setSource(QUrl::fromLocalFile(f_path));
set_volume_internal(m_volume); set_volume_internal(m_volume);
m_sfx.play(); m_sfx.play();
} }
} }
void AOSfxPlayer::setLooping(bool is_looping) void AOSfxPlayer::setLooping(bool is_looping)
{ {
this->looping_sfx = is_looping; this->looping_sfx = is_looping;
} }
void AOSfxPlayer::stop() void AOSfxPlayer::stop() { m_sfx.stop(); }
{
m_sfx.stop();
}
void AOSfxPlayer::set_volume(qreal p_value) void AOSfxPlayer::set_volume(qreal p_value)
{ {
m_volume = p_value/100; m_volume = p_value / 100;
set_volume_internal(m_volume); set_volume_internal(m_volume);
} }
@ -128,34 +122,22 @@ void AOSfxPlayer::set_volume_internal(qreal p_value)
m_sfx.setVolume(m_volume); m_sfx.setVolume(m_volume);
} }
#else #else
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject() AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
} }
void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) {}
{
}
void AOSfxPlayer::setLooping(bool is_looping) void AOSfxPlayer::setLooping(bool is_looping)
{ {
this->looping_sfx = is_looping; this->looping_sfx = is_looping;
} }
void AOSfxPlayer::stop() void AOSfxPlayer::stop() {}
{
} void AOSfxPlayer::set_volume(qreal p_value) {}
void AOSfxPlayer::set_volume(qreal p_value) void AOSfxPlayer::set_volume_internal(qreal p_value) {}
{
}
void AOSfxPlayer::set_volume_internal(qreal p_value)
{
}
#endif #endif

View File

@ -1,16 +1,14 @@
#include "aotextarea.h" #include "aotextarea.h"
AOTextArea::AOTextArea(QWidget *p_parent) : QTextBrowser(p_parent) AOTextArea::AOTextArea(QWidget *p_parent) : QTextBrowser(p_parent) {}
{
}
void AOTextArea::append_chatmessage(QString p_name, QString p_message, void AOTextArea::append_chatmessage(QString p_name, QString p_message,
QString p_colour, bool song) QString p_colour, bool song)
{ {
const QTextCursor old_cursor = this->textCursor(); const QTextCursor old_cursor = this->textCursor();
const int old_scrollbar_value = this->verticalScrollBar()->value(); const int old_scrollbar_value = this->verticalScrollBar()->value();
const bool is_scrolled_down = old_scrollbar_value == this->verticalScrollBar()->maximum(); const bool is_scrolled_down =
old_scrollbar_value == this->verticalScrollBar()->maximum();
this->moveCursor(QTextCursor::End); this->moveCursor(QTextCursor::End);
@ -22,9 +20,11 @@ void AOTextArea::append_chatmessage(QString p_name, QString p_message,
this->insertHtml("<b><font color=" + p_colour + ">" + this->insertHtml("<b><font color=" + p_colour + ">" +
p_name.toHtmlEscaped() + "</font></b>:&nbsp;"); p_name.toHtmlEscaped() + "</font></b>:&nbsp;");
//cheap workarounds ahoy // cheap workarounds ahoy
p_message += " "; p_message += " ";
QString result = p_message.toHtmlEscaped().replace("\n", "<br>").replace(omnis_dank_url_regex, "<a href='\\1'>\\1</a>" ); QString result = p_message.toHtmlEscaped()
.replace("\n", "<br>")
.replace(omnis_dank_url_regex, "<a href='\\1'>\\1</a>");
this->insertHtml(result); this->insertHtml(result);
@ -35,32 +35,35 @@ void AOTextArea::append_error(QString p_message)
{ {
const QTextCursor old_cursor = this->textCursor(); const QTextCursor old_cursor = this->textCursor();
const int old_scrollbar_value = this->verticalScrollBar()->value(); const int old_scrollbar_value = this->verticalScrollBar()->value();
const bool is_scrolled_down = old_scrollbar_value == this->verticalScrollBar()->maximum(); const bool is_scrolled_down =
old_scrollbar_value == this->verticalScrollBar()->maximum();
this->moveCursor(QTextCursor::End); this->moveCursor(QTextCursor::End);
this->append(""); this->append("");
p_message += " "; p_message += " ";
QString result = p_message.replace("\n", "<br>").replace(omnis_dank_url_regex, "<a href='\\1'>\\1</a>" ); QString result = p_message.replace("\n", "<br>")
.replace(omnis_dank_url_regex, "<a href='\\1'>\\1</a>");
this->insertHtml("<font color='red'>" + result + "</font>"); this->insertHtml("<font color='red'>" + result + "</font>");
this->auto_scroll(old_cursor, old_scrollbar_value, is_scrolled_down); this->auto_scroll(old_cursor, old_scrollbar_value, is_scrolled_down);
} }
void AOTextArea::auto_scroll(QTextCursor old_cursor, int old_scrollbar_value, bool is_scrolled_down) void AOTextArea::auto_scroll(QTextCursor old_cursor, int old_scrollbar_value,
bool is_scrolled_down)
{ {
if (old_cursor.hasSelection() || !is_scrolled_down) if (old_cursor.hasSelection() || !is_scrolled_down) {
{ // The user has selected text or scrolled away from the bottom: maintain
// The user has selected text or scrolled away from the bottom: maintain position. // position.
this->setTextCursor(old_cursor); this->setTextCursor(old_cursor);
this->verticalScrollBar()->setValue(old_scrollbar_value); this->verticalScrollBar()->setValue(old_scrollbar_value);
} }
else else {
{ // The user hasn't selected any text and the scrollbar is at the bottom:
// The user hasn't selected any text and the scrollbar is at the bottom: scroll to the bottom. // scroll to the bottom.
this->moveCursor(QTextCursor::End); this->moveCursor(QTextCursor::End);
this->verticalScrollBar()->setValue(this->verticalScrollBar()->maximum()); this->verticalScrollBar()->setValue(this->verticalScrollBar()->maximum());
} }
} }

View File

@ -4,7 +4,7 @@ AOTextEdit::AOTextEdit(QWidget *parent) : QPlainTextEdit(parent)
{ {
this->setReadOnly(true); this->setReadOnly(true);
//connect(this, SIGNAL(returnPressed()), this, SLOT(on_enter_pressed())); // connect(this, SIGNAL(returnPressed()), this, SLOT(on_enter_pressed()));
} }
void AOTextEdit::mouseDoubleClickEvent(QMouseEvent *e) void AOTextEdit::mouseDoubleClickEvent(QMouseEvent *e)
@ -14,8 +14,4 @@ void AOTextEdit::mouseDoubleClickEvent(QMouseEvent *e)
this->setReadOnly(false); this->setReadOnly(false);
} }
void AOTextEdit::on_enter_pressed() void AOTextEdit::on_enter_pressed() { this->setReadOnly(true); }
{
this->setReadOnly(true);
}

View File

@ -1,12 +1,11 @@
#include "courtroom.h" #include "courtroom.h"
#include "lobby.h" #include "lobby.h"
#include "file_functions.h"
#include "debug_functions.h" #include "debug_functions.h"
#include "file_functions.h"
#include "hardware_functions.h" #include "hardware_functions.h"
class AOCharSelectGenerationThreading : public QRunnable class AOCharSelectGenerationThreading : public QRunnable {
{
public: public:
Courtroom *thisCourtroom; Courtroom *thisCourtroom;
int char_num; int char_num;
@ -93,28 +92,36 @@ void Courtroom::construct_char_select()
set_size_and_pos(ui_char_buttons, "char_buttons"); set_size_and_pos(ui_char_buttons, "char_buttons");
connect(char_button_mapper, SIGNAL(mapped(int)), this, SLOT(char_clicked(int))); connect(char_button_mapper, SIGNAL(mapped(int)), this,
connect(ui_back_to_lobby, SIGNAL(clicked()), this, SLOT(on_back_to_lobby_clicked())); SLOT(char_clicked(int)));
connect(ui_back_to_lobby, SIGNAL(clicked()), this,
SLOT(on_back_to_lobby_clicked()));
connect(ui_char_select_left, SIGNAL(clicked()), this, SLOT(on_char_select_left_clicked())); connect(ui_char_select_left, SIGNAL(clicked()), this,
connect(ui_char_select_right, SIGNAL(clicked()), this, SLOT(on_char_select_right_clicked())); SLOT(on_char_select_left_clicked()));
connect(ui_char_select_right, SIGNAL(clicked()), this,
SLOT(on_char_select_right_clicked()));
connect(ui_spectator, SIGNAL(clicked()), this, SLOT(on_spectator_clicked())); connect(ui_spectator, SIGNAL(clicked()), this, SLOT(on_spectator_clicked()));
connect(ui_char_search, SIGNAL(textEdited(const QString&)), this, SLOT(on_char_search_changed())); connect(ui_char_search, SIGNAL(textEdited(const QString &)), this,
connect(ui_char_passworded, SIGNAL(stateChanged(int)), this, SLOT(on_char_passworded_clicked())); SLOT(on_char_search_changed()));
connect(ui_char_taken, SIGNAL(stateChanged(int)), this, SLOT(on_char_taken_clicked())); connect(ui_char_passworded, SIGNAL(stateChanged(int)), this,
SLOT(on_char_passworded_clicked()));
connect(ui_char_taken, SIGNAL(stateChanged(int)), this,
SLOT(on_char_taken_clicked()));
} }
void Courtroom::set_char_select() void Courtroom::set_char_select()
{ {
QString filename = "courtroom_design.ini"; QString filename = "courtroom_design.ini";
pos_size_type f_charselect = ao_app->get_element_dimensions("char_select", filename); pos_size_type f_charselect =
ao_app->get_element_dimensions("char_select", filename);
if (f_charselect.width < 0 || f_charselect.height < 0) if (f_charselect.width < 0 || f_charselect.height < 0) {
{ qDebug()
qDebug() << "W: did not find courtroom width or height in courtroom_design.ini!"; << "W: did not find courtroom width or height in courtroom_design.ini!";
this->resize(714, 668); this->resize(714, 668);
} }
else else
@ -135,25 +142,22 @@ void Courtroom::set_char_select_page()
ui_char_select_left->hide(); ui_char_select_left->hide();
ui_char_select_right->hide(); ui_char_select_right->hide();
for (AOCharButton *i_button : ui_char_button_list) for (AOCharButton *i_button : ui_char_button_list) {
{
i_button->reset(); i_button->reset();
i_button->hide(); i_button->hide();
i_button->move(0,0); i_button->move(0, 0);
} }
int total_pages = ui_char_button_list_filtered.size() / max_chars_on_page; int total_pages = ui_char_button_list_filtered.size() / max_chars_on_page;
int chars_on_page = 0; int chars_on_page = 0;
if (ui_char_button_list_filtered.size() % max_chars_on_page != 0) if (ui_char_button_list_filtered.size() % max_chars_on_page != 0) {
{
++total_pages; ++total_pages;
//i. e. not on the last page // i. e. not on the last page
if (total_pages > current_char_page + 1) if (total_pages > current_char_page + 1)
chars_on_page = max_chars_on_page; chars_on_page = max_chars_on_page;
else else
chars_on_page = ui_char_button_list_filtered.size() % max_chars_on_page; chars_on_page = ui_char_button_list_filtered.size() % max_chars_on_page;
} }
else else
chars_on_page = max_chars_on_page; chars_on_page = max_chars_on_page;
@ -169,24 +173,25 @@ void Courtroom::set_char_select_page()
void Courtroom::char_clicked(int n_char) void Courtroom::char_clicked(int n_char)
{ {
QString char_ini_path = ao_app->get_character_path(char_list.at(n_char).name, "char.ini"); QString char_ini_path =
ao_app->get_character_path(char_list.at(n_char).name, "char.ini");
qDebug() << "char_ini_path" << char_ini_path; qDebug() << "char_ini_path" << char_ini_path;
if (!file_exists(char_ini_path)) if (!file_exists(char_ini_path)) {
{
call_notice(tr("Could not find %1").arg(char_ini_path, 1)); call_notice(tr("Could not find %1").arg(char_ini_path, 1));
return; return;
} }
if (n_char == m_cid) if (n_char == m_cid) {
{
enter_courtroom(m_cid); enter_courtroom(m_cid);
} }
else else {
{ ao_app->send_server_packet(
ao_app->send_server_packet(new AOPacket("PW#" + ui_char_password->text() + "#%")); new AOPacket("PW#" + ui_char_password->text() + "#%"));
ao_app->send_server_packet(new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" + QString::number(n_char) + "#" + get_hdid() + "#%")); ao_app->send_server_packet(
new AOPacket("CC#" + QString::number(ao_app->s_pv) + "#" +
QString::number(n_char) + "#" + get_hdid() + "#%"));
} }
ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name); ui_ic_chat_name->setPlaceholderText(char_list.at(n_char).name);
@ -194,53 +199,55 @@ void Courtroom::char_clicked(int n_char)
void Courtroom::put_button_in_place(int starting, int chars_on_this_page) void Courtroom::put_button_in_place(int starting, int chars_on_this_page)
{ {
if (ui_char_button_list_filtered.size() == 0) if (ui_char_button_list_filtered.size() == 0)
return; return;
QPoint f_spacing = ao_app->get_button_spacing("char_button_spacing", "courtroom_design.ini"); QPoint f_spacing =
ao_app->get_button_spacing("char_button_spacing", "courtroom_design.ini");
int x_spacing = f_spacing.x(); int x_spacing = f_spacing.x();
int x_mod_count = 0; int x_mod_count = 0;
int y_spacing = f_spacing.y(); int y_spacing = f_spacing.y();
int y_mod_count = 0; int y_mod_count = 0;
char_columns = ((ui_char_buttons->width() - button_width) / (x_spacing + button_width)) + 1; char_columns =
char_rows = ((ui_char_buttons->height() - button_height) / (y_spacing + button_height)) + 1; ((ui_char_buttons->width() - button_width) / (x_spacing + button_width)) +
1;
char_rows = ((ui_char_buttons->height() - button_height) /
(y_spacing + button_height)) +
1;
max_chars_on_page = char_columns * char_rows; max_chars_on_page = char_columns * char_rows;
int startout = starting; int startout = starting;
for (int n = starting ; n < startout+chars_on_this_page ; ++n) for (int n = starting; n < startout + chars_on_this_page; ++n) {
{ int x_pos = (button_width + x_spacing) * x_mod_count;
int x_pos = (button_width + x_spacing) * x_mod_count; int y_pos = (button_height + y_spacing) * y_mod_count;
int y_pos = (button_height + y_spacing) * y_mod_count;
ui_char_button_list_filtered.at(n)->move(x_pos, y_pos); ui_char_button_list_filtered.at(n)->move(x_pos, y_pos);
ui_char_button_list_filtered.at(n)->show(); ui_char_button_list_filtered.at(n)->show();
ui_char_button_list_filtered.at(n)->apply_taken_image(); ui_char_button_list_filtered.at(n)->apply_taken_image();
++x_mod_count; ++x_mod_count;
if (x_mod_count == char_columns) if (x_mod_count == char_columns) {
{ ++y_mod_count;
++y_mod_count; x_mod_count = 0;
x_mod_count = 0;
}
} }
}
} }
void Courtroom::character_loading_finished() void Courtroom::character_loading_finished()
{ {
// Zeroeth, we'll clear any leftover characters from previous server visits. // Zeroeth, we'll clear any leftover characters from previous server visits.
ao_app->generated_chars = 0; ao_app->generated_chars = 0;
if (ui_char_button_list.size() > 0) if (ui_char_button_list.size() > 0) {
{ foreach (AOCharButton *item, ui_char_button_list) {
foreach (AOCharButton* item, ui_char_button_list) { delete item;
delete item;
}
ui_char_button_list.clear();
} }
ui_char_button_list.clear();
}
// First, we'll make all the character buttons in the very beginning. // First, we'll make all the character buttons in the very beginning.
// Since we can't trust what will happen during the multi threading process, // Since we can't trust what will happen during the multi threading process,
@ -278,17 +285,8 @@ void Courtroom::filter_character_list()
set_char_select_page(); set_char_select_page();
} }
void Courtroom::on_char_search_changed() void Courtroom::on_char_search_changed() { filter_character_list(); }
{
filter_character_list();
}
void Courtroom::on_char_passworded_clicked() void Courtroom::on_char_passworded_clicked() { filter_character_list(); }
{
filter_character_list();
}
void Courtroom::on_char_taken_clicked() void Courtroom::on_char_taken_clicked() { filter_character_list(); }
{
filter_character_list();
}

View File

@ -33,36 +33,17 @@ chatlogpiece::chatlogpiece(QString p_name, QString p_showname,
datetime = p_datetime.toUTC(); datetime = p_datetime.toUTC();
} }
QString chatlogpiece::get_name() QString chatlogpiece::get_name() { return name; }
{
return name;
}
QString chatlogpiece::get_showname() QString chatlogpiece::get_showname() { return showname; }
{
return showname;
}
QString chatlogpiece::get_message() QString chatlogpiece::get_message() { return message; }
{
return message;
}
QDateTime chatlogpiece::get_datetime() QDateTime chatlogpiece::get_datetime() { return datetime; }
{
return datetime;
}
bool chatlogpiece::get_is_song() bool chatlogpiece::get_is_song() { return is_song; }
{
return is_song;
}
QString chatlogpiece::get_datetime_as_string()
{
return datetime.toString();
}
QString chatlogpiece::get_datetime_as_string() { return datetime.toString(); }
int chatlogpiece::get_chat_color() { return color; } int chatlogpiece::get_chat_color() { return color; }
QString chatlogpiece::get_full() QString chatlogpiece::get_full()

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
#include <QMessageBox>
#include <QCoreApplication> #include <QCoreApplication>
#include <QMessageBox>
#include "debug_functions.h" #include "debug_functions.h"
@ -7,11 +7,12 @@ void call_error(QString p_message)
{ {
QMessageBox *msgBox = new QMessageBox; QMessageBox *msgBox = new QMessageBox;
msgBox->setText(QCoreApplication::translate("debug_functions", "Error: %1").arg(p_message)); msgBox->setText(QCoreApplication::translate("debug_functions", "Error: %1")
msgBox->setWindowTitle(QCoreApplication::translate("debug_functions", "Error")); .arg(p_message));
msgBox->setWindowTitle(
QCoreApplication::translate("debug_functions", "Error"));
// msgBox->setWindowModality(Qt::NonModal);
//msgBox->setWindowModality(Qt::NonModal);
msgBox->exec(); msgBox->exec();
} }
@ -20,9 +21,10 @@ void call_notice(QString p_message)
QMessageBox *msgBox = new QMessageBox; QMessageBox *msgBox = new QMessageBox;
msgBox->setText(p_message); msgBox->setText(p_message);
msgBox->setWindowTitle(QCoreApplication::translate("debug_functions", "Notice"));
msgBox->setWindowTitle(
QCoreApplication::translate("debug_functions", "Notice"));
//msgBox->setWindowModality(Qt::NonModal); // msgBox->setWindowModality(Qt::NonModal);
msgBox->exec(); msgBox->exec();
} }

View File

@ -8,23 +8,18 @@ Discord::Discord()
DiscordEventHandlers handlers; DiscordEventHandlers handlers;
std::memset(&handlers, 0, sizeof(handlers)); std::memset(&handlers, 0, sizeof(handlers));
handlers = {}; handlers = {};
handlers.ready = [] { handlers.ready = [] { qInfo() << "Discord RPC ready"; };
qInfo() << "Discord RPC ready"; handlers.disconnected = [](int errorCode, const char *message) {
};
handlers.disconnected = [](int errorCode, const char* message) {
qInfo() << "Discord RPC disconnected! " << message << errorCode; qInfo() << "Discord RPC disconnected! " << message << errorCode;
}; };
handlers.errored = [](int errorCode, const char* message) { handlers.errored = [](int errorCode, const char *message) {
qWarning() << "Discord RPC errored out! " << message << errorCode; qWarning() << "Discord RPC errored out! " << message << errorCode;
}; };
qInfo() << "Initializing Discord RPC"; qInfo() << "Initializing Discord RPC";
Discord_Initialize(APPLICATION_ID, &handlers, 1, nullptr); Discord_Initialize(APPLICATION_ID, &handlers, 1, nullptr);
} }
Discord::~Discord() Discord::~Discord() { Discord_Shutdown(); }
{
Discord_Shutdown();
}
void Discord::state_lobby() void Discord::state_lobby()
{ {
@ -64,10 +59,12 @@ void Discord::state_server(std::string name, std::string server_id)
void Discord::state_character(std::string name) void Discord::state_character(std::string name)
{ {
auto name_internal = QString(name.c_str()).toLower().replace(' ', '_').toStdString(); auto name_internal =
QString(name.c_str()).toLower().replace(' ', '_').toStdString();
auto name_friendly = QString(name.c_str()).replace('_', ' ').toStdString(); auto name_friendly = QString(name.c_str()).replace('_', ' ').toStdString();
const std::string playing_as = "Playing as " + name_friendly; const std::string playing_as = "Playing as " + name_friendly;
qDebug() << "Discord RPC: Setting character state (" << playing_as.c_str() << ")"; qDebug() << "Discord RPC: Setting character state (" << playing_as.c_str()
<< ")";
DiscordRichPresence presence; DiscordRichPresence presence;
std::memset(&presence, 0, sizeof(presence)); std::memset(&presence, 0, sizeof(presence));
@ -101,20 +98,11 @@ void Discord::state_spectate()
Discord_UpdatePresence(&presence); Discord_UpdatePresence(&presence);
} }
#else #else
Discord::Discord() Discord::Discord() {}
{
} Discord::~Discord() {}
Discord::~Discord() void Discord::state_lobby() {}
{
}
void Discord::state_lobby()
{
}
void Discord::state_server(std::string name, std::string server_id) void Discord::state_server(std::string name, std::string server_id)
{ {
@ -129,7 +117,6 @@ void Discord::state_character(std::string name)
void Discord::state_spectate() void Discord::state_spectate()
{ {
qDebug() << "Discord RPC: Setting specator state"; qDebug() << "Discord RPC: Setting specator state";
} }
#endif #endif
} } // namespace AttorneyOnline

View File

@ -8,7 +8,8 @@ void Courtroom::construct_emotes()
set_size_and_pos(ui_emotes, "emotes"); set_size_and_pos(ui_emotes, "emotes");
QPoint f_spacing = ao_app->get_button_spacing("emote_button_spacing", "courtroom_design.ini"); QPoint f_spacing = ao_app->get_button_spacing("emote_button_spacing",
"courtroom_design.ini");
const int button_width = 40; const int button_width = 40;
int x_spacing = f_spacing.x(); int x_spacing = f_spacing.x();
@ -18,13 +19,14 @@ void Courtroom::construct_emotes()
int y_spacing = f_spacing.y(); int y_spacing = f_spacing.y();
int y_mod_count = 0; int y_mod_count = 0;
emote_columns = ((ui_emotes->width() - button_width) / (x_spacing + button_width)) + 1; emote_columns =
emote_rows = ((ui_emotes->height() - button_height) / (y_spacing + button_height)) + 1; ((ui_emotes->width() - button_width) / (x_spacing + button_width)) + 1;
emote_rows =
((ui_emotes->height() - button_height) / (y_spacing + button_height)) + 1;
max_emotes_on_page = emote_columns * emote_rows; max_emotes_on_page = emote_columns * emote_rows;
for (int n = 0 ; n < max_emotes_on_page ; ++n) for (int n = 0; n < max_emotes_on_page; ++n) {
{
int x_pos = (button_width + x_spacing) * x_mod_count; int x_pos = (button_width + x_spacing) * x_mod_count;
int y_pos = (button_height + y_spacing) * y_mod_count; int y_pos = (button_height + y_spacing) * y_mod_count;
@ -34,12 +36,12 @@ void Courtroom::construct_emotes()
f_emote->set_id(n); f_emote->set_id(n);
connect(f_emote, SIGNAL(emote_clicked(int)), this, SLOT(on_emote_clicked(int))); connect(f_emote, SIGNAL(emote_clicked(int)), this,
SLOT(on_emote_clicked(int)));
++x_mod_count; ++x_mod_count;
if (x_mod_count == emote_columns) if (x_mod_count == emote_columns) {
{
++y_mod_count; ++y_mod_count;
x_mod_count = 0; x_mod_count = 0;
} }
@ -56,23 +58,20 @@ void Courtroom::set_emote_page()
ui_emote_left->hide(); ui_emote_left->hide();
ui_emote_right->hide(); ui_emote_right->hide();
for (AOEmoteButton *i_button : ui_emote_list) for (AOEmoteButton *i_button : ui_emote_list) {
{
i_button->hide(); i_button->hide();
} }
int total_pages = total_emotes / max_emotes_on_page; int total_pages = total_emotes / max_emotes_on_page;
int emotes_on_page = 0; int emotes_on_page = 0;
if (total_emotes % max_emotes_on_page != 0) if (total_emotes % max_emotes_on_page != 0) {
{
++total_pages; ++total_pages;
//i. e. not on the last page // i. e. not on the last page
if (total_pages > current_emote_page + 1) if (total_pages > current_emote_page + 1)
emotes_on_page = max_emotes_on_page; emotes_on_page = max_emotes_on_page;
else else
emotes_on_page = total_emotes % max_emotes_on_page; emotes_on_page = total_emotes % max_emotes_on_page;
} }
else else
emotes_on_page = max_emotes_on_page; emotes_on_page = max_emotes_on_page;
@ -83,8 +82,7 @@ void Courtroom::set_emote_page()
if (current_emote_page > 0) if (current_emote_page > 0)
ui_emote_left->show(); ui_emote_left->show();
for (int n_emote = 0 ; n_emote < emotes_on_page ; ++n_emote) for (int n_emote = 0; n_emote < emotes_on_page; ++n_emote) {
{
int n_real_emote = n_emote + current_emote_page * max_emotes_on_page; int n_real_emote = n_emote + current_emote_page * max_emotes_on_page;
AOEmoteButton *f_emote = ui_emote_list.at(n_emote); AOEmoteButton *f_emote = ui_emote_list.at(n_emote);
@ -95,7 +93,6 @@ void Courtroom::set_emote_page()
f_emote->show(); f_emote->show();
} }
} }
void Courtroom::set_emote_dropdown() void Courtroom::set_emote_dropdown()
@ -105,8 +102,7 @@ void Courtroom::set_emote_dropdown()
int total_emotes = ao_app->get_emote_number(current_char); int total_emotes = ao_app->get_emote_number(current_char);
QStringList emote_list; QStringList emote_list;
for (int n = 0 ; n < total_emotes ; ++n) for (int n = 0; n < total_emotes; ++n) {
{
emote_list.append(ao_app->get_emote_comment(current_char, n)); emote_list.append(ao_app->get_emote_comment(current_char, n));
} }
@ -119,19 +115,20 @@ void Courtroom::select_emote(int p_id)
int max = (max_emotes_on_page - 1) + current_emote_page * max_emotes_on_page; int max = (max_emotes_on_page - 1) + current_emote_page * max_emotes_on_page;
if (current_emote >= min && current_emote <= max) if (current_emote >= min && current_emote <= max)
ui_emote_list.at(current_emote % max_emotes_on_page)->set_image(current_char, current_emote, "_off.png"); ui_emote_list.at(current_emote % max_emotes_on_page)
->set_image(current_char, current_emote, "_off.png");
int old_emote = current_emote; int old_emote = current_emote;
current_emote = p_id; current_emote = p_id;
if (current_emote >= min && current_emote <= max) if (current_emote >= min && current_emote <= max)
ui_emote_list.at(current_emote % max_emotes_on_page)->set_image(current_char, current_emote, "_on.png"); ui_emote_list.at(current_emote % max_emotes_on_page)
->set_image(current_char, current_emote, "_on.png");
int emote_mod = ao_app->get_emote_mod(current_char, current_emote); int emote_mod = ao_app->get_emote_mod(current_char, current_emote);
if (old_emote == current_emote) if (old_emote == current_emote) {
{
ui_pre->setChecked(!ui_pre->isChecked()); ui_pre->setChecked(!ui_pre->isChecked());
} }
else if (emote_mod == 1) else if (emote_mod == 1)

View File

@ -4,8 +4,8 @@
QString fanta_encrypt(QString temp_input, unsigned int p_key) QString fanta_encrypt(QString temp_input, unsigned int p_key)
{ {
//using standard stdlib types is actually easier here because of implicit char<->int conversion // using standard stdlib types is actually easier here because of implicit
//which in turn makes encryption arithmetic easier // char<->int conversion which in turn makes encryption arithmetic easier
unsigned int key = p_key; unsigned int key = p_key;
unsigned int C1 = 53761; unsigned int C1 = 53761;
@ -14,8 +14,7 @@ QString fanta_encrypt(QString temp_input, unsigned int p_key)
QVector<uint_fast8_t> temp_result; QVector<uint_fast8_t> temp_result;
std::string input = temp_input.toUtf8().constData(); std::string input = temp_input.toUtf8().constData();
for (unsigned int pos = 0 ; pos < input.size() ; ++pos) for (unsigned int pos = 0; pos < input.size(); ++pos) {
{
uint_fast8_t output = input.at(pos) ^ (key >> 8) % 256; uint_fast8_t output = input.at(pos) ^ (key >> 8) % 256;
temp_result.append(output); temp_result.append(output);
key = (temp_result.at(pos) + key) * C1 + C2; key = (temp_result.at(pos) + key) * C1 + C2;
@ -23,8 +22,7 @@ QString fanta_encrypt(QString temp_input, unsigned int p_key)
std::string result = ""; std::string result = "";
for (uint_fast8_t i_int : temp_result) for (uint_fast8_t i_int : temp_result) {
{
result += omni::int_to_hex(i_int); result += omni::int_to_hex(i_int);
} }
@ -39,9 +37,8 @@ QString fanta_decrypt(QString temp_input, unsigned int key)
QVector<unsigned int> unhexed_vector; QVector<unsigned int> unhexed_vector;
for(unsigned int i=0; i< input.length(); i+=2) for (unsigned int i = 0; i < input.length(); i += 2) {
{ std::string byte = input.substr(i, 2);
std::string byte = input.substr(i,2);
unsigned int hex_int = strtoul(byte.c_str(), nullptr, 16); unsigned int hex_int = strtoul(byte.c_str(), nullptr, 16);
unhexed_vector.append(hex_int); unhexed_vector.append(hex_int);
} }
@ -51,13 +48,11 @@ QString fanta_decrypt(QString temp_input, unsigned int key)
std::string result = ""; std::string result = "";
for (int pos = 0 ; pos < unhexed_vector.size() ; ++pos) for (int pos = 0; pos < unhexed_vector.size(); ++pos) {
{
unsigned char output = unhexed_vector.at(pos) ^ (key >> 8) % 256; unsigned char output = unhexed_vector.at(pos) ^ (key >> 8) % 256;
result += output; result += output;
key = (unhexed_vector.at(pos) + key) * C1 + C2; key = (unhexed_vector.at(pos) + key) * C1 + C2;
} }
return QString::fromStdString(result); return QString::fromStdString(result);
} }

View File

@ -4,7 +4,7 @@ void Courtroom::construct_evidence()
{ {
ui_evidence = new AOImage(this, ao_app); ui_evidence = new AOImage(this, ao_app);
//ui_evidence_name = new QLabel(ui_evidence); // ui_evidence_name = new QLabel(ui_evidence);
ui_evidence_name = new AOLineEdit(ui_evidence); ui_evidence_name = new AOLineEdit(ui_evidence);
ui_evidence_name->setAlignment(Qt::AlignCenter); ui_evidence_name->setAlignment(Qt::AlignCenter);
ui_evidence_name->setFont(QFont("Arial", 14, QFont::Bold)); ui_evidence_name->setFont(QFont("Arial", 14, QFont::Bold));
@ -32,7 +32,8 @@ void Courtroom::construct_evidence()
set_size_and_pos(ui_evidence, "evidence_background"); set_size_and_pos(ui_evidence, "evidence_background");
set_size_and_pos(ui_evidence_buttons, "evidence_buttons"); set_size_and_pos(ui_evidence_buttons, "evidence_buttons");
QPoint f_spacing = ao_app->get_button_spacing("evidence_button_spacing", "courtroom_design.ini"); QPoint f_spacing = ao_app->get_button_spacing("evidence_button_spacing",
"courtroom_design.ini");
const int button_width = 70; const int button_width = 70;
int x_spacing = f_spacing.x(); int x_spacing = f_spacing.x();
@ -42,43 +43,57 @@ void Courtroom::construct_evidence()
int y_spacing = f_spacing.y(); int y_spacing = f_spacing.y();
int y_mod_count = 0; int y_mod_count = 0;
evidence_columns = ((ui_evidence_buttons->width() - button_width) / (x_spacing + button_width)) + 1; evidence_columns = ((ui_evidence_buttons->width() - button_width) /
evidence_rows = ((ui_evidence_buttons->height() - button_height) / (y_spacing + button_height)) + 1; (x_spacing + button_width)) +
1;
evidence_rows = ((ui_evidence_buttons->height() - button_height) /
(y_spacing + button_height)) +
1;
max_evidence_on_page = evidence_columns * evidence_rows; max_evidence_on_page = evidence_columns * evidence_rows;
for (int n = 0 ; n < max_evidence_on_page ; ++n) for (int n = 0; n < max_evidence_on_page; ++n) {
{
int x_pos = (button_width + x_spacing) * x_mod_count; int x_pos = (button_width + x_spacing) * x_mod_count;
int y_pos = (button_height + y_spacing) * y_mod_count; int y_pos = (button_height + y_spacing) * y_mod_count;
AOEvidenceButton *f_evidence = new AOEvidenceButton(ui_evidence_buttons, ao_app, x_pos, y_pos); AOEvidenceButton *f_evidence =
new AOEvidenceButton(ui_evidence_buttons, ao_app, x_pos, y_pos);
ui_evidence_list.append(f_evidence); ui_evidence_list.append(f_evidence);
f_evidence->set_id(n); f_evidence->set_id(n);
connect(f_evidence, SIGNAL(evidence_clicked(int)), this, SLOT(on_evidence_clicked(int))); connect(f_evidence, SIGNAL(evidence_clicked(int)), this,
connect(f_evidence, SIGNAL(evidence_double_clicked(int)), this, SLOT(on_evidence_double_clicked(int))); SLOT(on_evidence_clicked(int)));
connect(f_evidence, SIGNAL(on_hover(int, bool)), this, SLOT(on_evidence_hover(int, bool))); connect(f_evidence, SIGNAL(evidence_double_clicked(int)), this,
SLOT(on_evidence_double_clicked(int)));
connect(f_evidence, SIGNAL(on_hover(int, bool)), this,
SLOT(on_evidence_hover(int, bool)));
++x_mod_count; ++x_mod_count;
if (x_mod_count == evidence_columns) if (x_mod_count == evidence_columns) {
{
++y_mod_count; ++y_mod_count;
x_mod_count = 0; x_mod_count = 0;
} }
} }
connect(ui_evidence_name, SIGNAL(returnPressed()), this, SLOT(on_evidence_name_edited())); connect(ui_evidence_name, SIGNAL(returnPressed()), this,
connect(ui_evidence_left, SIGNAL(clicked()), this, SLOT(on_evidence_left_clicked())); SLOT(on_evidence_name_edited()));
connect(ui_evidence_right, SIGNAL(clicked()), this, SLOT(on_evidence_right_clicked())); connect(ui_evidence_left, SIGNAL(clicked()), this,
connect(ui_evidence_present, SIGNAL(clicked()), this, SLOT(on_evidence_present_clicked())); SLOT(on_evidence_left_clicked()));
connect(ui_evidence_delete, SIGNAL(clicked()), this, SLOT(on_evidence_delete_clicked())); connect(ui_evidence_right, SIGNAL(clicked()), this,
connect(ui_evidence_image_name, SIGNAL(returnPressed()), this, SLOT(on_evidence_image_name_edited())); SLOT(on_evidence_right_clicked()));
connect(ui_evidence_image_button, SIGNAL(clicked()), this, SLOT(on_evidence_image_button_clicked())); connect(ui_evidence_present, SIGNAL(clicked()), this,
connect(ui_evidence_x, SIGNAL(clicked()), this, SLOT(on_evidence_x_clicked())); SLOT(on_evidence_present_clicked()));
connect(ui_evidence_delete, SIGNAL(clicked()), this,
SLOT(on_evidence_delete_clicked()));
connect(ui_evidence_image_name, SIGNAL(returnPressed()), this,
SLOT(on_evidence_image_name_edited()));
connect(ui_evidence_image_button, SIGNAL(clicked()), this,
SLOT(on_evidence_image_button_clicked()));
connect(ui_evidence_x, SIGNAL(clicked()), this,
SLOT(on_evidence_x_clicked()));
ui_evidence->hide(); ui_evidence->hide();
} }
@ -98,26 +113,23 @@ void Courtroom::set_evidence_page()
ui_evidence_left->hide(); ui_evidence_left->hide();
ui_evidence_right->hide(); ui_evidence_right->hide();
for (AOEvidenceButton *i_button : ui_evidence_list) for (AOEvidenceButton *i_button : ui_evidence_list) {
{
i_button->reset(); i_button->reset();
} }
//to account for the "add evidence" button // to account for the "add evidence" button
++total_evidence; ++total_evidence;
int total_pages = total_evidence / max_evidence_on_page; int total_pages = total_evidence / max_evidence_on_page;
int evidence_on_page = 0; int evidence_on_page = 0;
if ((total_evidence % max_evidence_on_page) != 0) if ((total_evidence % max_evidence_on_page) != 0) {
{
++total_pages; ++total_pages;
//i. e. not on the last page // i. e. not on the last page
if (total_pages > current_evidence_page + 1) if (total_pages > current_evidence_page + 1)
evidence_on_page = max_evidence_on_page; evidence_on_page = max_evidence_on_page;
else else
evidence_on_page = total_evidence % max_evidence_on_page; evidence_on_page = total_evidence % max_evidence_on_page;
} }
else else
evidence_on_page = max_evidence_on_page; evidence_on_page = max_evidence_on_page;
@ -128,17 +140,19 @@ void Courtroom::set_evidence_page()
if (current_evidence_page > 0) if (current_evidence_page > 0)
ui_evidence_left->show(); ui_evidence_left->show();
for (int n_evidence_button = 0 ; n_evidence_button < evidence_on_page ; ++n_evidence_button) for (int n_evidence_button = 0; n_evidence_button < evidence_on_page;
{ ++n_evidence_button) {
int n_real_evidence = n_evidence_button + current_evidence_page * max_evidence_on_page; int n_real_evidence =
AOEvidenceButton *f_evidence_button = ui_evidence_list.at(n_evidence_button); n_evidence_button + current_evidence_page * max_evidence_on_page;
AOEvidenceButton *f_evidence_button =
ui_evidence_list.at(n_evidence_button);
//ie. the add evidence button // ie. the add evidence button
if (n_real_evidence == (total_evidence - 1)) if (n_real_evidence == (total_evidence - 1))
f_evidence_button->set_theme_image("addevidence.png"); f_evidence_button->set_theme_image("addevidence.png");
else if (n_real_evidence < (total_evidence - 1)) else if (n_real_evidence < (total_evidence - 1)) {
{ f_evidence_button->set_image(
f_evidence_button->set_image(local_evidence_list.at(n_real_evidence).image); local_evidence_list.at(n_real_evidence).image);
if (n_real_evidence == current_evidence) if (n_real_evidence == current_evidence)
f_evidence_button->set_selected(true); f_evidence_button->set_selected(true);
@ -198,7 +212,7 @@ void Courtroom::on_evidence_image_button_clicked()
QStringList filenames; QStringList filenames;
if (dialog.exec()) if (dialog.exec())
filenames = dialog.selectedFiles(); filenames = dialog.selectedFiles();
if (filenames.size() != 1) if (filenames.size() != 1)
return; return;
@ -215,9 +229,9 @@ void Courtroom::on_evidence_clicked(int p_id)
int f_real_id = p_id + max_evidence_on_page * current_evidence_page; int f_real_id = p_id + max_evidence_on_page * current_evidence_page;
if (f_real_id == local_evidence_list.size()) if (f_real_id == local_evidence_list.size()) {
{ ao_app->send_server_packet(
ao_app->send_server_packet(new AOPacket("PE#<name>#<description>#empty.png#%")); new AOPacket("PE#<name>#<description>#empty.png#%"));
return; return;
} }
else if (f_real_id > local_evidence_list.size()) else if (f_real_id > local_evidence_list.size())
@ -233,7 +247,6 @@ void Courtroom::on_evidence_clicked(int p_id)
current_evidence = f_real_id; current_evidence = f_real_id;
ui_ic_chat_message->setFocus(); ui_ic_chat_message->setFocus();
} }
void Courtroom::on_evidence_double_clicked(int p_id) void Courtroom::on_evidence_double_clicked(int p_id)
@ -262,8 +275,7 @@ void Courtroom::on_evidence_hover(int p_id, bool p_state)
ui_evidence_name->setReadOnly(true); ui_evidence_name->setReadOnly(true);
int final_id = p_id + max_evidence_on_page * current_evidence_page; int final_id = p_id + max_evidence_on_page * current_evidence_page;
if (p_state) if (p_state) {
{
if (final_id == local_evidence_list.size()) if (final_id == local_evidence_list.size())
ui_evidence_name->setText(tr("Add new evidence...")); ui_evidence_name->setText(tr("Add new evidence..."));
else if (final_id < local_evidence_list.size()) else if (final_id < local_evidence_list.size())
@ -310,7 +322,8 @@ void Courtroom::on_evidence_delete_clicked()
ui_evidence_description->setReadOnly(true); ui_evidence_description->setReadOnly(true);
ui_evidence_overlay->hide(); ui_evidence_overlay->hide();
ao_app->send_server_packet(new AOPacket("DE#" + QString::number(current_evidence) + "#%")); ao_app->send_server_packet(
new AOPacket("DE#" + QString::number(current_evidence) + "#%"));
current_evidence = 0; current_evidence = 0;
@ -338,4 +351,3 @@ void Courtroom::on_evidence_x_clicked()
ui_ic_chat_message->setFocus(); ui_ic_chat_message->setFocus();
} }

View File

@ -14,7 +14,8 @@ bool dir_exists(QString dir_path)
return check_dir.exists(); return check_dir.exists();
} }
bool exists(QString p_path) { bool exists(QString p_path)
{
QFile file(p_path); QFile file(p_path);
return file.exists(); return file.exists();

View File

@ -2,7 +2,7 @@
#include <QDebug> #include <QDebug>
#if (defined (_WIN32) || defined (_WIN64)) #if (defined(_WIN32) || defined(_WIN64))
#include <windows.h> #include <windows.h>
static DWORD dwVolSerial; static DWORD dwVolSerial;
@ -10,17 +10,18 @@ static BOOL bIsRetrieved;
QString get_hdid() QString get_hdid()
{ {
bIsRetrieved = GetVolumeInformation(TEXT("C:\\"), nullptr, 0, &dwVolSerial, nullptr, nullptr, nullptr, 0); bIsRetrieved = GetVolumeInformation(TEXT("C:\\"), nullptr, 0, &dwVolSerial,
nullptr, nullptr, nullptr, 0);
if (bIsRetrieved) if (bIsRetrieved)
return QString::number(dwVolSerial, 16); return QString::number(dwVolSerial, 16);
else else
//a totally random string // a totally random string
//what could possibly go wrong // what could possibly go wrong
return "gxsps32sa9fnwic92mfbs0"; return "gxsps32sa9fnwic92mfbs0";
} }
#elif (defined (LINUX) || defined (__linux__)) #elif (defined(LINUX) || defined(__linux__))
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
@ -33,12 +34,10 @@ QString get_hdid()
QTextStream in(&fstab_file); QTextStream in(&fstab_file);
while(!in.atEnd()) while (!in.atEnd()) {
{
QString line = in.readLine(); QString line = in.readLine();
if (line.startsWith("UUID")) if (line.startsWith("UUID")) {
{
QStringList line_elements = line.split("="); QStringList line_elements = line.split("=");
if (line_elements.size() > 1) if (line_elements.size() > 1)
@ -55,26 +54,25 @@ QString get_hdid()
QString get_hdid() QString get_hdid()
{ {
CFStringRef serial; CFStringRef serial;
char buffer[64] = {0}; char buffer[64] = {0};
QString hdid; QString hdid;
io_service_t platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, io_service_t platformExpert = IOServiceGetMatchingService(
IOServiceMatching("IOPlatformExpertDevice")); kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
if (platformExpert) if (platformExpert) {
{ CFTypeRef serialNumberAsCFString = IORegistryEntryCreateCFProperty(
CFTypeRef serialNumberAsCFString = IORegistryEntryCreateCFProperty(platformExpert, platformExpert, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault,
CFSTR(kIOPlatformSerialNumberKey), 0);
kCFAllocatorDefault, 0); if (serialNumberAsCFString) {
if (serialNumberAsCFString) { serial = (CFStringRef)serialNumberAsCFString;
serial = (CFStringRef)serialNumberAsCFString; }
} if (CFStringGetCString(serial, buffer, 64, kCFStringEncodingUTF8)) {
if (CFStringGetCString(serial, buffer, 64, kCFStringEncodingUTF8)) { hdid = buffer;
hdid = buffer; }
}
IOObjectRelease(platformExpert); IOObjectRelease(platformExpert);
} }
return hdid; return hdid;
} }
#else #else

View File

@ -1,18 +1,17 @@
#include "hex_functions.h" #include "hex_functions.h"
namespace omni namespace omni {
std::string int_to_hex(unsigned int input)
{ {
std::string int_to_hex(unsigned int input) if (input > 255)
{ return "FF";
if (input > 255)
return "FF";
std::stringstream stream; std::stringstream stream;
stream << std::setfill('0') << std::setw(sizeof(char)*2) stream << std::setfill('0') << std::setw(sizeof(char) * 2) << std::hex
<< std::hex << input; << input;
std::string result(stream.str()); std::string result(stream.str());
std::transform(result.begin(), result.end(), result.begin(), ::toupper); std::transform(result.begin(), result.end(), result.begin(), ::toupper);
return result; return result;
}
} }
} // namespace omni

View File

@ -1,410 +1,403 @@
#include "lobby.h" #include "lobby.h"
#include "debug_functions.h" #include "aoapplication.h"
#include "aoapplication.h" #include "aosfxplayer.h"
#include "networkmanager.h" #include "debug_functions.h"
#include "aosfxplayer.h" #include "networkmanager.h"
Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
{ {
ao_app = p_ao_app; ao_app = p_ao_app;
this->setWindowTitle(tr("Attorney Online 2")); this->setWindowTitle(tr("Attorney Online 2"));
this->setWindowIcon(QIcon(":/logo.png")); this->setWindowIcon(QIcon(":/logo.png"));
ui_background = new AOImage(this, ao_app); ui_background = new AOImage(this, ao_app);
ui_public_servers = new AOButton(this, ao_app); ui_public_servers = new AOButton(this, ao_app);
ui_favorites = new AOButton(this, ao_app); ui_favorites = new AOButton(this, ao_app);
ui_refresh = new AOButton(this, ao_app); ui_refresh = new AOButton(this, ao_app);
ui_add_to_fav = new AOButton(this, ao_app); ui_add_to_fav = new AOButton(this, ao_app);
ui_connect = new AOButton(this, ao_app); ui_connect = new AOButton(this, ao_app);
ui_version = new QLabel(this); ui_version = new QLabel(this);
ui_about = new AOButton(this, ao_app); ui_about = new AOButton(this, ao_app);
ui_server_list = new QListWidget(this); ui_server_list = new QListWidget(this);
ui_player_count = new QLabel(this); ui_player_count = new QLabel(this);
ui_description = new AOTextArea(this); ui_description = new AOTextArea(this);
ui_chatbox = new AOTextArea(this); ui_chatbox = new AOTextArea(this);
ui_chatbox->setOpenExternalLinks(true); ui_chatbox->setOpenExternalLinks(true);
ui_chatname = new QLineEdit(this); ui_chatname = new QLineEdit(this);
ui_chatname->setPlaceholderText(tr("Name")); ui_chatname->setPlaceholderText(tr("Name"));
ui_chatname->setText(ao_app->get_ooc_name()); ui_chatname->setText(ao_app->get_ooc_name());
ui_chatmessage = new QLineEdit(this); ui_chatmessage = new QLineEdit(this);
ui_loading_background = new AOImage(this, ao_app); ui_loading_background = new AOImage(this, ao_app);
ui_loading_text = new QTextEdit(ui_loading_background); ui_loading_text = new QTextEdit(ui_loading_background);
ui_progress_bar = new QProgressBar(ui_loading_background); ui_progress_bar = new QProgressBar(ui_loading_background);
ui_progress_bar->setMinimum(0); ui_progress_bar->setMinimum(0);
ui_progress_bar->setMaximum(100); ui_progress_bar->setMaximum(100);
ui_progress_bar->setStyleSheet("QProgressBar{ color: white; }"); ui_progress_bar->setStyleSheet("QProgressBar{ color: white; }");
ui_cancel = new AOButton(ui_loading_background, ao_app); ui_cancel = new AOButton(ui_loading_background, ao_app);
connect(ui_public_servers, SIGNAL(clicked()), this, SLOT(on_public_servers_clicked())); connect(ui_public_servers, SIGNAL(clicked()), this,
connect(ui_favorites, SIGNAL(clicked()), this, SLOT(on_favorites_clicked())); SLOT(on_public_servers_clicked()));
connect(ui_refresh, SIGNAL(pressed()), this, SLOT(on_refresh_pressed())); connect(ui_favorites, SIGNAL(clicked()), this, SLOT(on_favorites_clicked()));
connect(ui_refresh, SIGNAL(released()), this, SLOT(on_refresh_released())); connect(ui_refresh, SIGNAL(pressed()), this, SLOT(on_refresh_pressed()));
connect(ui_add_to_fav, SIGNAL(pressed()), this, SLOT(on_add_to_fav_pressed())); connect(ui_refresh, SIGNAL(released()), this, SLOT(on_refresh_released()));
connect(ui_add_to_fav, SIGNAL(released()), this, SLOT(on_add_to_fav_released())); connect(ui_add_to_fav, SIGNAL(pressed()), this,
connect(ui_connect, SIGNAL(pressed()), this, SLOT(on_connect_pressed())); SLOT(on_add_to_fav_pressed()));
connect(ui_connect, SIGNAL(released()), this, SLOT(on_connect_released())); connect(ui_add_to_fav, SIGNAL(released()), this,
connect(ui_about, SIGNAL(clicked()), this, SLOT(on_about_clicked())); SLOT(on_add_to_fav_released()));
connect(ui_server_list, SIGNAL(clicked(QModelIndex)), this, SLOT(on_server_list_clicked(QModelIndex))); connect(ui_connect, SIGNAL(pressed()), this, SLOT(on_connect_pressed()));
connect(ui_server_list, SIGNAL(activated(QModelIndex)), this, SLOT(on_server_list_doubleclicked(QModelIndex))); connect(ui_connect, SIGNAL(released()), this, SLOT(on_connect_released()));
connect(ui_chatmessage, SIGNAL(returnPressed()), this, SLOT(on_chatfield_return_pressed())); connect(ui_about, SIGNAL(clicked()), this, SLOT(on_about_clicked()));
connect(ui_cancel, SIGNAL(clicked()), ao_app, SLOT(loading_cancelled())); connect(ui_server_list, SIGNAL(clicked(QModelIndex)), this,
SLOT(on_server_list_clicked(QModelIndex)));
ui_connect->setEnabled(false); connect(ui_server_list, SIGNAL(activated(QModelIndex)), this,
SLOT(on_server_list_doubleclicked(QModelIndex)));
list_servers(); connect(ui_chatmessage, SIGNAL(returnPressed()), this,
SLOT(on_chatfield_return_pressed()));
set_widgets(); connect(ui_cancel, SIGNAL(clicked()), ao_app, SLOT(loading_cancelled()));
}
ui_connect->setEnabled(false);
//sets images, position and size
void Lobby::set_widgets() list_servers();
{
ao_app->reload_theme(); set_widgets();
}
QString filename = "lobby_design.ini";
// sets images, position and size
pos_size_type f_lobby = ao_app->get_element_dimensions("lobby", filename); void Lobby::set_widgets()
{
if (f_lobby.width < 0 || f_lobby.height < 0) ao_app->reload_theme();
{
qDebug() << "W: did not find lobby width or height in " << ao_app->get_theme_path(filename); QString filename = "lobby_design.ini";
// Most common symptom of bad config files and missing assets. pos_size_type f_lobby = ao_app->get_element_dimensions("lobby", filename);
call_notice(tr("It doesn't look like your client is set up correctly.\n"
"Did you download all resources correctly from tiny.cc/getao, " if (f_lobby.width < 0 || f_lobby.height < 0) {
"including the large 'base' folder?")); qDebug() << "W: did not find lobby width or height in "
<< ao_app->get_theme_path(filename);
this->resize(517, 666);
} // Most common symptom of bad config files and missing assets.
else call_notice(
{ tr("It doesn't look like your client is set up correctly.\n"
this->resize(f_lobby.width, f_lobby.height); "Did you download all resources correctly from tiny.cc/getao, "
} "including the large 'base' folder?"));
set_size_and_pos(ui_background, "lobby"); this->resize(517, 666);
ui_background->set_image("lobbybackground.png"); }
else {
set_size_and_pos(ui_public_servers, "public_servers"); this->resize(f_lobby.width, f_lobby.height);
ui_public_servers->set_image("publicservers_selected.png"); }
set_size_and_pos(ui_favorites, "favorites"); set_size_and_pos(ui_background, "lobby");
ui_favorites->set_image("favorites.png"); ui_background->set_image("lobbybackground.png");
set_size_and_pos(ui_refresh, "refresh"); set_size_and_pos(ui_public_servers, "public_servers");
ui_refresh->set_image("refresh.png"); ui_public_servers->set_image("publicservers_selected.png");
set_size_and_pos(ui_add_to_fav, "add_to_fav"); set_size_and_pos(ui_favorites, "favorites");
ui_add_to_fav->set_image("addtofav.png"); ui_favorites->set_image("favorites.png");
set_size_and_pos(ui_connect, "connect"); set_size_and_pos(ui_refresh, "refresh");
ui_connect->set_image("connect.png"); ui_refresh->set_image("refresh.png");
set_size_and_pos(ui_version, "version"); set_size_and_pos(ui_add_to_fav, "add_to_fav");
ui_version->setText(tr("Version: %1").arg(ao_app->get_version_string())); ui_add_to_fav->set_image("addtofav.png");
set_size_and_pos(ui_about, "about"); set_size_and_pos(ui_connect, "connect");
ui_about->set_image("about.png"); ui_connect->set_image("connect.png");
set_size_and_pos(ui_server_list, "server_list"); set_size_and_pos(ui_version, "version");
ui_server_list->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_version->setText(tr("Version: %1").arg(ao_app->get_version_string()));
"font: bold;");
set_size_and_pos(ui_about, "about");
set_size_and_pos(ui_player_count, "player_count"); ui_about->set_image("about.png");
ui_player_count->setText(tr("Offline"));
ui_player_count->setStyleSheet("font: bold;" set_size_and_pos(ui_server_list, "server_list");
"color: white;" ui_server_list->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"qproperty-alignment: AlignCenter;"); "font: bold;");
set_size_and_pos(ui_description, "description"); set_size_and_pos(ui_player_count, "player_count");
ui_description->setReadOnly(true); ui_player_count->setText(tr("Offline"));
ui_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_player_count->setStyleSheet("font: bold;"
"color: white;"); "color: white;"
"qproperty-alignment: AlignCenter;");
set_size_and_pos(ui_chatbox, "chatbox");
ui_chatbox->setReadOnly(true); set_size_and_pos(ui_description, "description");
ui_chatbox->setStyleSheet("QTextBrowser{background-color: rgba(0, 0, 0, 0);}"); ui_description->setReadOnly(true);
ui_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
set_size_and_pos(ui_chatname, "chatname"); "color: white;");
ui_chatname->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"selection-background-color: rgba(0, 0, 0, 0);"); set_size_and_pos(ui_chatbox, "chatbox");
ui_chatbox->setReadOnly(true);
set_size_and_pos(ui_chatmessage, "chatmessage"); ui_chatbox->setStyleSheet(
ui_chatmessage->setStyleSheet("background-color: rgba(0, 0, 0, 0);" "QTextBrowser{background-color: rgba(0, 0, 0, 0);}");
"selection-background-color: rgba(0, 0, 0, 0);");
set_size_and_pos(ui_chatname, "chatname");
ui_loading_background->resize(this->width(), this->height()); ui_chatname->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
ui_loading_background->set_image("loadingbackground.png"); "selection-background-color: rgba(0, 0, 0, 0);");
set_size_and_pos(ui_chatmessage, "chatmessage");
set_size_and_pos(ui_loading_text, "loading_label"); ui_chatmessage->setStyleSheet(
ui_loading_text->setFont(QFont("Arial", 20, QFont::Bold)); "background-color: rgba(0, 0, 0, 0);"
ui_loading_text->setReadOnly(true); "selection-background-color: rgba(0, 0, 0, 0);");
ui_loading_text->setAlignment(Qt::AlignCenter);
ui_loading_text->setFrameStyle(QFrame::NoFrame); ui_loading_background->resize(this->width(), this->height());
ui_loading_text->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_loading_background->set_image("loadingbackground.png");
"color: rgba(255, 128, 0, 255);");
ui_loading_text->append(tr("Loading")); set_size_and_pos(ui_loading_text, "loading_label");
ui_loading_text->setFont(QFont("Arial", 20, QFont::Bold));
set_size_and_pos(ui_progress_bar, "progress_bar"); ui_loading_text->setReadOnly(true);
set_size_and_pos(ui_cancel, "cancel"); ui_loading_text->setAlignment(Qt::AlignCenter);
ui_cancel->setText(tr("Cancel")); ui_loading_text->setFrameStyle(QFrame::NoFrame);
ui_loading_text->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
ui_loading_background->hide(); "color: rgba(255, 128, 0, 255);");
ui_loading_text->append(tr("Loading"));
}
set_size_and_pos(ui_progress_bar, "progress_bar");
void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier) set_size_and_pos(ui_cancel, "cancel");
{ ui_cancel->setText(tr("Cancel"));
QString filename = "lobby_design.ini";
ui_loading_background->hide();
pos_size_type design_ini_result = ao_app->get_element_dimensions(p_identifier, filename); }
if (design_ini_result.width < 0 || design_ini_result.height < 0) void Lobby::lobbyThreadHandler(QString loadingText)
{ {
qDebug() << "W: could not find " << p_identifier << " in " << filename; this->set_loading_text(loadingText);
p_widget->hide(); }
}
else void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier)
{ {
p_widget->move(design_ini_result.x, design_ini_result.y); QString filename = "lobby_design.ini";
p_widget->resize(design_ini_result.width, design_ini_result.height);
} pos_size_type design_ini_result =
} ao_app->get_element_dimensions(p_identifier, filename);
void Lobby::lobbyThreadHandler(QString loadingText){ if (design_ini_result.width < 0 || design_ini_result.height < 0) {
this->set_loading_text(loadingText); qDebug() << "W: could not find " << p_identifier << " in " << filename;
} p_widget->hide();
}
void Lobby::set_loading_text(QString p_text) else {
{ p_widget->move(design_ini_result.x, design_ini_result.y);
ui_loading_text->clear(); p_widget->resize(design_ini_result.width, design_ini_result.height);
ui_loading_text->setAlignment(Qt::AlignCenter); }
ui_loading_text->append(p_text); }
}
void Lobby::set_loading_text(QString p_text)
QString Lobby::get_chatlog() {
{ ui_loading_text->clear();
QString return_value = ui_chatbox->toPlainText(); ui_loading_text->setAlignment(Qt::AlignCenter);
ui_loading_text->append(p_text);
return return_value; }
}
QString Lobby::get_chatlog()
int Lobby::get_selected_server() {
{ QString return_value = ui_chatbox->toPlainText();
return ui_server_list->currentRow();
} return return_value;
}
void Lobby::set_loading_value(int p_value)
{ int Lobby::get_selected_server() { return ui_server_list->currentRow(); }
ui_progress_bar->setValue(p_value);
} void Lobby::set_loading_value(int p_value)
{
void Lobby::on_public_servers_clicked() ui_progress_bar->setValue(p_value);
{ }
ui_public_servers->set_image("publicservers_selected.png");
ui_favorites->set_image("favorites.png"); void Lobby::on_public_servers_clicked()
{
list_servers(); ui_public_servers->set_image("publicservers_selected.png");
ui_favorites->set_image("favorites.png");
public_servers_selected = true;
} list_servers();
void Lobby::on_favorites_clicked() public_servers_selected = true;
{ }
ui_favorites->set_image("favorites_selected.png");
ui_public_servers->set_image("publicservers.png"); void Lobby::on_favorites_clicked()
{
ao_app->set_favorite_list(); ui_favorites->set_image("favorites_selected.png");
//ao_app->favorite_list = read_serverlist_txt(); ui_public_servers->set_image("publicservers.png");
list_favorites(); ao_app->set_favorite_list();
// ao_app->favorite_list = read_serverlist_txt();
public_servers_selected = false;
} list_favorites();
void Lobby::on_refresh_pressed() public_servers_selected = false;
{ }
ui_refresh->set_image("refresh_pressed.png");
} void Lobby::on_refresh_pressed()
{
void Lobby::on_refresh_released() ui_refresh->set_image("refresh_pressed.png");
{ }
ui_refresh->set_image("refresh.png");
void Lobby::on_refresh_released()
AOPacket *f_packet = new AOPacket("ALL#%"); {
ui_refresh->set_image("refresh.png");
ao_app->send_ms_packet(f_packet);
} AOPacket *f_packet = new AOPacket("ALL#%");
void Lobby::on_add_to_fav_pressed() ao_app->send_ms_packet(f_packet);
{ }
ui_add_to_fav->set_image("addtofav_pressed.png");
} void Lobby::on_add_to_fav_pressed()
{
void Lobby::on_add_to_fav_released() ui_add_to_fav->set_image("addtofav_pressed.png");
{ }
ui_add_to_fav->set_image("addtofav.png");
void Lobby::on_add_to_fav_released()
//you cant add favorites from favorites m8 {
if (!public_servers_selected) ui_add_to_fav->set_image("addtofav.png");
return;
// you cant add favorites from favorites m8
ao_app->add_favorite_server(ui_server_list->currentRow()); if (!public_servers_selected)
} return;
void Lobby::on_connect_pressed() ao_app->add_favorite_server(ui_server_list->currentRow());
{ }
ui_connect->set_image("connect_pressed.png");
} void Lobby::on_connect_pressed()
{
void Lobby::on_connect_released() ui_connect->set_image("connect_pressed.png");
{ }
ui_connect->set_image("connect.png");
void Lobby::on_connect_released()
AOPacket *f_packet; {
ui_connect->set_image("connect.png");
f_packet = new AOPacket("askchaa#%");
AOPacket *f_packet;
ao_app->send_server_packet(f_packet);
} f_packet = new AOPacket("askchaa#%");
void Lobby::on_about_clicked() ao_app->send_server_packet(f_packet);
{ }
void Lobby::on_about_clicked()
{
QString msg = QString msg =
tr("<h2>Attorney Online %1</h2>" tr("<h2>Attorney Online %1</h2>"
"The courtroom drama simulator" "The courtroom drama simulator"
"<p><b>Source code:</b> " "<p><b>Source code:</b> "
"<a href='https://github.com/AttorneyOnline/AO2-Client'>" "<a href='https://github.com/AttorneyOnline/AO2-Client'>"
"https://github.com/AttorneyOnline/AO2-Client</a>" "https://github.com/AttorneyOnline/AO2-Client</a>"
"<p><b>Major development:</b><br>" "<p><b>Major development:</b><br>"
"OmniTroid, stonedDiscord, longbyte1, gameboyprinter, Cerapter, " "OmniTroid, stonedDiscord, longbyte1, gameboyprinter, Cerapter, "
"Cents02" "Cents02"
"<p><b>Special thanks:</b><br>" "<p><b>Special thanks:</b><br>"
"Remy, Iamgoofball, Hibiki, Qubrick (webAO), Ruekasu (UI design), " "Remy, Iamgoofball, Hibiki, Qubrick (webAO), Ruekasu (UI design), "
"Draxirch (UI design), Unishred, Argoneus (tsuserver), Fiercy, " "Draxirch (UI design), Unishred, Argoneus (tsuserver), Fiercy, "
"Noevain, Cronnicossy, Raidensnake") "Noevain, Cronnicossy, Raidensnake")
.arg(ao_app->get_version_string()); .arg(ao_app->get_version_string());
QMessageBox::about(this, "About", msg); QMessageBox::about(this, "About", msg);
} }
//clicked on an item in the serverlist // clicked on an item in the serverlist
void Lobby::on_server_list_clicked(QModelIndex p_model) void Lobby::on_server_list_clicked(QModelIndex p_model)
{ {
if (p_model != last_model) if (p_model != last_model) {
{ server_type f_server;
server_type f_server; last_model = p_model;
last_model = p_model; int n_server = p_model.row();
int n_server = p_model.row();
if (n_server < 0)
if (n_server < 0) return;
return;
if (public_servers_selected) {
if (public_servers_selected) QVector<server_type> f_server_list = ao_app->get_server_list();
{
QVector<server_type> f_server_list = ao_app->get_server_list(); if (n_server >= f_server_list.size())
return;
if (n_server >= f_server_list.size())
return; f_server = f_server_list.at(p_model.row());
}
f_server = f_server_list.at(p_model.row()); else {
} if (n_server >= ao_app->get_favorite_list().size())
else return;
{
if (n_server >= ao_app->get_favorite_list().size()) f_server = ao_app->get_favorite_list().at(p_model.row());
return; }
f_server = ao_app->get_favorite_list().at(p_model.row()); ui_description->clear();
} ui_description->append(f_server.desc);
ui_description->clear(); ui_description->moveCursor(QTextCursor::Start);
ui_description->append(f_server.desc); ui_description->ensureCursorVisible();
ui_description->moveCursor(QTextCursor::Start); ui_player_count->setText(tr("Offline"));
ui_description->ensureCursorVisible();
ui_connect->setEnabled(false);
ui_player_count->setText(tr("Offline"));
ao_app->net_manager->connect_to_server(f_server);
ui_connect->setEnabled(false); }
}
ao_app->net_manager->connect_to_server(f_server);
} // doubleclicked on an item in the serverlist so we'll connect right away
} void Lobby::on_server_list_doubleclicked(QModelIndex p_model)
{
//doubleclicked on an item in the serverlist so we'll connect right away on_server_list_clicked(p_model);
void Lobby::on_server_list_doubleclicked(QModelIndex p_model) on_connect_released();
{ }
on_server_list_clicked(p_model);
on_connect_released(); void Lobby::on_chatfield_return_pressed()
} {
// no you can't send empty messages
void Lobby::on_chatfield_return_pressed() if (ui_chatname->text() == "" || ui_chatmessage->text() == "")
{ return;
//no you can't send empty messages
if (ui_chatname->text() == "" || ui_chatmessage->text() == "") QString f_header = "CT";
return; QStringList f_contents{ui_chatname->text(), ui_chatmessage->text()};
AOPacket *f_packet = new AOPacket(f_header, f_contents);
QString f_header = "CT";
QStringList f_contents{ui_chatname->text(), ui_chatmessage->text()}; ao_app->send_ms_packet(f_packet);
AOPacket *f_packet = new AOPacket(f_header, f_contents); ui_chatmessage->clear();
}
ao_app->send_ms_packet(f_packet);
void Lobby::list_servers()
ui_chatmessage->clear(); {
} public_servers_selected = true;
ui_favorites->set_image("favorites.png");
void Lobby::list_servers() ui_public_servers->set_image("publicservers_selected.png");
{
public_servers_selected = true; ui_server_list->clear();
ui_favorites->set_image("favorites.png");
ui_public_servers->set_image("publicservers_selected.png"); for (server_type i_server : ao_app->get_server_list()) {
ui_server_list->addItem(i_server.name);
ui_server_list->clear(); }
}
for (server_type i_server : ao_app->get_server_list())
{ void Lobby::list_favorites()
ui_server_list->addItem(i_server.name); {
} ui_server_list->clear();
}
for (server_type i_server : ao_app->get_favorite_list()) {
void Lobby::list_favorites() ui_server_list->addItem(i_server.name);
{ }
ui_server_list->clear(); }
for (server_type i_server : ao_app->get_favorite_list()) void Lobby::append_chatmessage(QString f_name, QString f_message)
{ {
ui_server_list->addItem(i_server.name);
}
}
void Lobby::append_chatmessage(QString f_name, QString f_message)
{
ui_chatbox->append_chatmessage( ui_chatbox->append_chatmessage(
f_name, f_message, f_name, f_message,
ao_app->get_color("ooc_default_color", "courtroom_design.ini").name(), ao_app->get_color("ooc_default_color", "courtroom_design.ini").name(),
false); false);
} }
void Lobby::append_error(QString f_message) void Lobby::append_error(QString f_message)
{ {
ui_chatbox->append_error(f_message); ui_chatbox->append_error(f_message);
} }
void Lobby::set_player_count(int players_online, int max_players) void Lobby::set_player_count(int players_online, int max_players)
{ {
QString f_string = tr("Online: %1/%2").arg(QString::number(players_online)).arg(QString::number(max_players)); QString f_string = tr("Online: %1/%2")
ui_player_count->setText(f_string); .arg(QString::number(players_online))
} .arg(QString::number(max_players));
ui_player_count->setText(f_string);
void Lobby::enable_connect_button() }
{
ui_connect->setEnabled(true); void Lobby::enable_connect_button() { ui_connect->setEnabled(true); }
}
Lobby::~Lobby() {}
Lobby::~Lobby()
{
}

View File

@ -1,43 +1,44 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "datatypes.h"
#include "networkmanager.h"
#include "lobby.h"
#include "courtroom.h" #include "courtroom.h"
#include <QPluginLoader> #include "datatypes.h"
#include "lobby.h"
#include "networkmanager.h"
#include <QDebug> #include <QDebug>
#include <QTranslator>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QPluginLoader>
#include <QTranslator>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#if QT_VERSION > QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION > QT_VERSION_CHECK(5, 6, 0)
// High-DPI support is for Qt version >=5.6. // High-DPI support is for Qt version >=5.6.
// However, many Linux distros still haven't brought their stable/LTS // However, many Linux distros still haven't brought their stable/LTS
// packages up to Qt 5.6, so this is conditional. // packages up to Qt 5.6, so this is conditional.
AOApplication::setAttribute(Qt::AA_EnableHighDpiScaling); AOApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif #endif
AOApplication main_app(argc, argv); AOApplication main_app(argc, argv);
QSettings *configini = main_app.configini; QSettings *configini = main_app.configini;
QString p_language = configini->value("language", QLocale::system().name()).toString(); QString p_language =
if (p_language == " " || p_language == "") configini->value("language", QLocale::system().name()).toString();
p_language = QLocale::system().name(); if (p_language == " " || p_language == "")
p_language = QLocale::system().name();
QTranslator qtTranslator; QTranslator qtTranslator;
qtTranslator.load("qt_" + p_language, qtTranslator.load("qt_" + p_language,
QLibraryInfo::location(QLibraryInfo::TranslationsPath)); QLibraryInfo::location(QLibraryInfo::TranslationsPath));
main_app.installTranslator(&qtTranslator); main_app.installTranslator(&qtTranslator);
QTranslator appTranslator; QTranslator appTranslator;
qDebug() << ":/resource/translations/ao_" + p_language; qDebug() << ":/resource/translations/ao_" + p_language;
appTranslator.load("ao_" + p_language, ":/resource/translations/"); appTranslator.load("ao_" + p_language, ":/resource/translations/");
main_app.installTranslator(&appTranslator); main_app.installTranslator(&appTranslator);
main_app.construct_lobby(); main_app.construct_lobby();
main_app.w_lobby->show(); main_app.w_lobby->show();
main_app.net_manager->connect_to_master(); main_app.net_manager->connect_to_master();
return main_app.exec(); return main_app.exec();
} }

View File

@ -4,6 +4,6 @@ void delay(int p_milliseconds)
{ {
QTime dieTime = QTime::currentTime().addMSecs(p_milliseconds); QTime dieTime = QTime::currentTime().addMSecs(p_milliseconds);
while(QTime::currentTime() < dieTime) while (QTime::currentTime() < dieTime)
QCoreApplication::processEvents(QEventLoop::AllEvents, 100); QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
} }

View File

@ -13,21 +13,23 @@ NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
ms_reconnect_timer = new QTimer(this); ms_reconnect_timer = new QTimer(this);
ms_reconnect_timer->setSingleShot(true); ms_reconnect_timer->setSingleShot(true);
QObject::connect(ms_reconnect_timer, SIGNAL(timeout()), this, SLOT(retry_ms_connect())); QObject::connect(ms_reconnect_timer, SIGNAL(timeout()), this,
SLOT(retry_ms_connect()));
QObject::connect(ms_socket, SIGNAL(readyRead()), this, SLOT(handle_ms_packet())); QObject::connect(ms_socket, SIGNAL(readyRead()), this,
QObject::connect(server_socket, SIGNAL(readyRead()), this, SLOT(handle_server_packet())); SLOT(handle_ms_packet()));
QObject::connect(server_socket, SIGNAL(disconnected()), ao_app, SLOT(server_disconnected())); QObject::connect(server_socket, SIGNAL(readyRead()), this,
SLOT(handle_server_packet()));
QObject::connect(server_socket, SIGNAL(disconnected()), ao_app,
SLOT(server_disconnected()));
QString master_config = ao_app->configini->value("master", "").value<QString>(); QString master_config =
ao_app->configini->value("master", "").value<QString>();
if (master_config != "") if (master_config != "")
ms_nosrv_hostname = master_config; ms_nosrv_hostname = master_config;
} }
NetworkManager::~NetworkManager() NetworkManager::~NetworkManager() {}
{
}
void NetworkManager::connect_to_master() void NetworkManager::connect_to_master()
{ {
@ -43,11 +45,11 @@ void NetworkManager::connect_to_master()
void NetworkManager::connect_to_master_nosrv() void NetworkManager::connect_to_master_nosrv()
{ {
QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
this, SLOT(on_ms_socket_error(QAbstractSocket::SocketError))); SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
QObject::connect(ms_socket, SIGNAL(connected()), QObject::connect(ms_socket, SIGNAL(connected()), this,
this, SLOT(on_ms_nosrv_connect_success())); SLOT(on_ms_nosrv_connect_success()));
ms_socket->connectToHost(ms_nosrv_hostname, ms_port); ms_socket->connectToHost(ms_nosrv_hostname, ms_port);
} }
@ -61,12 +63,10 @@ void NetworkManager::connect_to_server(server_type p_server)
void NetworkManager::ship_ms_packet(QString p_packet) void NetworkManager::ship_ms_packet(QString p_packet)
{ {
if (!ms_socket->isOpen()) if (!ms_socket->isOpen()) {
{
retry_ms_connect(); retry_ms_connect();
} }
else else {
{
ms_socket->write(p_packet.toUtf8()); ms_socket->write(p_packet.toUtf8());
} }
} }
@ -81,93 +81,86 @@ void NetworkManager::handle_ms_packet()
QByteArray buffer = ms_socket->readAll(); QByteArray buffer = ms_socket->readAll();
QString in_data = QString::fromUtf8(buffer, buffer.size()); QString in_data = QString::fromUtf8(buffer, buffer.size());
if (!in_data.endsWith("%")) if (!in_data.endsWith("%")) {
{
ms_partial_packet = true; ms_partial_packet = true;
ms_temp_packet += in_data; ms_temp_packet += in_data;
return; return;
} }
else else {
{ if (ms_partial_packet) {
if (ms_partial_packet)
{
in_data = ms_temp_packet + in_data; in_data = ms_temp_packet + in_data;
ms_temp_packet = ""; ms_temp_packet = "";
ms_partial_packet = false; ms_partial_packet = false;
} }
} }
QStringList packet_list = in_data.split("%", QString::SplitBehavior(QString::SkipEmptyParts)); QStringList packet_list =
in_data.split("%", QString::SplitBehavior(QString::SkipEmptyParts));
for (QString packet : packet_list) for (QString packet : packet_list) {
{
AOPacket *f_packet = new AOPacket(packet); AOPacket *f_packet = new AOPacket(packet);
ao_app->ms_packet_received(f_packet); ao_app->ms_packet_received(f_packet);
} }
} }
void NetworkManager::perform_srv_lookup() void NetworkManager::perform_srv_lookup()
{ {
#ifdef MS_FAILOVER_SUPPORTED #ifdef MS_FAILOVER_SUPPORTED
ms_dns = new QDnsLookup(QDnsLookup::SRV, ms_srv_hostname, this); ms_dns = new QDnsLookup(QDnsLookup::SRV, ms_srv_hostname, this);
connect(ms_dns, SIGNAL(finished()), this, SLOT(on_srv_lookup())); connect(ms_dns, SIGNAL(finished()), this, SLOT(on_srv_lookup()));
ms_dns->lookup(); ms_dns->lookup();
#endif #endif
} }
void NetworkManager::on_srv_lookup() void NetworkManager::on_srv_lookup()
{ {
#ifdef MS_FAILOVER_SUPPORTED #ifdef MS_FAILOVER_SUPPORTED
bool connected = false; bool connected = false;
if (ms_dns->error() != QDnsLookup::NoError) if (ms_dns->error() != QDnsLookup::NoError) {
{
qWarning("SRV lookup of the master server DNS failed."); qWarning("SRV lookup of the master server DNS failed.");
ms_dns->deleteLater(); ms_dns->deleteLater();
} }
else else {
{
const auto srv_records = ms_dns->serviceRecords(); const auto srv_records = ms_dns->serviceRecords();
for (const QDnsServiceRecord &record : srv_records) for (const QDnsServiceRecord &record : srv_records) {
{ #ifdef DEBUG_NETWORK
#ifdef DEBUG_NETWORK
qDebug() << "Connecting to " << record.target() << ":" << record.port(); qDebug() << "Connecting to " << record.target() << ":" << record.port();
#endif #endif
ms_socket->connectToHost(record.target(), record.port()); ms_socket->connectToHost(record.target(), record.port());
QTime timer; QTime timer;
timer.start(); timer.start();
do do {
{
ao_app->processEvents(); ao_app->processEvents();
if (ms_socket->state() == QAbstractSocket::ConnectedState) if (ms_socket->state() == QAbstractSocket::ConnectedState) {
{
connected = true; connected = true;
break; break;
} }
else if (ms_socket->state() != QAbstractSocket::ConnectingState else if (ms_socket->state() != QAbstractSocket::ConnectingState &&
&& ms_socket->state() != QAbstractSocket::HostLookupState ms_socket->state() != QAbstractSocket::HostLookupState &&
&& ms_socket->error() != -1) ms_socket->error() != -1) {
{
qDebug() << ms_socket->error(); qDebug() << ms_socket->error();
qWarning() << "Error connecting to master server:" << ms_socket->errorString(); qWarning() << "Error connecting to master server:"
<< ms_socket->errorString();
ms_socket->abort(); ms_socket->abort();
ms_socket->close(); ms_socket->close();
break; break;
} }
} while (timer.elapsed() < timeout_milliseconds); // Very expensive spin-wait loop - it will bring CPU to 100%! } while (timer.elapsed() <
if (connected) timeout_milliseconds); // Very expensive spin-wait loop - it will
{ // bring CPU to 100%!
// Connect a one-shot signal in case the master server disconnects randomly if (connected) {
QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), // Connect a one-shot signal in case the master server disconnects
this, SLOT(on_ms_socket_error(QAbstractSocket::SocketError))); // randomly
QObject::connect(
ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
break; break;
} }
else else {
{
ms_socket->abort(); ms_socket->abort();
ms_socket->close(); ms_socket->close();
} }
@ -179,29 +172,30 @@ void NetworkManager::on_srv_lookup()
connect_to_master_nosrv(); connect_to_master_nosrv();
else else
emit ms_connect_finished(connected, false); emit ms_connect_finished(connected, false);
#endif #endif
} }
void NetworkManager::on_ms_nosrv_connect_success() void NetworkManager::on_ms_nosrv_connect_success()
{ {
emit ms_connect_finished(true, false); emit ms_connect_finished(true, false);
QObject::disconnect(ms_socket, SIGNAL(connected()), QObject::disconnect(ms_socket, SIGNAL(connected()), this,
this, SLOT(on_ms_nosrv_connect_success())); SLOT(on_ms_nosrv_connect_success()));
QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
this, SLOT(on_ms_socket_error(QAbstractSocket::SocketError))); SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
} }
void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error) void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
{ {
qWarning() << "Master server socket error:" << ms_socket->errorString() qWarning() << "Master server socket error:" << ms_socket->errorString() << "("
<< "(" << error << ")"; << error << ")";
// Disconnect the one-shot signal - this way, failover connect attempts // Disconnect the one-shot signal - this way, failover connect attempts
// don't trigger a full retry // don't trigger a full retry
QObject::disconnect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), QObject::disconnect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)),
this, SLOT(on_ms_socket_error(QAbstractSocket::SocketError))); this,
SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
emit ms_connect_finished(false, true); emit ms_connect_finished(false, true);
@ -210,7 +204,8 @@ void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
void NetworkManager::retry_ms_connect() void NetworkManager::retry_ms_connect()
{ {
if (!ms_reconnect_timer->isActive() && ms_socket->state() != QAbstractSocket::ConnectingState) if (!ms_reconnect_timer->isActive() &&
ms_socket->state() != QAbstractSocket::ConnectingState)
connect_to_master(); connect_to_master();
} }
@ -219,27 +214,24 @@ void NetworkManager::handle_server_packet()
QByteArray buffer = server_socket->readAll(); QByteArray buffer = server_socket->readAll();
QString in_data = QString::fromUtf8(buffer, buffer.size()); QString in_data = QString::fromUtf8(buffer, buffer.size());
if (!in_data.endsWith("%")) if (!in_data.endsWith("%")) {
{
partial_packet = true; partial_packet = true;
temp_packet += in_data; temp_packet += in_data;
return; return;
} }
else else {
{ if (partial_packet) {
if (partial_packet)
{
in_data = temp_packet + in_data; in_data = temp_packet + in_data;
temp_packet = ""; temp_packet = "";
partial_packet = false; partial_packet = false;
} }
} }
QStringList packet_list = in_data.split("%", QString::SplitBehavior(QString::SkipEmptyParts)); QStringList packet_list =
in_data.split("%", QString::SplitBehavior(QString::SkipEmptyParts));
for (QString packet : packet_list) for (QString packet : packet_list) {
{
AOPacket *f_packet = new AOPacket(packet); AOPacket *f_packet = new AOPacket(packet);
ao_app->server_packet_received(f_packet); ao_app->server_packet_received(f_packet);

File diff suppressed because it is too large Load Diff

View File

@ -1,191 +1,191 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "courtroom.h" #include "courtroom.h"
#include "file_functions.h" #include "file_functions.h"
#include <QDir> #include <QDir>
#include <QStandardPaths> #include <QRegExp>
#include <QRegExp> #include <QStandardPaths>
#ifdef BASE_OVERRIDE #ifdef BASE_OVERRIDE
#include "base_override.h" #include "base_override.h"
#endif #endif
//this is a quite broad generalization // this is a quite broad generalization
//the most common OSes(mac and windows) are _usually_ case insensitive // the most common OSes(mac and windows) are _usually_ case insensitive
//however, there do exist mac installations with case sensitive filesystems // however, there do exist mac installations with case sensitive filesystems
//in that case, define CASE_SENSITIVE_FILESYSTEM and compile on a mac // in that case, define CASE_SENSITIVE_FILESYSTEM and compile on a mac
#if (defined (LINUX) || defined (__linux__)) #if (defined(LINUX) || defined(__linux__))
#define CASE_SENSITIVE_FILESYSTEM #define CASE_SENSITIVE_FILESYSTEM
#endif #endif
QString AOApplication::get_base_path() QString AOApplication::get_base_path()
{ {
QString base_path = ""; QString base_path = "";
#ifdef ANDROID #ifdef ANDROID
QString sdcard_storage = getenv("SECONDARY_STORAGE"); QString sdcard_storage = getenv("SECONDARY_STORAGE");
if (dir_exists(sdcard_storage + "/AO2/")){ if (dir_exists(sdcard_storage + "/AO2/")) {
base_path = sdcard_storage + "/AO2/"; base_path = sdcard_storage + "/AO2/";
} }
else { else {
QString external_storage = getenv("EXTERNAL_STORAGE"); QString external_storage = getenv("EXTERNAL_STORAGE");
base_path = external_storage + "/AO2/"; base_path = external_storage + "/AO2/";
} }
#elif defined __APPLE__ #elif defined __APPLE__
base_path = applicationDirPath() + "/../../../base/"; base_path = applicationDirPath() + "/../../../base/";
#else #else
base_path = applicationDirPath() + "/base/"; base_path = applicationDirPath() + "/base/";
#endif #endif
return base_path; return base_path;
} }
QString AOApplication::get_data_path() QString AOApplication::get_data_path() { return get_base_path() + "data/"; }
{
return get_base_path() + "data/"; QString AOApplication::get_default_theme_path(QString p_file)
} {
QString path = get_base_path() + "themes/default/" + p_file;
QString AOApplication::get_default_theme_path(QString p_file) #ifndef CASE_SENSITIVE_FILESYSTEM
{ return path;
QString path = get_base_path() + "themes/default/" + p_file; #else
#ifndef CASE_SENSITIVE_FILESYSTEM return get_case_sensitive_path(path);
return path; #endif
#else }
return get_case_sensitive_path(path);
#endif QString AOApplication::get_custom_theme_path(QString p_theme, QString p_file)
} {
QString path = get_base_path() + "themes/" + p_theme + "/" + p_file;
QString AOApplication::get_custom_theme_path(QString p_theme, QString p_file) #ifndef CASE_SENSITIVE_FILESYSTEM
{ return path;
QString path = get_base_path() + "themes/" + p_theme + "/" + p_file; #else
#ifndef CASE_SENSITIVE_FILESYSTEM return get_case_sensitive_path(path);
return path; #endif
#else }
return get_case_sensitive_path(path);
#endif QString AOApplication::get_theme_path(QString p_file)
} {
QString path = get_base_path() + "themes/" + current_theme + "/" + p_file;
QString AOApplication::get_theme_path(QString p_file) #ifndef CASE_SENSITIVE_FILESYSTEM
{ return path;
QString path = get_base_path() + "themes/" + current_theme + "/" + p_file; #else
#ifndef CASE_SENSITIVE_FILESYSTEM return get_case_sensitive_path(path);
return path; #endif
#else }
return get_case_sensitive_path(path);
#endif QString AOApplication::get_character_path(QString p_char, QString p_file)
} {
QString path = get_base_path() + "characters/" + p_char + "/" + p_file;
QString AOApplication::get_character_path(QString p_char, QString p_file) #ifndef CASE_SENSITIVE_FILESYSTEM
{ return path;
QString path = get_base_path() + "characters/" + p_char + "/" + p_file; #else
#ifndef CASE_SENSITIVE_FILESYSTEM return get_case_sensitive_path(path);
return path; #endif
#else }
return get_case_sensitive_path(path);
#endif QString AOApplication::get_sounds_path(QString p_file)
} {
QString path = get_base_path() + "sounds/general/" + p_file;
QString AOApplication::get_sounds_path(QString p_file) #ifndef CASE_SENSITIVE_FILESYSTEM
{ return path;
QString path = get_base_path() + "sounds/general/" + p_file; #else
#ifndef CASE_SENSITIVE_FILESYSTEM return get_case_sensitive_path(path);
return path; #endif
#else }
return get_case_sensitive_path(path);
#endif QString AOApplication::get_music_path(QString p_song)
} {
QString withending_check = get_base_path() + "sounds/music/" + p_song;
QString AOApplication::get_music_path(QString p_song) QString mp3_check = get_base_path() + "sounds/music/" + p_song + ".mp3";
{ QString opus_check = get_base_path() + "sounds/music/" + p_song + ".opus";
QString withending_check = get_base_path() + "sounds/music/" + p_song; if (file_exists(opus_check)) {
QString mp3_check = get_base_path() + "sounds/music/" + p_song + ".mp3"; #ifndef CASE_SENSITIVE_FILESYSTEM
QString opus_check = get_base_path() + "sounds/music/" + p_song + ".opus"; return opus_check;
if (file_exists(opus_check)) #else
{ return get_case_sensitive_path(opus_check);
#ifndef CASE_SENSITIVE_FILESYSTEM #endif
return opus_check; }
#else else if (file_exists(mp3_check)) {
return get_case_sensitive_path(opus_check); #ifndef CASE_SENSITIVE_FILESYSTEM
#endif return mp3_check;
} #else
else if (file_exists(mp3_check)) return get_case_sensitive_path(mp3_check);
{ #endif
#ifndef CASE_SENSITIVE_FILESYSTEM }
return mp3_check; else if (file_exists(withending_check)) {
#else #ifndef CASE_SENSITIVE_FILESYSTEM
return get_case_sensitive_path(mp3_check); return withending_check;
#endif #else
} return get_case_sensitive_path(withending_check);
else if (file_exists(withending_check)) #endif
{ }
#ifndef CASE_SENSITIVE_FILESYSTEM #ifndef CASE_SENSITIVE_FILESYSTEM
return withending_check; return get_base_path() + "sounds/music/" + p_song + ".wav";
#else
return get_case_sensitive_path(withending_check);
#endif
}
#ifndef CASE_SENSITIVE_FILESYSTEM
return get_base_path() + "sounds/music/" + p_song + ".wav";
; ;
#else #else
return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song + ".wav"); return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song +
#endif ".wav");
} #endif
}
QString AOApplication::get_background_path(QString p_file)
{ QString AOApplication::get_background_path(QString p_file)
QString path = get_base_path() + "background/" + w_courtroom->get_current_background() + "/" + p_file; {
if (courtroom_constructed) { QString path = get_base_path() + "background/" +
#ifndef CASE_SENSITIVE_FILESYSTEM w_courtroom->get_current_background() + "/" + p_file;
return path; if (courtroom_constructed) {
#else #ifndef CASE_SENSITIVE_FILESYSTEM
return get_case_sensitive_path(path); return path;
#endif #else
} return get_case_sensitive_path(path);
return get_default_background_path(p_file); #endif
} }
return get_default_background_path(p_file);
QString AOApplication::get_default_background_path(QString p_file) }
{
QString path = get_base_path() + "background/default/" + p_file; QString AOApplication::get_default_background_path(QString p_file)
#ifndef CASE_SENSITIVE_FILESYSTEM {
return path; QString path = get_base_path() + "background/default/" + p_file;
#else #ifndef CASE_SENSITIVE_FILESYSTEM
return get_case_sensitive_path(path); return path;
#endif #else
} return get_case_sensitive_path(path);
#endif
QString AOApplication::get_evidence_path(QString p_file) }
{
QString path = get_base_path() + "evidence/" + p_file; QString AOApplication::get_evidence_path(QString p_file)
#ifndef CASE_SENSITIVE_FILESYSTEM {
return path; QString path = get_base_path() + "evidence/" + p_file;
#else #ifndef CASE_SENSITIVE_FILESYSTEM
return get_case_sensitive_path(path); return path;
#endif #else
} return get_case_sensitive_path(path);
#endif
QString AOApplication::get_case_sensitive_path(QString p_file) { }
//first, check to see if it's actually there (also serves as base case for recursion)
if (exists(p_file)) return p_file; QString AOApplication::get_case_sensitive_path(QString p_file)
{
QFileInfo file(p_file); // first, check to see if it's actually there (also serves as base case for
// recursion)
QString file_basename = file.fileName(); if (exists(p_file))
QString file_parent_dir = get_case_sensitive_path(file.absolutePath()); return p_file;
//second, does it exist in the new parent dir? QFileInfo file(p_file);
if (exists(file_parent_dir + "/" + file_basename))
return file_parent_dir + "/" + file_basename; QString file_basename = file.fileName();
QString file_parent_dir = get_case_sensitive_path(file.absolutePath());
//last resort, dirlist parent dir and find case insensitive match
QRegExp file_rx = QRegExp(file_basename, Qt::CaseInsensitive, QRegExp::FixedString); // second, does it exist in the new parent dir?
QStringList files = QDir(file_parent_dir).entryList(); if (exists(file_parent_dir + "/" + file_basename))
return file_parent_dir + "/" + file_basename;
int result = files.indexOf(file_rx);
// last resort, dirlist parent dir and find case insensitive match
if (result != -1) QRegExp file_rx =
return file_parent_dir + "/" + files.at(result); QRegExp(file_basename, Qt::CaseInsensitive, QRegExp::FixedString);
QStringList files = QDir(file_parent_dir).entryList();
//if nothing is found, let the caller handle the missing file
return file_parent_dir + "/" + file_basename; int result = files.indexOf(file_rx);
}
if (result != -1)
return file_parent_dir + "/" + files.at(result);
// if nothing is found, let the caller handle the missing file
return file_parent_dir + "/" + file_basename;
}

File diff suppressed because it is too large Load Diff