Skip to content

Commit d6e5385

Browse files
committed
settlement issues fixed, unit testing for payout implemented
1 parent 96350ba commit d6e5385

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

include/GameBoard.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class GameBoard {
6060

6161
void save(std::ostream& out);
6262

63+
ResourceTile& getResourceTile(Coordinate location) const;
6364

6465
const std::map<Coordinate, std::unique_ptr<ResourceTile>>& getResources() const;
6566

src/GameBoard.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,13 @@ const map<Coordinate, unique_ptr<ResourceTile>>& GameBoard::getResources() const
224224
return resources;
225225
}
226226

227+
ResourceTile& GameBoard::getResourceTile(Coordinate location) const
228+
{
229+
//return resources.at(location);
230+
231+
return *(resources.find(location)->second);
232+
}
233+
227234
std::vector<Settlement*> GameBoard::GetNeighboringSettlements(
228235
Coordinate location) const {
229236
static Coordinate adjacentCoordDiffs[] = { Coordinate(0, 1), Coordinate(1,

tests/test_GameBoard.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,14 @@ TEST(payout_simple) {
191191
test_board->PlaceSettlement(Coordinate(0,2), test_player);
192192

193193

194-
std::map<Coordinate, std::unique_ptr<ResourceTile>>::iterator it =
195-
test_board->getResources().find(Coordinate(0,1));
196-
//test_board->getResources().at(Coordinate(0,1)).Payout(); WTF
194+
195+
test_board->getResourceTile(Coordinate(0,1)).Payout();
196+
197+
197198
CHECK(!(test_player.getWheat() || test_player.getWood() ||
198199
test_player.getOre() || test_player.getBrick() || test_player.getWool()));
199200
delete test_board;
200-
delete &test_player;
201+
//delete &test_player;
201202

202203
}
203204

0 commit comments

Comments
 (0)