Merge
This commit is contained in:
commit
dfbb27fafc
2 changed files with 4 additions and 3 deletions
|
@ -79,7 +79,7 @@ class CAHDisplayInfos : public IActionHandler
|
|||
if( ClientCfg.Local || hasPrivilegeDEV() || hasPrivilegeSGM() || hasPrivilegeGM() || hasPrivilegeSG() || hasPrivilegeEM() || hasPrivilegeVG() )
|
||||
#endif
|
||||
{
|
||||
ShowInfos = (ShowInfos++)%6;
|
||||
ShowInfos = (ShowInfos+1)%6;
|
||||
|
||||
CGraph::Display = (ShowInfos != 0);
|
||||
}
|
||||
|
|
|
@ -1289,7 +1289,7 @@ void CSoundManager::update ()
|
|||
_BackgroundFlags.Flags[DUSK] = true;
|
||||
break;
|
||||
case CLightCycleManager::StateUnknown:
|
||||
nlwarning("Unknown light cycle state reached.");
|
||||
//nlwarning("Unknown light cycle state reached.");
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -1322,7 +1322,8 @@ void CSoundManager::update ()
|
|||
_BackgroundFlags.Flags[WINTER] = true;
|
||||
break;
|
||||
default:
|
||||
nlwarning("Updating unknown season.");
|
||||
//nlwarning("Updating unknown season.");
|
||||
break;
|
||||
}
|
||||
// TODO : update the filter state for weather effet
|
||||
CWeatherState weatherState = WeatherManager.getCurrWeatherState();
|
||||
|
|
Loading…
Reference in a new issue