Changed SetCompatibleStyle to only change when incompatible.

This commit is contained in:
Kyzentun
2014-06-27 21:11:34 -06:00
parent afc090ca73
commit 6cb9dec854
+10 -1
View File
@@ -1207,7 +1207,16 @@ void GameState::SetCurrentStyle( const Style *pStyle )
bool GameState::SetCompatibleStyle(StepsType stype)
{
if(CommonMetrics::AUTO_SET_STYLE)
bool style_incompatible= false;
if(!m_pCurStyle)
{
style_incompatible= true;
}
else
{
style_incompatible= stype != m_pCurStyle->m_StepsType;
}
if(CommonMetrics::AUTO_SET_STYLE && style_incompatible)
{
const Style* compatible_style= GAMEMAN->GetFirstCompatibleStyle(
m_pCurGame, GetNumSidesJoined(), stype);