openttd updated to 1.5.0-beta2

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions
+6 -4
View File
@@ -1,4 +1,4 @@
/* $Id: goal.cpp 26382 2014-02-27 21:53:14Z frosch $ */
/* $Id: goal.cpp 26509 2014-04-25 15:40:32Z rubidium $ */
/*
* This file is part of OpenTTD.
@@ -24,6 +24,8 @@
#include "gui.h"
#include "network/network.h"
#include "safeguards.h"
GoalID _new_goal_id;
@@ -88,7 +90,7 @@ CommandCost CmdCreateGoal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
g->type = type;
g->dst = p2;
g->company = company;
g->text = strdup(text);
g->text = stredup(text);
g->progress = NULL;
g->completed = false;
@@ -153,7 +155,7 @@ CommandCost CmdSetGoalText(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
if (flags & DC_EXEC) {
Goal *g = Goal::Get(p1);
free(g->text);
g->text = strdup(text);
g->text = stredup(text);
if (g->company == INVALID_COMPANY) {
InvalidateWindowClassesData(WC_GOALS_LIST);
@@ -185,7 +187,7 @@ CommandCost CmdSetGoalProgress(TileIndex tile, DoCommandFlag flags, uint32 p1, u
if (StrEmpty(text)) {
g->progress = NULL;
} else {
g->progress = strdup(text);
g->progress = stredup(text);
}
if (g->company == INVALID_COMPANY) {