Changed many places that used RageException to use ReportScriptError instead. Wrote ScreenOptionsExample.ini as documentation example for the OptionRow system. Rewrote gamecommands.txt to include all GameCommands. Fixed Commands::GetOriginalCommandString to insert the semicolons that separated the original commands. Changed nonsensical boolean |= true statements in GameCommand.cpp to just use =. Added protection to ReportScriptError to keep it from recursing through itself when an error occurs in error reporting. Added UseAbort option to ReportScriptError for places that want to use an AbortRetryIgnore dialog to query the user. Added ScriptErrorMessage for places that need to handle the warning/dialog part separately. Added logging flag to MESSAGEMAN so that all messages broadcast can be logged when desired. Changed OptionRowHandler::LoadInternal to return a boolean success value as part of error handling.
This commit is contained in:
@@ -77,7 +77,6 @@ function SetErrorMessageTime(which, t)
|
||||
" time to below minimum of " .. min_message_time[which] .. "."})
|
||||
return
|
||||
end
|
||||
Trace("Setting error message " .. which .. " time to " .. t)
|
||||
message_time[which]= t
|
||||
end
|
||||
|
||||
@@ -113,7 +112,11 @@ local frame_args= {
|
||||
if i > 1 and text_actors[i-1] then
|
||||
text_actors[i]:settext(text_actors[i-1]:GetText())
|
||||
else
|
||||
text_actors[i]:settext(params.Message)
|
||||
-- Someone long ago decided that it was a good idea for "::" to be
|
||||
-- a synonym for "\n", so that strings in metrics could have line
|
||||
-- breaks.
|
||||
-- So replace "::" with ":" so we don't have unwanted line breaks.
|
||||
text_actors[i]:settext(params.Message:gsub("::", ":"))
|
||||
end
|
||||
width_clip_limit_text(text_actors[i], line_width)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user