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

(svn r3051) Remove the unused function RemoteSubsidyAdd()

release/0.4.5
tron 2005-10-16 14:07:11 +00:00
parent b537cc6618
commit 0834a88a12
5 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ai/default/default.c
View File

@ -133,12 +133,16 @@ static int AiChooseTrainToBuild(byte railtype, int32 money, byte flag, TileIndex
const RailVehicleInfo *rvi = RailVehInfo(i); const RailVehicleInfo *rvi = RailVehInfo(i);
const Engine* e = GetEngine(i); const Engine* e = GetEngine(i);
if (e->railtype != railtype || rvi->flags & RVI_WAGON if (e->railtype != railtype ||
|| !HASBIT(e->player_avail, _current_player) || e->reliability < 0x8A3D) rvi->flags & RVI_WAGON ||
(rvi->flags & RVI_MULTIHEAD && flag & 1) ||
!HASBIT(e->player_avail, _current_player) ||
e->reliability < 0x8A3D) {
continue; continue;
}
ret = DoCommandByTile(tile, i, 0, 0, CMD_BUILD_RAIL_VEHICLE); ret = DoCommandByTile(tile, i, 0, 0, CMD_BUILD_RAIL_VEHICLE);
if (!CmdFailed(ret) && (!(_cmd_build_rail_veh_var1&1) || !(flag&1)) && ret <= money && if (!CmdFailed(ret) && ret <= money &&
_cmd_build_rail_veh_score >= best_veh_score) { _cmd_build_rail_veh_score >= best_veh_score) {
best_veh_score = _cmd_build_rail_veh_score; best_veh_score = _cmd_build_rail_veh_score;
best_veh_index = i; best_veh_index = i;

17
economy.c
View File

@ -1000,23 +1000,6 @@ static bool CheckSubsidyDuplicate(Subsidy *s)
return false; return false;
} }
void RemoteSubsidyAdd(Subsidy *s_new)
{
Subsidy *s;
Pair pair;
// search the first free subsidy
for(s=_subsidies; s != endof(_subsidies); s++)
if (s->cargo_type == CT_INVALID)
break;
memcpy(s,s_new,sizeof(Subsidy));
pair = SetupSubsidyDecodeParam(s, 0);
AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b);
InvalidateWindow(WC_SUBSIDIES_LIST, 0);
}
static void SubsidyMonthlyHandler(void) static void SubsidyMonthlyHandler(void)
{ {

1
economy.h
View File

@ -63,7 +63,6 @@ VARDEF Subsidy _subsidies[MAX_PLAYERS];
Pair SetupSubsidyDecodeParam(Subsidy *s, bool mode); Pair SetupSubsidyDecodeParam(Subsidy *s, bool mode);
void DeleteSubsidyWithIndustry(uint16 index); void DeleteSubsidyWithIndustry(uint16 index);
void DeleteSubsidyWithStation(uint16 index); void DeleteSubsidyWithStation(uint16 index);
void RemoteSubsidyAdd(Subsidy *s_new);
int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, byte cargo_type); int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, byte cargo_type);
uint MoveGoodsToStation(TileIndex tile, int w, int h, int type, uint amount); uint MoveGoodsToStation(TileIndex tile, int w, int h, int type, uint amount);

21
train_cmd.c
View File

@ -498,24 +498,6 @@ static void NormalizeTrainVehInDepot(Vehicle *u)
} }
} }
static const byte _railveh_unk1[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 1, 0, 0, 0,
0, 0, 0, 0, 1, 0, 1, 0,
0, 1, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0,
};
static const byte _railveh_score[] = { static const byte _railveh_score[] = {
1, 4, 7, 19, 20, 30, 31, 19, 1, 4, 7, 19, 20, 30, 31, 19,
20, 21, 22, 10, 11, 30, 31, 32, 20, 21, 22, 10, 11, 30, 31, 32,
@ -590,8 +572,6 @@ int32 CmdBuildRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (!IsTileOwner(tile, _current_player)) return CMD_ERROR; if (!IsTileOwner(tile, _current_player)) return CMD_ERROR;
} }
_cmd_build_rail_veh_var1 = 0;
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
rvi = RailVehInfo(p1); rvi = RailVehInfo(p1);
@ -676,7 +656,6 @@ int32 CmdBuildRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
InvalidateWindow(WC_COMPANY, v->owner); InvalidateWindow(WC_COMPANY, v->owner);
} }
} }
_cmd_build_rail_veh_var1 = _railveh_unk1[p1];
_cmd_build_rail_veh_score = _railveh_score[p1]; _cmd_build_rail_veh_score = _railveh_score[p1];
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); // updates the replace Train window InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); // updates the replace Train window

1
vehicle.h
View File

@ -447,7 +447,6 @@ VARDEF VehicleID _new_ship_id;
VARDEF VehicleID _new_roadveh_id; VARDEF VehicleID _new_roadveh_id;
VARDEF uint16 _aircraft_refit_capacity; VARDEF uint16 _aircraft_refit_capacity;
VARDEF byte _cmd_build_rail_veh_score; VARDEF byte _cmd_build_rail_veh_score;
VARDEF byte _cmd_build_rail_veh_var1;
// for each player, for each vehicle type, keep a list of the vehicles. // for each player, for each vehicle type, keep a list of the vehicles.
//VARDEF Vehicle *_vehicle_arr[8][4]; //VARDEF Vehicle *_vehicle_arr[8][4];