fix
This commit is contained in:
parent
4e16537da0
commit
341d9a57b2
@ -2738,7 +2738,7 @@ bool Courtroom::handle_objection()
|
|||||||
objection_player->findAndPlayCharacterShout("custom", m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME]));
|
objection_player->findAndPlayCharacterShout("custom", m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME]));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
m_chatmessage[EMOTE_MOD] = QChar(PREANIM);
|
m_chatmessage[EMOTE_MOD] = QChar(static_cast<ushort>(PREANIM));
|
||||||
}
|
}
|
||||||
ui_vp_objection->loadAndPlayAnimation(filename, m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME]));
|
ui_vp_objection->loadAndPlayAnimation(filename, m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME]));
|
||||||
sfx_player->stopAll(); // Objection played! Cut all sfx.
|
sfx_player->stopAll(); // Objection played! Cut all sfx.
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#include "networkmanager.h"
|
#include "networkmanager.h"
|
||||||
#include "widgets/direct_connect_dialog.h"
|
#include "widgets/direct_connect_dialog.h"
|
||||||
#include "widgets/server_editor_dialog.h"
|
#include "widgets/server_editor_dialog.h"
|
||||||
|
#include <QTextBrowser>
|
||||||
#include <QImageReader>
|
#include <QImageReader>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QUiLoader>
|
#include <QUiLoader>
|
||||||
|
@ -3,9 +3,10 @@
|
|||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QTextBrowser>
|
#include <QtWidgets/QTextBrowser>
|
||||||
#include <QTreeWidget>
|
#include <QTreeWidget>
|
||||||
#include <QTreeWidgetItem>
|
#include <QTreeWidgetItem>
|
||||||
|
#include <QPointer>
|
||||||
|
|
||||||
#include "file_functions.h"
|
#include "file_functions.h"
|
||||||
#include "networkmanager.h"
|
#include "networkmanager.h"
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QNetworkReply>
|
#include <QNetworkReply>
|
||||||
|
#include <QTextBrowser>
|
||||||
|
|
||||||
NetworkManager::NetworkManager(AOApplication *parent)
|
NetworkManager::NetworkManager(AOApplication *parent)
|
||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
|
Loading…
Reference in New Issue
Block a user