Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Attorney-Online-Engineering-Task-Force/Attorney-Online-Client-Remake

Browse Source
This commit is contained in:
David Skoland 2017-02-15 23:16:06 +01:00
commit b210f264a9
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aoapplication.h
View File

@ -120,7 +120,7 @@ public:
private: private:
const int RELEASE = 2; const int RELEASE = 2;
const int MAJOR_VERSION = 1; const int MAJOR_VERSION = 1;
const int MINOR_VERSION = 7; const int MINOR_VERSION = 8;
QString user_theme = "default"; QString user_theme = "default";

18
courtroom.cpp
View File

@ -1010,6 +1010,7 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
return; return;
text_state = 0; text_state = 0;
qDebug() << "anim_state set to 0 in handle_chatmessage";
anim_state = 0; anim_state = 0;
chatmessage_is_empty = m_chatmessage[MESSAGE] == " " || m_chatmessage[MESSAGE] == ""; chatmessage_is_empty = m_chatmessage[MESSAGE] == " " || m_chatmessage[MESSAGE] == "";
@ -1075,6 +1076,7 @@ void Courtroom::objection_done()
void Courtroom::handle_chatmessage_2() void Courtroom::handle_chatmessage_2()
{ {
qDebug() << "handle_chatmessage_2 called";
ui_vp_speedlines->stop(); ui_vp_speedlines->stop();
ui_vp_player_char->stop(); ui_vp_player_char->stop();
@ -1102,14 +1104,13 @@ void Courtroom::handle_chatmessage_2()
switch (emote_mod) switch (emote_mod)
{ {
case 1: case 2: case 3: case 4: case 6: case 1: case 2: case 6:
play_preanim(); play_preanim();
break; break;
default: default:
qDebug() << "W: invalid emote mod: " << QString::number(emote_mod); qDebug() << "W: invalid emote mod: " << QString::number(emote_mod);
//intentional fallthru //intentional fallthru
case 0: case 5: case 0: case 5:
start_chat_ticking();
handle_chatmessage_3(); handle_chatmessage_3();
} }
} }
@ -1229,6 +1230,7 @@ void Courtroom::play_preanim()
void Courtroom::preanim_done() void Courtroom::preanim_done()
{ {
qDebug() << "preanim_done called";
handle_chatmessage_3(); handle_chatmessage_3();
} }
@ -1275,11 +1277,8 @@ void Courtroom::chat_tick()
{ {
text_state = 2; text_state = 2;
chat_tick_timer->stop(); chat_tick_timer->stop();
if (anim_state == 2) anim_state = 3;
{ ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]);
anim_state = 3;
ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]);
}
} }
else else
@ -1816,7 +1815,7 @@ void Courtroom::on_change_character_clicked()
} }
void Courtroom::on_reload_theme_clicked() void Courtroom::on_reload_theme_clicked()
{ {
ao_app->set_user_theme(); ao_app->set_user_theme();
set_widgets(); set_widgets();
@ -1824,7 +1823,8 @@ void Courtroom::on_reload_theme_clicked()
set_background(current_background); set_background(current_background);
enter_courtroom(m_cid); enter_courtroom(m_cid);
anim_state = 4;
text_state = 3;
} }
void Courtroom::on_back_to_lobby_clicked() void Courtroom::on_back_to_lobby_clicked()

1
courtroom.h
View File

@ -25,7 +25,6 @@
#include <QVector> #include <QVector>
#include <QCloseEvent> #include <QCloseEvent>
#include <QSignalMapper> #include <QSignalMapper>
#include <QSoundEffect>
#include <QMap> #include <QMap>
class AOApplication; class AOApplication;

7
path_functions.cpp
View File

@ -1,17 +1,16 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "courtroom.h" #include "courtroom.h"
#ifndef OMNI_WIN_DEBUG
#define OMNI_WIN_DEBUG
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
#endif
QString AOApplication::get_base_path() QString AOApplication::get_base_path()
{ {
#ifdef OMNI_DEBUG #ifdef OMNI_DEBUG
return "/media/omnitroid/Data/winshare/AO/client/base/"; return "/media/omnitroid/Data/winshare/AO/client/base/";
#elif defined(OMNI_WIN_DEBUG)
return "E:/AO/client/base/";
#else #else
return (QDir::currentPath() + "/base/"); return (QDir::currentPath() + "/base/");
#endif #endif

2
text_file_functions.cpp
View File

@ -130,8 +130,6 @@ pos_size_type AOApplication::get_pos_and_size(QString p_identifier, QString p_de
return return_value; return return_value;
} }
qDebug() << "W: Could not find proper " << p_identifier << " in " << p_design_path;
//caller should deal with the result properly(check width and height of output for negatives) //caller should deal with the result properly(check width and height of output for negatives)
return_value.height = -1; return_value.height = -1;
return_value.width = -1; return_value.width = -1;