Mercurial > hg > openttd

comparison src/economy.cpp @ 9158:3247358e983f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13021) -Codechange: free data_b for other uses when it is not used to store a second tile to skip to (in news messages). Patch by cirdan.
author rubidium <rubidium@openttd.org>
date Thu, 08 May 2008 22:53:49 +0000
parents 453c3d26f4bc
children dbe675dc54c4
comparison
equal deleted inserted replaced
9157:5181be8c3133 9158:3247358e983f
1140 for (s = _subsidies; s != endof(_subsidies); s++) { 1140 for (s = _subsidies; s != endof(_subsidies); s++) {
1141 if (s->cargo_type == CT_INVALID) continue; 1141 if (s->cargo_type == CT_INVALID) continue;
1142 1142
1143 if (s->age == 12-1) { 1143 if (s->age == 12-1) {
1144 pair = SetupSubsidyDecodeParam(s, 1); 1144 pair = SetupSubsidyDecodeParam(s, 1);
1145 AddNewsItem(STR_202E_OFFER_OF_SUBSIDY_EXPIRED, NM_NORMAL, NF_TILE, NT_SUBSIDIES, DNC_NONE, pair.a, pair.b); 1145 AddNewsItem(STR_202E_OFFER_OF_SUBSIDY_EXPIRED, NM_NORMAL, NF_TILE | NF_TILE2, NT_SUBSIDIES, DNC_NONE, pair.a, pair.b);
1146 s->cargo_type = CT_INVALID; 1146 s->cargo_type = CT_INVALID;
1147 modified = true; 1147 modified = true;
1148 } else if (s->age == 2*12-1) { 1148 } else if (s->age == 2*12-1) {
1149 st = GetStation(s->to); 1149 st = GetStation(s->to);
1150 if (st->owner == _local_player) { 1150 if (st->owner == _local_player) {
1151 pair = SetupSubsidyDecodeParam(s, 1); 1151 pair = SetupSubsidyDecodeParam(s, 1);
1152 AddNewsItem(STR_202F_SUBSIDY_WITHDRAWN_SERVICE, NM_NORMAL, NF_TILE, NT_SUBSIDIES, DNC_NONE, pair.a, pair.b); 1152 AddNewsItem(STR_202F_SUBSIDY_WITHDRAWN_SERVICE, NM_NORMAL, NF_TILE | NF_TILE2, NT_SUBSIDIES, DNC_NONE, pair.a, pair.b);
1153 } 1153 }
1154 s->cargo_type = CT_INVALID; 1154 s->cargo_type = CT_INVALID;
1155 modified = true; 1155 modified = true;
1156 } else { 1156 } else {
1157 s->age++; 1157 s->age++;
1186 } 1186 }
1187 add_subsidy: 1187 add_subsidy:
1188 if (!CheckSubsidyDuplicate(s)) { 1188 if (!CheckSubsidyDuplicate(s)) {
1189 s->age = 0; 1189 s->age = 0;
1190 pair = SetupSubsidyDecodeParam(s, 0); 1190 pair = SetupSubsidyDecodeParam(s, 0);
1191 AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NM_NORMAL, NF_TILE, NT_SUBSIDIES, DNC_NONE, pair.a, pair.b); 1191 AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NM_NORMAL, NF_TILE | NF_TILE2, NT_SUBSIDIES, DNC_NONE, pair.a, pair.b);
1192 modified = true; 1192 modified = true;
1193 break; 1193 break;
1194 } 1194 }
1195 } 1195 }
1196 } while (n--); 1196 } while (n--);
1403 InjectDParam(1); 1403 InjectDParam(1);
1404 1404
1405 SetDParam(0, _current_player); 1405 SetDParam(0, _current_player);
1406 AddNewsItem( 1406 AddNewsItem(
1407 STR_2031_SERVICE_SUBSIDY_AWARDED + _opt.diff.subsidy_multiplier, 1407 STR_2031_SERVICE_SUBSIDY_AWARDED + _opt.diff.subsidy_multiplier,
1408 NM_NORMAL, NF_TILE, NT_SUBSIDIES, DNC_NONE, 1408 NM_NORMAL, NF_TILE | NF_TILE2, NT_SUBSIDIES, DNC_NONE,
1409 pair.a, pair.b 1409 pair.a, pair.b
1410 ); 1410 );
1411 1411
1412 InvalidateWindow(WC_SUBSIDIES_LIST, 0); 1412 InvalidateWindow(WC_SUBSIDIES_LIST, 0);
1413 return true; 1413 return true;