paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Hopefully fixing VS2003 (autobuilder) error ("'operator &&' is ambiguous - could be 'built-in C++ operator&&(bool, bool)' or 'built-in C++ operator&&(bool, CEntity *)' while trying to match the argument list '(bool, HEntity)'")

Browse Source 
This was SVN commit r4358.
This commit is contained in:
Ykkrosh 2006-09-18 18:38:29 +00:00
parent bfae07a0bc
commit 7ce31a1544
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/ps/Interact.cpp
View File

@ -1503,7 +1503,7 @@ void CBuildingPlacer::update( float timeStep )
// Special case: If the territory has no centre unit, that means the map contains no // Special case: If the territory has no centre unit, that means the map contains no
// Settlements; for testing purposes, let us build anywhere. // Settlements; for testing purposes, let us build anywhere.
CTerritory* territory = g_Game->GetWorld()->GetTerritoryManager()->GetTerritory( pos.X, pos.Z ); CTerritory* territory = g_Game->GetWorld()->GetTerritoryManager()->GetTerritory( pos.X, pos.Z );
if( m_template->m_territoryRestriction == L"Allied" && territory->centre if( m_template->m_territoryRestriction == L"Allied" && (bool)territory->centre
&& territory->owner != g_Game->GetLocalPlayer() ) && territory->owner != g_Game->GetLocalPlayer() )
{ {
m_valid = false; m_valid = false;