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

Fix msvc compile

Browse Source
This commit is contained in:
Ivan Savenko 2023-01-18 01:04:50 +02:00
parent 17fc9d8d8f
commit e53e515aa7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/battle/BattleHex.cpp
View File

@ -159,7 +159,7 @@ BattleHex::EDir BattleHex::mutualPosition(BattleHex hex1, BattleHex hex2)
return NONE; return NONE;
} }
char BattleHex::getDistance(BattleHex hex1, BattleHex hex2) uint8_t BattleHex::getDistance(BattleHex hex1, BattleHex hex2)
{ {
int y1 = hex1.getY(), y2 = hex2.getY(); int y1 = hex1.getY(), y2 = hex2.getY();

2
lib/battle/BattleHex.h
View File

@ -88,7 +88,7 @@ struct DLL_LINKAGE BattleHex //TODO: decide if this should be changed to class f
std::vector<BattleHex> allNeighbouringTiles() const; std::vector<BattleHex> allNeighbouringTiles() const;
static EDir mutualPosition(BattleHex hex1, BattleHex hex2); static EDir mutualPosition(BattleHex hex1, BattleHex hex2);
static char getDistance(BattleHex hex1, BattleHex hex2); static uint8_t getDistance(BattleHex hex1, BattleHex hex2);
static void checkAndPush(BattleHex tile, std::vector<BattleHex> & ret); static void checkAndPush(BattleHex tile, std::vector<BattleHex> & ret);
static BattleHex getClosestTile(ui8 side, BattleHex initialPos, std::set<BattleHex> & possibilities); //TODO: vector or set? copying one to another is bad static BattleHex getClosestTile(ui8 side, BattleHex initialPos, std::set<BattleHex> & possibilities); //TODO: vector or set? copying one to another is bad