@@ -218,7 +218,7 @@ void Map::drawTerrain(Surface *surface)
 	int dummy;
 	BattleUnit *unit = 0;
 	bool invalid;
-	int tileShade, wallShade, tileColor, wallColor;
+	int tileShade, wallShade, tileColor;
 	NumberText *_numWaypid = 0;
 
 	// get corner map coordinates to give rough boundaries in which tiles to redraw are
@@ -307,16 +307,6 @@ void Map::drawTerrain(Surface *surface)
 					}
 
 					tileColor = tile->getMarkerColor();
-					wallColor = 0;
-
-					/*
-					 * with this we can enable FOV visibility, todo one day
-					if (!tileColor && !tile->getVisible())
-					{
-						tileColor = 6;
-						wallColor = 6;
-					}
-					*/
 
 					// Draw floor
 					tmpSurface = tile->getSprite(MapData::O_FLOOR);
@@ -365,7 +355,7 @@ void Map::drawTerrain(Surface *surface)
 								wallShade = 0;
 							else
 								wallShade = tileShade;
-							tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_WESTWALL)->getYOffset(), wallShade, false, wallColor);
+							tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_WESTWALL)->getYOffset(), wallShade, false);
 						}
 						// Draw north wall
 						tmpSurface = tile->getSprite(MapData::O_NORTHWALL);
@@ -378,26 +368,26 @@ void Map::drawTerrain(Surface *surface)
 								wallShade = tileShade;
 							if (tile->getMapData(MapData::O_WESTWALL))
 							{
-								tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, true, wallColor);
+								tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, true);
 							}
 							else
 							{
-								tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, false, wallColor);
+								tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, false);
 							}
 						}
 						// Draw object
 						if (tile->getMapData(MapData::O_OBJECT))
 						{
 							tmpSurface = tile->getSprite(MapData::O_OBJECT);
 							if (tmpSurface)
-								tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_OBJECT)->getYOffset(), tileShade, false, wallColor);
+								tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_OBJECT)->getYOffset(), tileShade, false, tileColor);
 						}
 						// draw an item on top of the floor (if any)
 						int sprite = tile->getTopItemSprite();
 						if (sprite != -1)
 						{
 							tmpSurface = _res->getSurfaceSet("FLOOROB.PCK")->getFrame(sprite);
-							tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y + tile->getTerrainLevel(), tileShade, false, wallColor);
+							tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y + tile->getTerrainLevel(), tileShade, false);
 						}
 
 					}
 
@@ -262,6 +262,9 @@ bool TileEngine::calculateFOV(BattleUnit *unit)
 								|| (visibleUnit->getFaction() != FACTION_HOSTILE && unit->getFaction() == FACTION_HOSTILE))
 							{
 								unit->addToVisibleUnits(visibleUnit);
+								unit->addToVisibleTiles(visibleUnit->getTile());
+								visibleUnit->getTile()->setDiscovered(true, 2);
+								visibleUnit->getTile()->setVisible(+1);
 							}
 							if (unit->getFaction() == FACTION_PLAYER)
 								visibleUnit->setVisible(true);
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ void Map::drawTerrain(Surface *surface)`
`218`	`218`	`int dummy;`
`219`	`219`	`BattleUnit *unit = 0;`
`220`	`220`	`bool invalid;`
`221`		`- int tileShade, wallShade, tileColor, wallColor;`
	`221`	`+ int tileShade, wallShade, tileColor;`
`222`	`222`	`NumberText *_numWaypid = 0;`
`223`	`223`
`224`	`224`	`// get corner map coordinates to give rough boundaries in which tiles to redraw are`
`@@ -307,16 +307,6 @@ void Map::drawTerrain(Surface *surface)`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`tileColor = tile->getMarkerColor();`
`310`		`- wallColor = 0;`
`311`		`-`
`312`		`- /*`
`313`		`- * with this we can enable FOV visibility, todo one day`
`314`		`- if (!tileColor && !tile->getVisible())`
`315`		`- {`
`316`		`- tileColor = 6;`
`317`		`- wallColor = 6;`
`318`		`- }`
`319`		`- */`
`320`	`310`
`321`	`311`	`// Draw floor`
`322`	`312`	`tmpSurface = tile->getSprite(MapData::O_FLOOR);`
`@@ -365,7 +355,7 @@ void Map::drawTerrain(Surface *surface)`
`365`	`355`	`wallShade = 0;`
`366`	`356`	`else`
`367`	`357`	`wallShade = tileShade;`
`368`		`- tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_WESTWALL)->getYOffset(), wallShade, false, wallColor);`
	`358`	`+ tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_WESTWALL)->getYOffset(), wallShade, false);`
`369`	`359`	`}`
`370`	`360`	`// Draw north wall`
`371`	`361`	`tmpSurface = tile->getSprite(MapData::O_NORTHWALL);`
`@@ -378,26 +368,26 @@ void Map::drawTerrain(Surface *surface)`
`378`	`368`	`wallShade = tileShade;`
`379`	`369`	`if (tile->getMapData(MapData::O_WESTWALL))`
`380`	`370`	`{`
`381`		`- tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, true, wallColor);`
	`371`	`+ tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, true);`
`382`	`372`	`}`
`383`	`373`	`else`
`384`	`374`	`{`
`385`		`- tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, false, wallColor);`
	`375`	`+ tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_NORTHWALL)->getYOffset(), wallShade, false);`
`386`	`376`	`}`
`387`	`377`	`}`
`388`	`378`	`// Draw object`
`389`	`379`	`if (tile->getMapData(MapData::O_OBJECT))`
`390`	`380`	`{`
`391`	`381`	`tmpSurface = tile->getSprite(MapData::O_OBJECT);`
`392`	`382`	`if (tmpSurface)`
`393`		`- tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_OBJECT)->getYOffset(), tileShade, false, wallColor);`
	`383`	`+ tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y - tile->getMapData(MapData::O_OBJECT)->getYOffset(), tileShade, false, tileColor);`
`394`	`384`	`}`
`395`	`385`	`// draw an item on top of the floor (if any)`
`396`	`386`	`int sprite = tile->getTopItemSprite();`
`397`	`387`	`if (sprite != -1)`
`398`	`388`	`{`
`399`	`389`	`tmpSurface = _res->getSurfaceSet("FLOOROB.PCK")->getFrame(sprite);`
`400`		`- tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y + tile->getTerrainLevel(), tileShade, false, wallColor);`
	`390`	`+ tmpSurface->blitNShade(surface, screenPosition.x, screenPosition.y + tile->getTerrainLevel(), tileShade, false);`
`401`	`391`	`}`
`402`	`392`
`403`	`393`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,9 @@ bool TileEngine::calculateFOV(BattleUnit *unit)`
`262`	`262`	`\|\| (visibleUnit->getFaction() != FACTION_HOSTILE && unit->getFaction() == FACTION_HOSTILE))`
`263`	`263`	`{`
`264`	`264`	`unit->addToVisibleUnits(visibleUnit);`
	`265`	`+ unit->addToVisibleTiles(visibleUnit->getTile());`
	`266`	`+ visibleUnit->getTile()->setDiscovered(true, 2);`
	`267`	`+ visibleUnit->getTile()->setVisible(+1);`
`265`	`268`	`}`
`266`	`269`	`if (unit->getFaction() == FACTION_PLAYER)`
`267`	`270`	`visibleUnit->setVisible(true);`