games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Changes following review:

Browse Source 
- shared_ptr for destructibleEnemyTurns instead of raw pointer
- drop implicit int conversion for BattleHex class
  and implement toInt() instead
- implement necessary operators in BattleHex
- adjust code to work properly with JSON serializer
This commit is contained in:
MichalZr6
2025-01-06 23:05:45 +01:00
parent 4031006317
commit dbe82b94f6
39 changed files with 223 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/scripting/LuaSpellEffectAPITest.cpp
View File

@ -84,7 +84,7 @@ TEST_F(LuaSpellEffectAPITest, DISABLED_ApplicableOnLeftSideOfField)
BattleHex hex(2,2);
JsonNode first;
first.Vector().emplace_back(static_cast<si16>(hex));
first.Vector().emplace_back(hex.toInt());
first.Vector().emplace_back();
JsonNode targets;
@ -113,7 +113,7 @@ TEST_F(LuaSpellEffectAPITest, DISABLED_NotApplicableOnRightSideOfField)
BattleHex hex(11,2);
JsonNode first;
first.Vector().emplace_back(static_cast<si16>(hex));
first.Vector().emplace_back(hex.toInt());
first.Vector().emplace_back(-1);
JsonNode targets;
@ -138,13 +138,13 @@ TEST_F(LuaSpellEffectAPITest, DISABLED_ApplyMoveUnit)
BattleHex hex1(11,2);
JsonNode unit;
unit.Vector().emplace_back(static_cast<si16>(hex1));
unit.Vector().emplace_back(hex1.toInt());
unit.Vector().emplace_back(42);
BattleHex hex2(5,4);
JsonNode destination;
destination.Vector().emplace_back(static_cast<si16>(hex2));
destination.Vector().emplace_back(hex2.toInt());
destination.Vector().emplace_back(-1);
JsonNode targets;