openttd updated to 1.5.0-beta2

--HG--
branch : openttd

src/goal_gui.cpp

@@ -1,4 +1,4 @@
-/* $Id: goal_gui.cpp 26012 2013-11-16 17:41:57Z zuu $ */
+/* $Id: goal_gui.cpp 26509 2014-04-25 15:40:32Z rubidium $ */
 
 /*
  * This file is part of OpenTTD.
@@ -23,11 +23,14 @@
 #include "company_base.h"
 #include "story_base.h"
 #include "command_func.h"
+#include "string_func.h"
 
 #include "widgets/goal_widget.h"
 
 #include "table/strings.h"
 
+#include "safeguards.h"
+
 /** Goal list columns. */
 enum GoalColumn {
 	GC_GOAL = 0, ///< Goal text column.
@@ -273,6 +276,8 @@ struct GoalListWindow : public Window {
 	{
 		this->DrawWidgets();
 
+		if (this->IsShaded()) return; // Don't draw anything when the window is shaded.
+
 		/* Calculate progress column width. */
 		uint max_width = 0;
 		Goal *s;
@@ -360,7 +365,7 @@ struct GoalQuestionWindow : public Window {
 	GoalQuestionWindow(WindowDesc *desc, WindowNumber window_number, byte type, uint32 button_mask, const char *question) : Window(desc), type(type)
 	{
 		assert(type < GOAL_QUESTION_TYPE_COUNT);
-		this->question = strdup(question);
+		this->question = stredup(question);
 
 		/* Figure out which buttons we have to enable. */
 		uint bit;