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

Attorney Online 2.11 Release Candidate 1 (#1026)

Browse Source 
* Version bump and minor fixes

* Remove unecessary headers

Thanks QtCreator
This commit is contained in:
Salanto 2024-07-21 18:54:52 +02:00 committed by GitHub
parent 0c3a4259ab
commit e82726ba5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aoapplication.cpp
View File

@ -119,7 +119,7 @@ void AOApplication::destruct_courtroom()
QString AOApplication::get_version_string() QString AOApplication::get_version_string()
{ {
return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION); return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC1";
} }
QString AOApplication::find_image(QStringList p_list) QString AOApplication::find_image(QStringList p_list)

4
src/aoapplication.h
View File

@ -103,8 +103,8 @@ public:
static QString get_version_string(); static QString get_version_string();
static const int RELEASE = 2; static const int RELEASE = 2;
static const int MAJOR_VERSION = 10; static const int MAJOR_VERSION = 11;
static const int MINOR_VERSION = 1; static const int MINOR_VERSION = 0;
void set_server_list(QVector<ServerInfo> &servers) { server_list = servers; } void set_server_list(QVector<ServerInfo> &servers) { server_list = servers; }
QVector<ServerInfo> &get_server_list() { return server_list; } QVector<ServerInfo> &get_server_list() { return server_list; }

2
src/courtroom.cpp
View File

@ -412,7 +412,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app)
initialize_evidence(); initialize_evidence();
// TODO : Properly handle widget creation order. // TODO : Properly handle widget creation order.
// Good enough for 2.10 // Good enough for 2.11
ui_pair_list->raise(); ui_pair_list->raise();
construct_char_select(); construct_char_select();

1
src/packet_distribution.cpp
View File

@ -90,6 +90,7 @@ void AOApplication::server_packet_received(AOPacket packet)
else if (header == "FL") else if (header == "FL")
{ {
m_serverdata.set_features(content); m_serverdata.set_features(content);
w_courtroom->set_widgets();
log_to_demo = false; log_to_demo = false;
} }
else if (header == "PN") else if (header == "PN")

6
src/widgets/playerlistwidget.cpp
View File

@ -97,7 +97,7 @@ void PlayerListWidget::onCustomContextMenuRequested(const QPoint &pos)
} }
}); });
if (!m_is_authenticated) if (m_is_authenticated)
{ {
QAction *kick_player_action = menu->addAction("Kick"); QAction *kick_player_action = menu->addAction("Kick");
connect(kick_player_action, &QAction::triggered, this, [this, id, name] { connect(kick_player_action, &QAction::triggered, this, [this, id, name] {
@ -137,9 +137,9 @@ void PlayerListWidget::removePlayer(int playerId)
void PlayerListWidget::filterPlayerList() void PlayerListWidget::filterPlayerList()
{ {
int area_id = m_player_map.value(ao_app->client_id).area_id; int area_id = m_player_map.value(ao_app->client_id).area_id;
for (int i = 0; i < count(); ++i) for (QListWidgetItem *item : qAsConst(m_item_map))
{ {
m_item_map[i]->setHidden(m_player_map[i].area_id != area_id); item->setHidden(m_player_map[item->data(Qt::UserRole).toInt()].area_id != area_id);
} }
} }