mlangkabel/dota_factory
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make HeaderBar read the tick, artifacts and boss wave from the simulation instead of event

Browse Source
This commit is contained in:
mlangkabel
2026-08-03 22:02:19 +02:00
parent b44a85685e
commit d9ef6aa728
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/HeaderBar.cpp
View File

@@ -107,9 +107,9 @@ HeaderBar::~HeaderBar()
unregisterForEvents(); unregisterForEvents();
} }
void HeaderBar::handleEvent(std::shared_ptr<const TickAdvancedEvent> event) void HeaderBar::handleEvent(std::shared_ptr<const TickAdvancedEvent> /*event*/)
{ {
const int totalSeconds = static_cast<int>(ticksToSeconds(event->tick)); const int totalSeconds = static_cast<int>(ticksToSeconds(m_sim->getCurrentTick()));
m_timeLabel->setText( m_timeLabel->setText(
QString("%1:%2") QString("%1:%2")
.arg(totalSeconds / 60, 2, 10, QChar('0')) .arg(totalSeconds / 60, 2, 10, QChar('0'))
@@ -195,22 +195,26 @@ void HeaderBar::handleEvent(std::shared_ptr<const GameSpeedChangedEvent> event)
} }
} }
void HeaderBar::handleEvent(std::shared_ptr<const BossWaveUpdatedEvent> event) void HeaderBar::handleEvent(std::shared_ptr<const BossWaveUpdatedEvent> /*event*/)
{ {
const Tick countdownTicks = m_sim->getBossCountdownTicks();
const int bossSeconds = static_cast<int>( const int bossSeconds = static_cast<int>(
ticksToSeconds(event->countdownTicks > 0 ? event->countdownTicks : 0)); ticksToSeconds(countdownTicks > 0 ? countdownTicks : 0));
m_bossWaveLabel->setText( m_bossWaveLabel->setText(
tr("Boss Wave #%1") tr("Boss Wave #%1")
.arg(event->counter)); .arg(m_sim->getBossWaveCounter()));
m_nextBossLabel->setText( m_nextBossLabel->setText(
tr("Next boss: %1:%2") tr("Next boss: %1:%2")
.arg(bossSeconds / 60) .arg(bossSeconds / 60)
.arg(bossSeconds % 60, 2, 10, QChar('0'))); .arg(bossSeconds % 60, 2, 10, QChar('0')));
} }
void HeaderBar::handleEvent(std::shared_ptr<const ArtifactCountChangedEvent> event) void HeaderBar::handleEvent(std::shared_ptr<const ArtifactCountChangedEvent> /*event*/)
{ {
m_artifactsLabel->setText(tr("Artifacts: %1/%2").arg(event->count).arg(event->winCount)); m_artifactsLabel->setText(
tr("Artifacts: %1/%2")
.arg(m_sim->getArtifactCount())
.arg(m_sim->getConfig().world.artifacts.artifactWinCount));
} }
void HeaderBar::onSpeedButton(int index) void HeaderBar::onSpeedButton(int index)

4
src/ui/HeaderBar.h
View File

@@ -75,8 +75,8 @@ private:
ItemIconCache* m_itemIcons; // Not owned; lives in MainWindow. ItemIconCache* m_itemIcons; // Not owned; lives in MainWindow.
// The simulation is the single source of truth for the block stock and the // The simulation is the single source of truth for everything the header
// expansion cost; the change events are only refresh signals. // displays; the change events are only refresh signals.
const Simulation* m_sim; const Simulation* m_sim;
static const double kSpeeds[]; static const double kSpeeds[];