(svn r25372) -Add: Allow opening a goal list window specific to a company

7 files changed, 30 insertions, 11 deletions

diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp
index 715051845..c5b12290f 100644
--- a/src/goal_gui.cpp
+++ b/src/goal_gui.cpp
@@ -20,6 +20,7 @@
 #include "goal_base.h"
 #include "core/geometry_func.hpp"
 #include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 
 #include "widgets/goal_widget.h"
@@ -37,6 +38,18 @@ struct GoalListWindow : Window {
 		this->OnInvalidateData(0);
 	}
 
+	virtual void SetStringParameters(int widget) const
+	{
+		if (widget != WID_GOAL_CAPTION) return;
+
+		if (this->window_number == INVALID_COMPANY) {
+			SetDParam(0, STR_GOALS_SPECTATOR_CAPTION);
+		} else {
+			SetDParam(0, STR_GOALS_CAPTION);
+			SetDParam(1, this->window_number);
+		}
+	}
+
 	virtual void OnClick(Point pt, int widget, int click_count)
 	{
 		if (widget != WID_GOAL_GOAL && widget != WID_GOAL_PROGRESS) return;
@@ -64,7 +77,7 @@ struct GoalListWindow : Window {
 		if (y < 0) return;
 
 		FOR_ALL_GOALS(s) {
-			if (s->company == _local_company) {
+			if (s->company == this->window_number) {
 				y--;
 				if (y == 0) {
 					this->HandleClick(s);
@@ -120,7 +133,7 @@ struct GoalListWindow : Window {
 		FOR_ALL_GOALS(s) {
 			if (s->company == INVALID_COMPANY) {
 				num_global++;
-			} else if (s->company == _local_company) {
+			} else if (s->company == this->window_number) {
 				num_company++;
 			}
 		}
@@ -174,7 +187,7 @@ struct GoalListWindow : Window {
 		uint num = 0;
 		const Goal *s;
 		FOR_ALL_GOALS(s) {
-			if (global_section ? s->company == INVALID_COMPANY : s->company == _local_company && s->company != INVALID_COMPANY) {
+			if (global_section ? s->company == INVALID_COMPANY : s->company == this->window_number && s->company != INVALID_COMPANY) {
 				if (IsInsideMM(pos, 0, cap)) {
 					switch (widget) {
 						case WID_GOAL_GOAL:
@@ -197,7 +210,7 @@ struct GoalListWindow : Window {
 		}
 
 		if (widget == WID_GOAL_GOAL && num == 0) {
-			if (IsInsideMM(pos, 0, cap)) DrawString(x, right, y + pos * FONT_HEIGHT_NORMAL, STR_GOALS_NONE);
+			if (IsInsideMM(pos, 0, cap)) DrawString(x, right, y + pos * FONT_HEIGHT_NORMAL, !global_section && this->window_number == INVALID_COMPANY ? STR_GOALS_SPECTATOR_NONE : STR_GOALS_NONE);
 			pos++;
 		}
 	}
@@ -244,7 +257,7 @@ struct GoalListWindow : Window {
 static const NWidgetPart _nested_goals_list_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
-		NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_GOALS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_BROWN, WID_GOAL_CAPTION), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_SHADEBOX, COLOUR_BROWN),
 		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
@@ -272,9 +285,11 @@ static WindowDesc _goals_list_desc(
 	_nested_goals_list_widgets, lengthof(_nested_goals_list_widgets)
 );
 
-void ShowGoalsList()
+void ShowGoalsList(CompanyID company)
 {
-	AllocateWindowDescFront<GoalListWindow>(&_goals_list_desc, 0);
+	if (!Company::IsValidID(company)) company = (CompanyID)INVALID_COMPANY;
+
+	AllocateWindowDescFront<GoalListWindow>(&_goals_list_desc, company);
 }
 
 
diff --git a/src/gui.h b/src/gui.h
index 6ef8261a0..39f1ea661 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -51,7 +51,7 @@ void ShowTownDirectory();
 void ShowIndustryDirectory();
 void ShowIndustryCargoesWindow();
 void ShowSubsidiesList();
-void ShowGoalsList();
+void ShowGoalsList(CompanyID company);
 void ShowGoalQuestion(uint16 id, byte type, uint32 button_mask, const char *question);
 void ShowStoryBook(CompanyID company, uint16 page_id = INVALID_STORY_PAGE);
 
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 561da1461..6c094f24f 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2930,10 +2930,12 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW}Buy 1 y
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}Cost: {CURRENCY_LONG}
 
 # Goal window
-STR_GOALS_CAPTION                                               :{WHITE}Goals
+STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Goals
+STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Global Goals
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Global goals:
 STR_GOALS_TEXT                                                  :{ORANGE}{RAW_STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- None -
+STR_GOALS_SPECTATOR_NONE                                        :{ORANGE}- Not applicable -
 STR_GOALS_PROGRESS                                              :{ORANGE}{RAW_STRING}
 STR_GOALS_PROGRESS_COMPLETE                                     :{GREEN}{RAW_STRING}
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Company goals:
diff --git a/src/script/api/script_window.hpp b/src/script/api/script_window.hpp
index 1fc52a0fa..3c729e50e 100644
--- a/src/script/api/script_window.hpp
+++ b/src/script/api/script_window.hpp
@@ -1339,6 +1339,7 @@ public:
 	/* automatically generated from ../../widgets/goal_widget.h */
 	/** Widgets of the #GoalListWindow class. */
 	enum GoalListWidgets {
+		WID_GOAL_CAPTION                             = ::WID_GOAL_CAPTION,                             ///< Caption of the window.
 		WID_GOAL_GOAL                                = ::WID_GOAL_GOAL,                                ///< Goal text column of the goal list.
 		WID_GOAL_PROGRESS                            = ::WID_GOAL_PROGRESS,                            ///< Goal progress column of the goal list.
 		WID_GOAL_SCROLLBAR                           = ::WID_GOAL_SCROLLBAR,                           ///< Scrollbar of the goal list.
diff --git a/src/story_gui.cpp b/src/story_gui.cpp
index 5c9b0c9ed..63e5b66bf 100644
--- a/src/story_gui.cpp
+++ b/src/story_gui.cpp
@@ -405,7 +405,7 @@ protected:
 				break;
 
 			case SPET_GOAL:
-				ShowGoalsList();
+				ShowGoalsList((CompanyID)this->window_number);
 				break;
 
 			default:
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index d5e7d7f4e..e506bfc3e 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -655,7 +655,7 @@ static CallBackFunction ToolbarLeagueClick(Window *w)
 static CallBackFunction MenuClickLeague(int index)
 {
 	switch (index) {
-		case 0: ShowGoalsList();               break;
+		case 0: ShowGoalsList(_local_company); break;
 		case 1: ShowStoryBook(_local_company); break;
 		case 2: ShowCompanyLeagueTable();      break;
 		case 3: ShowPerformanceRatingDetail(); break;
diff --git a/src/widgets/goal_widget.h b/src/widgets/goal_widget.h
index 3ad726785..56f621f0f 100644
--- a/src/widgets/goal_widget.h
+++ b/src/widgets/goal_widget.h
@@ -15,6 +15,7 @@
 
 /** Widgets of the #GoalListWindow class. */
 enum GoalListWidgets {
+	WID_GOAL_CAPTION,   ///< Caption of the window.
 	WID_GOAL_GOAL,      ///< Goal text column of the goal list.
 	WID_GOAL_PROGRESS,  ///< Goal progress column of the goal list.
 	WID_GOAL_SCROLLBAR, ///< Scrollbar of the goal list.