Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22243) -Codechange: Make AIDebugWindow::OnInvalidateData() handle command-/GUI-scope itself.

Browse Source
This commit is contained in:
frosch 2011-03-13 21:32:40 +00:00
parent 335744a1af
commit 91a29a6bef
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ai/ai_gui.cpp
View File

@ -1057,10 +1057,9 @@ struct AIDebugWindow : public QueryStringBaseWindow {
*/ */
virtual void OnInvalidateData(int data = 0, bool gui_scope = true) virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
{ {
if (!gui_scope) return;
if (data == -1 || ai_debug_company == data) this->SetDirty(); if (data == -1 || ai_debug_company == data) this->SetDirty();
if (data == -2) { if (gui_scope && data == -2) {
/* The continue button should be disabled when the game is unpaused and /* The continue button should be disabled when the game is unpaused and
* it was previously paused by the break string ( = a line in the log * it was previously paused by the break string ( = a line in the log
* was highlighted )*/ * was highlighted )*/
@ -1072,8 +1071,9 @@ struct AIDebugWindow : public QueryStringBaseWindow {
} }
} }
/* If the log message is related to the active company tab, check the break string */ /* If the log message is related to the active company tab, check the break string.
if (data == ai_debug_company && this->break_check_enabled && !StrEmpty(this->edit_str_buf)) { * This needs to be done in gameloop-scope, so the AI is suspended immediately. */
if (!gui_scope && data == ai_debug_company && this->break_check_enabled && !StrEmpty(this->edit_str_buf)) {
/* Get the log instance of the active company */ /* Get the log instance of the active company */
Backup<CompanyByte> cur_company(_current_company, ai_debug_company, FILE_LINE); Backup<CompanyByte> cur_company(_current_company, ai_debug_company, FILE_LINE);
AILog::LogData *log = (AILog::LogData *)AIObject::GetLogPointer(); AILog::LogData *log = (AILog::LogData *)AIObject::GetLogPointer();

2
src/ai/api/ai_log.cpp
View File

@ -75,7 +75,7 @@
/* Also still print to debug window */ /* Also still print to debug window */
DEBUG(ai, level, "[%d] [%c] %s", (uint)_current_company, logc, log->lines[log->pos]); DEBUG(ai, level, "[%d] [%c] %s", (uint)_current_company, logc, log->lines[log->pos]);
InvalidateWindowData(WC_AI_DEBUG, 0, _current_company, true); // breakpoint handling needs calling Invalidate immediately. InvalidateWindowData(WC_AI_DEBUG, 0, _current_company);
} }
/* static */ void AILog::FreeLogPointer() /* static */ void AILog::FreeLogPointer()