Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20390) -Codechange: Move company vehicle counting to vehicle.cpp.

Browse Source
This commit is contained in:
alberth 2010-08-06 19:56:14 +00:00
parent 75f6f6eb0b
commit 2157341f90
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/company_gui.cpp
View File

@ -20,7 +20,7 @@
#include "network/network_gui.h"
#include "network/network_func.h"
#include "economy_func.h"
#include "vehicle_base.h"
#include "vehicle_func.h"
#include "newgrf.h"
#include "company_manager_face.h"
#include "strings_func.h"
@ -1852,19 +1852,10 @@ struct CompanyWindow : Window
break;
case CW_WIDGET_DESC_VEHICLE_COUNTS: {
uint amounts[] = { 0, 0, 0, 0 };
uint amounts[4];
CountCompanyVehicles((CompanyID)this->window_number, amounts);
int y = r.top;
const Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->owner == c->index) {
if (v->IsPrimaryVehicle()) {
assert((size_t)v->type < lengthof(amounts));
amounts[v->type]++;
}
}
}
if (amounts[0] + amounts[1] + amounts[2] + amounts[3] == 0) {
DrawString(r.left, r.right, y, STR_COMPANY_VIEW_VEHICLES_NONE);
} else {

15
src/vehicle.cpp
View File

@ -592,6 +592,21 @@ uint CountVehiclesInChain(const Vehicle *v)
return count;
}
/**
* Count the number of vehicles of a company.
* @param c Company owning the vehicles.
* @param [out] counts Array of counts. Contains the vehicle count ordered by type afterwards.
*/
void CountCompanyVehicles(CompanyID cid, uint counts[4])
{
for (uint i = 0; i < 4; i++) counts[i] = 0;
const Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->owner == cid && v->IsPrimaryVehicle()) counts[v->type]++;
}
}
/**
* Check if a vehicle is counted in num_engines in each company struct
* @return true if the vehicle is counted in num_engines

1
src/vehicle_func.h
View File

@ -30,6 +30,7 @@ typedef Vehicle *VehicleFromPosProc(Vehicle *v, void *data);
void VehicleServiceInDepot(Vehicle *v);
uint CountVehiclesInChain(const Vehicle *v);
void CountCompanyVehicles(CompanyID cid, uint counts[4]);
void FindVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
void FindVehicleOnPosXY(int x, int y, void *data, VehicleFromPosProc *proc);
bool HasVehicleOnPos(TileIndex tile, void *data, VehicleFromPosProc *proc);