Moved error reporting to ScreenSystemLayer error.lua. ScreenSystemLayer overlay/default.lua restored to previous. Error messages are now broadcast with the ScriptError message instead of SystemMessage. Added show/hide error messages toggle and clear error messages to debug menu. Nuked ScreenConsoleOverlay for being unfinished and duplicating ScreenSystemLayer. Changed Actor:tween and Tween::CreateFromStack to use ReportScriptError on invalid tween params. Changed some OptionRowList things to use ReportScriptError on invalid metrics.
This commit is contained in:
@@ -549,6 +549,8 @@ static LocalizedString RESTART ( "ScreenDebugOverlay", "Restart" );
|
||||
static LocalizedString SCREEN_ON ( "ScreenDebugOverlay", "Send On To Screen" );
|
||||
static LocalizedString SCREEN_OFF ( "ScreenDebugOverlay", "Send Off To Screen" );
|
||||
static LocalizedString RELOAD_OVERLAY_SCREENS( "ScreenDebugOverlay", "Reload Overlay Screens" );
|
||||
static LocalizedString TOGGLE_ERRORS( "ScreenDebugOverlay", "Toggle Errors" );
|
||||
static LocalizedString CLEAR_ERRORS( "ScreenDebugOverlay", "Clear Errors" );
|
||||
static LocalizedString RELOAD_THEME_AND_TEXTURES( "ScreenDebugOverlay", "Reload Theme and Textures" );
|
||||
static LocalizedString WRITE_PROFILES ( "ScreenDebugOverlay", "Write Profiles" );
|
||||
static LocalizedString WRITE_PREFERENCES ( "ScreenDebugOverlay", "Write Preferences" );
|
||||
@@ -1039,8 +1041,36 @@ class DebugLineReloadOverlayScreens : public IDebugLine
|
||||
virtual RString GetPageName() const { return "Theme"; }
|
||||
virtual void DoAndLog( RString &sMessageOut )
|
||||
{
|
||||
IDebugLine::DoAndLog(sMessageOut);
|
||||
SCREENMAN->ReloadOverlayScreensAfterInputFinishes();
|
||||
IDebugLine::DoAndLog(sMessageOut);
|
||||
}
|
||||
};
|
||||
|
||||
class DebugLineToggleErrors : public IDebugLine
|
||||
{
|
||||
virtual RString GetDisplayTitle() { return TOGGLE_ERRORS.GetValue(); }
|
||||
virtual RString GetDisplayValue() { return RString(); }
|
||||
virtual bool IsEnabled() { return true; }
|
||||
virtual RString GetPageName() const { return "Theme"; }
|
||||
virtual void DoAndLog( RString &sMessageOut )
|
||||
{
|
||||
Message msg("ToggleErrors");
|
||||
MESSAGEMAN->Broadcast(msg);
|
||||
IDebugLine::DoAndLog(sMessageOut);
|
||||
}
|
||||
};
|
||||
|
||||
class DebugLineClearErrors : public IDebugLine
|
||||
{
|
||||
virtual RString GetDisplayTitle() { return CLEAR_ERRORS.GetValue(); }
|
||||
virtual RString GetDisplayValue() { return RString(); }
|
||||
virtual bool IsEnabled() { return true; }
|
||||
virtual RString GetPageName() const { return "Theme"; }
|
||||
virtual void DoAndLog( RString &sMessageOut )
|
||||
{
|
||||
Message msg("ClearErrors");
|
||||
MESSAGEMAN->Broadcast(msg);
|
||||
IDebugLine::DoAndLog(sMessageOut);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1227,6 +1257,8 @@ DECLARE_ONE( DebugLineCurrentScreenOn );
|
||||
DECLARE_ONE( DebugLineCurrentScreenOff );
|
||||
DECLARE_ONE( DebugLineReloadTheme );
|
||||
DECLARE_ONE( DebugLineReloadOverlayScreens );
|
||||
DECLARE_ONE( DebugLineToggleErrors );
|
||||
DECLARE_ONE( DebugLineClearErrors );
|
||||
DECLARE_ONE( DebugLineWriteProfiles );
|
||||
DECLARE_ONE( DebugLineWritePreferences );
|
||||
DECLARE_ONE( DebugLineMenuTimer );
|
||||
|
||||
Reference in New Issue
Block a user