Fixed constructor check in ResourceTile

Databean · Databean · commit 6c697d0ca7ff · 2014-02-21T16:06:55.000-06:00
diff --git a/src/GamePiece.cpp b/src/GamePiece.cpp
@@ -15,7 +15,7 @@ GamePiece::~GamePiece() {
 }
 
 ResourceTile::ResourceTile(GameBoard& board, Type type, unsigned short diceValue) : GamePiece(board), type(type), diceValue(diceValue) {
-	if(type != WOOD || type != SHEEP || type != ORE || type != BRICK || type != GRAIN || type != DESERT) {
+	if(type != WOOD && type != SHEEP && type != ORE && type != BRICK && type != GRAIN && type != DESERT) {
 		throw runtime_error("Invalid resource tile type");
 	}
 	if(diceValue < 2 || diceValue > 12) {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ GamePiece::~GamePiece() {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`ResourceTile::ResourceTile(GameBoard& board, Type type, unsigned short diceValue) : GamePiece(board), type(type), diceValue(diceValue) {`
`18`		`- if(type != WOOD \|\| type != SHEEP \|\| type != ORE \|\| type != BRICK \|\| type != GRAIN \|\| type != DESERT) {`
	`18`	`+ if(type != WOOD && type != SHEEP && type != ORE && type != BRICK && type != GRAIN && type != DESERT) {`
`19`	`19`	`throw runtime_error("Invalid resource tile type");`
`20`	`20`	`}`
`21`	`21`	`if(diceValue < 2 \|\| diceValue > 12) {`