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

(svn r3366) Make an unnecessarily global variable local

release/0.4.5
tron 2006-01-05 16:51:10 +00:00
parent e272b03fee
commit 5ac1a89f92
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openttd.c
View File

@ -231,7 +231,6 @@ static void InitializeDynamicVariables(void)
{ {
/* Dynamic stuff needs to be initialized somewhere... */ /* Dynamic stuff needs to be initialized somewhere... */
_station_sort = NULL; _station_sort = NULL;
_vehicle_sort = NULL;
_town_sort = NULL; _town_sort = NULL;
_industry_sort = NULL; _industry_sort = NULL;
} }
@ -247,7 +246,6 @@ static void UnInitializeDynamicVariables(void)
CleanPool(&_order_pool); CleanPool(&_order_pool);
free(_station_sort); free(_station_sort);
free(_vehicle_sort);
free(_town_sort); free(_town_sort);
free(_industry_sort); free(_industry_sort);
} }

3
vehicle.h
View File

@ -341,9 +341,6 @@ byte GetDirectionTowards(const Vehicle *v, int x, int y);
#define BEGIN_ENUM_WAGONS(v) do { #define BEGIN_ENUM_WAGONS(v) do {
#define END_ENUM_WAGONS(v) } while ( (v=v->next) != NULL); #define END_ENUM_WAGONS(v) } while ( (v=v->next) != NULL);
/* vehicle.c */
VARDEF SortStruct *_vehicle_sort;
extern MemoryPool _vehicle_pool; extern MemoryPool _vehicle_pool;
/** /**

17
vehicle_gui.c
View File

@ -106,15 +106,15 @@ void ResortVehicleLists(void)
void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID station) void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID station)
{ {
SortStruct* sort_list;
uint subtype = (type != VEH_Aircraft) ? Train_Front : 2; uint subtype = (type != VEH_Aircraft) ? Train_Front : 2;
uint n = 0; uint n = 0;
uint i; uint i;
if (!(vl->flags & VL_REBUILD)) return; if (!(vl->flags & VL_REBUILD)) return;
/* Create array for sorting */ sort_list = malloc(GetVehiclePoolSize() * sizeof(sort_list[0]));
_vehicle_sort = realloc(_vehicle_sort, GetVehiclePoolSize() * sizeof(_vehicle_sort[0])); if (sort_list == NULL)
if (_vehicle_sort == NULL)
error("Could not allocate memory for the vehicle-sorting-list"); error("Could not allocate memory for the vehicle-sorting-list");
DEBUG(misc, 1) ("Building vehicle list for player %d station %d...", DEBUG(misc, 1) ("Building vehicle list for player %d station %d...",
@ -130,8 +130,8 @@ void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID sta
FOR_VEHICLE_ORDERS(v, order) { FOR_VEHICLE_ORDERS(v, order) {
if (order->type == OT_GOTO_STATION && order->station == station) { if (order->type == OT_GOTO_STATION && order->station == station) {
_vehicle_sort[n].index = v->index; sort_list[n].index = v->index;
_vehicle_sort[n].owner = v->owner; sort_list[n].owner = v->owner;
++n; ++n;
break; break;
} }
@ -144,8 +144,8 @@ void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID sta
if (v->type == type && v->owner == owner && ( if (v->type == type && v->owner == owner && (
(type == VEH_Train && IsFrontEngine(v)) || (type == VEH_Train && IsFrontEngine(v)) ||
(type != VEH_Train && v->subtype <= subtype))) { (type != VEH_Train && v->subtype <= subtype))) {
_vehicle_sort[n].index = v->index; sort_list[n].index = v->index;
_vehicle_sort[n].owner = v->owner; sort_list[n].owner = v->owner;
++n; ++n;
} }
} }
@ -157,7 +157,8 @@ void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID sta
error("Could not allocate memory for the vehicle-sorting-list"); error("Could not allocate memory for the vehicle-sorting-list");
vl->list_length = n; vl->list_length = n;
for (i = 0; i < n; ++i) vl->sort_list[i] = _vehicle_sort[i]; for (i = 0; i < n; ++i) vl->sort_list[i] = sort_list[i];
free(sort_list);
vl->flags &= ~VL_REBUILD; vl->flags &= ~VL_REBUILD;
vl->flags |= VL_RESORT; vl->flags |= VL_RESORT;