Skip to content

Commit a0702d0

Browse files
committed
Finished inlining the addResource function
1 parent 0c360a5 commit a0702d0

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

include/GameBoard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class GameBoard
2222
std::map<Coordinate, std::unique_ptr<GamePiece>> corners;
2323
std::map<Coordinate, std::unique_ptr<GamePiece>> resources;
2424
std::vector<std::unique_ptr<const Road>> roads;
25-
void addResource(x, y, res, val);
25+
void addResource(int x, int y, resourceType res, int val);
2626

2727
int constructBoardFromFile(std::ifstream &file);
2828
int constructFileFromBoard(std::ofstream &file);

src/GameBoard.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@ void GameBoard::PlaceSettlement(Coordinate location, Player& Owner){
134134
corners[location] = std::unique_ptr<GamePiece>(new Settlement(*this, location, Owner));
135135
}
136136

137-
void addResource(int x, int y, resourceType res, int val)
137+
void GameBoard::addResource(int x, int y, resourceType res, int val)
138138
{
139-
GamePiece* newPiece = new ResourceTile(*this, Coordinate(x,y), res, val))
140-
this->resources[Coordinate(x,y)] = newPiece;
139+
this->resources[Coordinate(x,y)] = std::unique_ptr<GamePiece>(new ResourceTile(*this, Coordinate(x,y), res, val));
141140
}
142141

0 commit comments

Comments
 (0)