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

(svn r9300) -Codechange: Use cargo's town effect property in the subsidy gui

release/0.6
peter1138 2007-03-18 21:58:03 +00:00
parent f44cbfe1fe
commit f4cad9017e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/subsidy_gui.cpp
View File

@ -13,6 +13,7 @@
#include "economy.h" #include "economy.h"
#include "variables.h" #include "variables.h"
#include "date.h" #include "date.h"
#include "cargotype.h"
static void HandleSubsidyClick(int y) static void HandleSubsidyClick(int y)
{ {
@ -50,22 +51,24 @@ static void HandleSubsidyClick(int y)
handle_click: handle_click:
TownEffect te = GetCargo(s->cargo_type)->town_effect;
/* determine from coordinate for subsidy and try to scroll to it */ /* determine from coordinate for subsidy and try to scroll to it */
offs = s->from; offs = s->from;
if (s->age >= 12) { if (s->age >= 12) {
xy = GetStation(offs)->xy; xy = GetStation(offs)->xy;
} else if (s->cargo_type == CT_PASSENGERS || s->cargo_type == CT_MAIL) { } else if (te == TE_PASSENGERS || te == TE_MAIL) {
xy = GetTown(offs)->xy; xy = GetTown(offs)->xy;
} else { } else {
xy = GetIndustry(offs)->xy; xy = GetIndustry(offs)->xy;
} }
if (!ScrollMainWindowToTile(xy)) { if (!ScrollMainWindowToTile(xy)) {
/* otherwise determine to coordinate for subsidy and scroll to it */ /* otherwise determine to coordinate for subsidy and scroll to it */
offs = s->to; offs = s->to;
if (s->age >= 12) { if (s->age >= 12) {
xy = GetStation(offs)->xy; xy = GetStation(offs)->xy;
} else if (s->cargo_type == CT_PASSENGERS || s->cargo_type == CT_MAIL || s->cargo_type == CT_GOODS || s->cargo_type == CT_FOOD) { } else if (te == TE_PASSENGERS || te == TE_MAIL || te == TE_GOODS || te == TE_FOOD) {
xy = GetTown(offs)->xy; xy = GetTown(offs)->xy;
} else { } else {
xy = GetIndustry(offs)->xy; xy = GetIndustry(offs)->xy;