devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-27 03:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

cell size factored into the Map class

Browse Source 
fixed bug in Map::isPointWithinTerrainObject()
This commit is contained in:
devZoGok
2022-10-09 15:41:30 +03:00
parent 27929c3f99
commit 081ddb2765
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit.cpp
+6 -1
View File
@@ -125,7 +125,7 @@ namespace battleship{
attack(order);
break;
case Order::TYPE::MOVE:
move(order, UnitDataManager::getSingleton()->getDestinationOffset()[id]);
move(order, 0.5 * Map::getSingleton()->getCellSize().x);
break;
case Order::TYPE::PATROL:
patrol(order);
@@ -284,6 +284,11 @@ namespace battleship{
int source = map->getCellId(pos, id);
int dest = map->getCellId(order.targets[0].pos, id);
int numCells = map->getTerrainObject(id).numCells;
if(source > numCells || dest > numCells)
return;
Pathfinder *pathfinder = Pathfinder::getSingleton();
u32 **weights = map->getTerrainObject(id).weights;
vector<int> path = pathfinder->findPath(weights, map->getTerrainObject(id).numCells, source, dest);