1384,1388c1384,1390
< 			cBuildingIterator *building;
< 			cVehicleIterator *vehicle;
< 			if ( ActivePlayer->ScanMap[terrainx+terrainy*Map->size] && ( building = &(*Map)[terrainx+terrainy*Map->size].getBuildings() )->size() > 0 )
< 			{
< 				if ( (*building)->owner && ( !Hud.TNT || (*building)->data.can_attack ) ) color = * ( unsigned int* ) (*building)->owner->color->pixels;
---
> 
> 			if ( ActivePlayer->ScanMap[terrainx+terrainy*Map->size] ) {
> 				cBuildingIterator building((*Map)[terrainx+terrainy*Map->size].getBuildings());
> 				if (building.size() > 0)
> 				{
> 					if ( building->owner && ( !Hud.TNT || building->data.can_attack ) ) color = * ( unsigned int* ) building->owner->color->pixels;
> 				}
1390,1392c1392,1397
< 			else if ( ActivePlayer->ScanMap[terrainx+terrainy*Map->size] && ( vehicle = &(*Map)[terrainx+terrainy*Map->size].getVehicles() )->size() > 0 )
< 			{
< 				if ( !Hud.TNT || (*vehicle)->data.can_attack ) color = * ( unsigned int* ) (*vehicle)->owner->color->pixels;
---
> 			else if ( ActivePlayer->ScanMap[terrainx+terrainy*Map->size] ) {
> 				cVehicleIterator vehicle((*Map)[terrainx+terrainy*Map->size].getVehicles());
> 				if (vehicle.size() > 0)
> 				{
> 					if ( !Hud.TNT || vehicle->data.can_attack ) color = * ( unsigned int* ) vehicle->owner->color->pixels;
> 				}
1394,1396c1399,1404
< 			else if ( ActivePlayer->ScanMap[terrainx+terrainy*Map->size] && ( vehicle = &(*Map)[terrainx+terrainy*Map->size].getPlanes() )->size() > 0 )
< 			{
< 				if ( !Hud.TNT || (*vehicle)->data.can_attack ) color = * ( unsigned int* ) (*vehicle)->owner->color->pixels;
---
> 			else if ( ActivePlayer->ScanMap[terrainx+terrainy*Map->size] ) {
> 				cVehicleIterator vehicle((*Map)[terrainx+terrainy*Map->size].getPlanes());
> 				if (vehicle.size() > 0)
> 				{
> 					if ( !Hud.TNT || vehicle->data.can_attack ) color = * ( unsigned int* ) vehicle->owner->color->pixels;
> 				}