mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r24342) -Feature: Also use the new multi-word filtering for script breakpoints.

release/1.3
frosch 2012-06-13 18:58:29 +00:00
parent 36766befb2
commit bca5ba1d26
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ai/ai_gui.cpp
View File

@ -14,6 +14,7 @@
#include "../error.h" #include "../error.h"
#include "../settings_gui.h" #include "../settings_gui.h"
#include "../querystring_gui.h" #include "../querystring_gui.h"
#include "../stringfilter_type.h"
#include "../company_base.h" #include "../company_base.h"
#include "../company_gui.h" #include "../company_gui.h"
#include "../strings_func.h" #include "../strings_func.h"
@ -973,6 +974,7 @@ struct AIDebugWindow : public QueryStringBaseWindow {
bool show_break_box; ///< Whether the break/debug box is visible. bool show_break_box; ///< Whether the break/debug box is visible.
static bool break_check_enabled; ///< Stop an AI when it prints a matching string static bool break_check_enabled; ///< Stop an AI when it prints a matching string
static char break_string[MAX_BREAK_STR_STRING_LENGTH]; ///< The string to match to the AI output static char break_string[MAX_BREAK_STR_STRING_LENGTH]; ///< The string to match to the AI output
static StringFilter break_string_filter; ///< Log filter for break.
static bool case_sensitive_break_check; ///< Is the matching done case-sensitive static bool case_sensitive_break_check; ///< Is the matching done case-sensitive
int highlight_row; ///< The output row that matches the given string, or -1 int highlight_row; ///< The output row that matches the given string, or -1
Scrollbar *vscroll; ///< Cache of the vertical scrollbar. Scrollbar *vscroll; ///< Cache of the vertical scrollbar.
@ -1286,6 +1288,7 @@ struct AIDebugWindow : public QueryStringBaseWindow {
if (this->HandleEditBoxKey(WID_AID_BREAK_STR_EDIT_BOX, key, keycode, state) != HEBR_NOT_FOCUSED) { if (this->HandleEditBoxKey(WID_AID_BREAK_STR_EDIT_BOX, key, keycode, state) != HEBR_NOT_FOCUSED) {
/* Save the current string to static member so it can be restored next time the window is opened */ /* Save the current string to static member so it can be restored next time the window is opened */
strecpy(this->break_string, this->edit_str_buf, lastof(this->break_string)); strecpy(this->break_string, this->edit_str_buf, lastof(this->break_string));
break_string_filter.SetFilterTerm(this->break_string);
} }
return state; return state;
} }
@ -1313,14 +1316,14 @@ 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.
* This needs to be done in gameloop-scope, so the AI is suspended immediately. */ * This needs to be done in gameloop-scope, so the AI is suspended immediately. */
if (ai_debug_company != OWNER_DEITY && !gui_scope && data == ai_debug_company && this->break_check_enabled && !StrEmpty(this->edit_str_buf)) { if (ai_debug_company != OWNER_DEITY && !gui_scope && data == ai_debug_company && this->break_check_enabled && !this->break_string_filter.IsEmpty()) {
/* Get the log instance of the active company */ /* Get the log instance of the active company */
ScriptLog::LogData *log = this->GetLogPointer(); ScriptLog::LogData *log = this->GetLogPointer();
if (log != NULL && case_sensitive_break_check? if (log != NULL) {
strstr(log->lines[log->pos], this->edit_str_buf) != 0 : this->break_string_filter.ResetState();
strcasestr(log->lines[log->pos], this->edit_str_buf) != 0) { this->break_string_filter.AddLine(log->lines[log->pos]);
if (this->break_string_filter.GetState()) {
AI::Suspend(ai_debug_company); AI::Suspend(ai_debug_company);
if ((_pause_mode & PM_PAUSED_NORMAL) == PM_UNPAUSED) { if ((_pause_mode & PM_PAUSED_NORMAL) == PM_UNPAUSED) {
DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE); DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
@ -1335,6 +1338,7 @@ struct AIDebugWindow : public QueryStringBaseWindow {
} }
} }
} }
}
virtual void OnResize() virtual void OnResize()
{ {
@ -1348,6 +1352,7 @@ CompanyID AIDebugWindow::ai_debug_company = INVALID_COMPANY;
char AIDebugWindow::break_string[MAX_BREAK_STR_STRING_LENGTH] = ""; char AIDebugWindow::break_string[MAX_BREAK_STR_STRING_LENGTH] = "";
bool AIDebugWindow::break_check_enabled = true; bool AIDebugWindow::break_check_enabled = true;
bool AIDebugWindow::case_sensitive_break_check = false; bool AIDebugWindow::case_sensitive_break_check = false;
StringFilter AIDebugWindow::break_string_filter(&AIDebugWindow::case_sensitive_break_check);
/** Make a number of rows with buttons for each company for the AI debug window. */ /** Make a number of rows with buttons for each company for the AI debug window. */
NWidgetBase *MakeCompanyButtonRowsAIDebug(int *biggest_index) NWidgetBase *MakeCompanyButtonRowsAIDebug(int *biggest_index)