Apparently GUI should be able to try and set a setting, without it actually being defined, see comments in IGUIObject::LoadStyle.
Removing invalid access to setting in progress bar. closes #314 This was SVN commit r7155.
This commit is contained in:
parent
85179afa0d
commit
d63acc604f
@ -79,7 +79,6 @@ void CProgressBar::Draw()
|
|||||||
float value = 0;
|
float value = 0;
|
||||||
GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_background", sprite_background);
|
GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_background", sprite_background);
|
||||||
GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_bar", sprite_bar);
|
GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_bar", sprite_bar);
|
||||||
GUI<int>::GetSetting(this, "cell_id", cell_id);
|
|
||||||
GUI<float>::GetSetting(this, "caption", value);
|
GUI<float>::GetSetting(this, "caption", value);
|
||||||
|
|
||||||
GetGUI()->DrawSprite(*sprite_background, cell_id, bz, m_CachedActualSize);
|
GetGUI()->DrawSprite(*sprite_background, cell_id, bz, m_CachedActualSize);
|
||||||
|
@ -261,7 +261,7 @@ PSRETURN IGUIObject::SetSetting(const CStr& Setting, const CStr& Value, const bo
|
|||||||
{
|
{
|
||||||
if (!SettingExists(Setting))
|
if (!SettingExists(Setting))
|
||||||
{
|
{
|
||||||
return LogInvalidSettings(Setting);
|
return PSRETURN_GUI_InvalidSetting;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get setting
|
// Get setting
|
||||||
|
Loading…
Reference in New Issue
Block a user