games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

fine tuning turn timers

Browse Source
This commit is contained in:
Laserlicht
2025-07-04 21:42:16 +02:00
parent e0ea7ca32b
commit 4aad60523c
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/adventureMap/TurnTimerWidget.cpp
View File

@@ -17,6 +17,8 @@
#include "../GameInstance.h"
#include "../media/ISoundPlayer.h"
#include "../render/Graphics.h"
#include "../render/IFont.h"
#include "../render/IRenderHandler.h"
#include "../widgets/Images.h"
#include "../widgets/GraphicalPrimitiveCanvas.h"
#include "../widgets/TextControls.h"
@@ -45,29 +47,28 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
const auto & timers = GAME->interface()->cb->getStartInfo()->turnTimerInfo;
backgroundTexture = std::make_shared<CFilledTexture>(ImagePath::builtin("DiBoxBck"), pos); // 1 px smaller on all sides
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BRIGHT_YELLOW);
if (isBattleMode)
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BRIGHT_YELLOW);
else
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BLACK);
int bigFontHeight = ENGINE->renderHandler().loadFont(FONT_BIG)->getLineHeight();
pos.h += 6;
if (isBattleMode)
{
pos.w = 76;
pos.w = 77;
pos.h += 20;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], "");
pos.h += bigFontHeight - 4;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
if (timers.battleTimer != 0)
{
pos.h += 20;
playerLabelsBattle[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], "");
pos.h += bigFontHeight;
playerLabelsBattle[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
}
if (!timers.accumulatingUnitTimer && timers.unitTimer != 0)
{
pos.h += 20;
playerLabelsUnit[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], "");
pos.h += bigFontHeight;
playerLabelsUnit[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
}
updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player));
@@ -75,10 +76,10 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
else
{
if (!timers.accumulatingTurnTimer && timers.baseTimer != 0)
pos.w = 120;
pos.w = 130;
else
pos.w = 60;
pos.w = 70;
for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player)
{
if (GAME->interface()->cb->getStartInfo()->playerInfos.count(player) == 0)
@@ -87,8 +88,8 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
if (!GAME->interface()->cb->getStartInfo()->playerInfos.at(player).isControlledByHuman())
continue;
pos.h += 20;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], "");
pos.h += bigFontHeight - 4;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player));
}