diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/aoapplication.cpp | 2 | ||||
| -rw-r--r-- | src/aoapplication.h | 4 | ||||
| -rw-r--r-- | src/courtroom.cpp | 2 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/playerlistwidget.cpp | 6 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp index bcc1ad59..dd5821db 100644 --- a/src/aoapplication.cpp +++ b/src/aoapplication.cpp @@ -119,7 +119,7 @@ void AOApplication::destruct_courtroom() 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) diff --git a/src/aoapplication.h b/src/aoapplication.h index d040408d..f0d3d81c 100644 --- a/src/aoapplication.h +++ b/src/aoapplication.h @@ -103,8 +103,8 @@ public: static QString get_version_string(); static const int RELEASE = 2; - static const int MAJOR_VERSION = 10; - static const int MINOR_VERSION = 1; + static const int MAJOR_VERSION = 11; + static const int MINOR_VERSION = 0; void set_server_list(QVector<ServerInfo> &servers) { server_list = servers; } QVector<ServerInfo> &get_server_list() { return server_list; } diff --git a/src/courtroom.cpp b/src/courtroom.cpp index cea7ba07..3f1e938a 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -412,7 +412,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) initialize_evidence(); // TODO : Properly handle widget creation order. - // Good enough for 2.10 + // Good enough for 2.11 ui_pair_list->raise(); construct_char_select(); diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index 9ec6fd01..94fd3b69 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -90,6 +90,7 @@ void AOApplication::server_packet_received(AOPacket packet) else if (header == "FL") { m_serverdata.set_features(content); + w_courtroom->set_widgets(); log_to_demo = false; } else if (header == "PN") diff --git a/src/widgets/playerlistwidget.cpp b/src/widgets/playerlistwidget.cpp index 849c62a9..2a3a8987 100644 --- a/src/widgets/playerlistwidget.cpp +++ b/src/widgets/playerlistwidget.cpp @@ -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"); connect(kick_player_action, &QAction::triggered, this, [this, id, name] { @@ -137,9 +137,9 @@ void PlayerListWidget::removePlayer(int playerId) void PlayerListWidget::filterPlayerList() { 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); } } |