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

(svn r26382) -Fix [FS#5932] (r25372): All goal commands invalidated the goal list of company 0.

release/1.4
frosch 2014-02-27 21:53:14 +00:00
parent 34cd77dcf5
commit 20970da24a
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/goal.cpp
View File

@ -92,7 +92,11 @@ CommandCost CmdCreateGoal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
g->progress = NULL; g->progress = NULL;
g->completed = false; g->completed = false;
InvalidateWindowData(WC_GOALS_LIST, 0); if (g->company == INVALID_COMPANY) {
InvalidateWindowClassesData(WC_GOALS_LIST);
} else {
InvalidateWindowData(WC_GOALS_LIST, g->company);
}
if (Goal::GetNumItems() == 1) InvalidateWindowData(WC_MAIN_TOOLBAR, 0); if (Goal::GetNumItems() == 1) InvalidateWindowData(WC_MAIN_TOOLBAR, 0);
_new_goal_id = g->index; _new_goal_id = g->index;
@ -117,9 +121,14 @@ CommandCost CmdRemoveGoal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
Goal *g = Goal::Get(p1); Goal *g = Goal::Get(p1);
CompanyID c = g->company;
delete g; delete g;
InvalidateWindowData(WC_GOALS_LIST, 0); if (c == INVALID_COMPANY) {
InvalidateWindowClassesData(WC_GOALS_LIST);
} else {
InvalidateWindowData(WC_GOALS_LIST, c);
}
if (Goal::GetNumItems() == 0) InvalidateWindowData(WC_MAIN_TOOLBAR, 0); if (Goal::GetNumItems() == 0) InvalidateWindowData(WC_MAIN_TOOLBAR, 0);
} }
@ -146,7 +155,11 @@ CommandCost CmdSetGoalText(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
free(g->text); free(g->text);
g->text = strdup(text); g->text = strdup(text);
InvalidateWindowData(WC_GOALS_LIST, 0); if (g->company == INVALID_COMPANY) {
InvalidateWindowClassesData(WC_GOALS_LIST);
} else {
InvalidateWindowData(WC_GOALS_LIST, g->company);
}
} }
return CommandCost(); return CommandCost();
@ -175,7 +188,11 @@ CommandCost CmdSetGoalProgress(TileIndex tile, DoCommandFlag flags, uint32 p1, u
g->progress = strdup(text); g->progress = strdup(text);
} }
InvalidateWindowData(WC_GOALS_LIST, 0); if (g->company == INVALID_COMPANY) {
InvalidateWindowClassesData(WC_GOALS_LIST);
} else {
InvalidateWindowData(WC_GOALS_LIST, g->company);
}
} }
return CommandCost(); return CommandCost();
@ -199,7 +216,11 @@ CommandCost CmdSetGoalCompleted(TileIndex tile, DoCommandFlag flags, uint32 p1,
Goal *g = Goal::Get(p1); Goal *g = Goal::Get(p1);
g->completed = p2 == 1; g->completed = p2 == 1;
InvalidateWindowData(WC_GOALS_LIST, 0); if (g->company == INVALID_COMPANY) {
InvalidateWindowClassesData(WC_GOALS_LIST);
} else {
InvalidateWindowData(WC_GOALS_LIST, g->company);
}
} }
return CommandCost(); return CommandCost();