games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Fix After Merge

Browse Source
This commit is contained in:
krs 2023-06-11 19:12:09 +03:00
parent 0a8daf4d02
commit 5158a5f7db
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/battle/BattleFieldController.cpp
View File

@ -82,6 +82,7 @@ namespace HexMasks
std::map<int, int> hexEdgeMaskToFrameIndex;
// Maps HexEdgesMask to "Frame" indexes for range highligt images
void initializeHexEdgeMaskToFrameIndex()
{
hexEdgeMaskToFrameIndex[HexMasks::empty] = 0;
@ -127,8 +128,8 @@ BattleFieldController::BattleFieldController(BattleInterface & owner):
attackCursors = std::make_shared<CAnimation>("CRCOMBAT");
attackCursors->preload();
fullDamageRangeLimitImages = std::make_unique<CAnimation>("battle/rangeHighlights/rangeHighlightsGreen.json");
fullDamageRangeLimitImages->preload();
rangedFullDamageLimitImages = std::make_unique<CAnimation>("battle/rangeHighlights/rangeHighlightsGreen.json");
rangedFullDamageLimitImages->preload();
initializeHexEdgeMaskToFrameIndex();
flipRangedFullDamageLimitImagesIntoPositions();

14
client/battle/BattleFieldController.h
View File

@ -37,20 +37,6 @@ class BattleFieldController : public CIntObject
std::shared_ptr<CAnimation> attackCursors;
// key in image map is a mask that has set to 1 the edges present in the image 0..5
/*
/\
0 1
/ \
| |
5 2
| |
\ /
4 3
\/
*/
std::map<uint8_t, std::shared_ptr<IImage>> fullDamageRangeLimitImages;
/// Canvas that contains background, hex grid (if enabled), absolute obstacles and movement range of active stack
std::unique_ptr<Canvas> backgroundWithHexes;

6
config/widgets/settings/battleOptionsTab.json
View File

@ -7,7 +7,7 @@
"name": "lineCreatureInfo",
"type": "texture",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 5, "y" : 259, "w": 365, "h": 3}
"rect": { "x" : 5, "y" : 289, "w": 365, "h": 3}
},
{
"name": "lineAnimationSpeed",
@ -69,7 +69,7 @@
"name": "creatureInfoLabels",
"type" : "verticalLayout",
"customType" : "labelDescription",
"position": {"x": 45, "y": 265},
"position": {"x": 45, "y": 295},
"items":
[
{
@ -84,7 +84,7 @@
"name": "creatureInfoCheckboxes",
"type" : "verticalLayout",
"customType" : "checkboxFake",
"position": {"x": 10, "y": 263},
"position": {"x": 10, "y": 293},
"items":
[
{},