mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r11761) -Codechange: Use appropriate variable types for NewGRF engine overrides, and adjust scope while there.

This commit is contained in:
peter1138 2008-01-05 15:39:22 +00:00
parent 7302d8c88b
commit 5d837282ee
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf.cpp
View File

@ -2772,8 +2772,8 @@ static CargoID TranslateCargo(uint8 feature, uint8 ctype)
static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount, uint8 cidcount, bool wagover) static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount, uint8 cidcount, bool wagover)
{ {
static byte *last_engines; static EngineID *last_engines;
static int last_engines_count; static uint last_engines_count;
if (!wagover) { if (!wagover) {
if (last_engines_count != idcount) { if (last_engines_count != idcount) {

32
src/newgrf_engine.cpp
View File

@ -26,20 +26,20 @@ int _traininfo_vehicle_pitch = 0;
int _traininfo_vehicle_width = 29; int _traininfo_vehicle_width = 29;
struct WagonOverride { struct WagonOverride {
byte *train_id; EngineID *train_id;
int trains; uint trains;
CargoID cargo; CargoID cargo;
const SpriteGroup *group; const SpriteGroup *group;
}; };
struct WagonOverrides { struct WagonOverrides {
int overrides_count; uint overrides_count;
WagonOverride *overrides; WagonOverride *overrides;
}; };
static WagonOverrides _engine_wagon_overrides[TOTAL_NUM_ENGINES]; static WagonOverrides _engine_wagon_overrides[TOTAL_NUM_ENGINES];
void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup *group, byte *train_id, int trains) void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup *group, EngineID *train_id, uint trains)
{ {
WagonOverrides *wos; WagonOverrides *wos;
WagonOverride *wo; WagonOverride *wo;
@ -58,11 +58,11 @@ void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup *
wo->group = group; wo->group = group;
wo->cargo = cargo; wo->cargo = cargo;
wo->trains = trains; wo->trains = trains;
wo->train_id = MallocT<byte>(trains); wo->train_id = MallocT<EngineID>(trains);
memcpy(wo->train_id, train_id, trains); memcpy(wo->train_id, train_id, trains * sizeof *train_id);
} }
const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byte overriding_engine) const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, EngineID overriding_engine)
{ {
const WagonOverrides *wos = &_engine_wagon_overrides[engine]; const WagonOverrides *wos = &_engine_wagon_overrides[engine];
@ -71,12 +71,12 @@ const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byt
* for O(1). Or O(logMlogN) and searching binary tree or smt. like * for O(1). Or O(logMlogN) and searching binary tree or smt. like
* that. --pasky */ * that. --pasky */
for (int i = 0; i < wos->overrides_count; i++) { for (uint i = 0; i < wos->overrides_count; i++) {
const WagonOverride *wo = &wos->overrides[i]; const WagonOverride *wo = &wos->overrides[i];
if (wo->cargo != cargo && wo->cargo != CT_DEFAULT) continue; if (wo->cargo != cargo && wo->cargo != CT_DEFAULT) continue;
for (int j = 0; j < wo->trains; j++) { for (uint j = 0; j < wo->trains; j++) {
if (wo->train_id[j] == overriding_engine) return wo->group; if (wo->train_id[j] == overriding_engine) return wo->group;
} }
} }
@ -88,16 +88,10 @@ const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byt
*/ */
void UnloadWagonOverrides() void UnloadWagonOverrides()
{ {
WagonOverrides *wos; for (EngineID engine = 0; engine < TOTAL_NUM_ENGINES; engine++) {
WagonOverride *wo; WagonOverrides *wos = &_engine_wagon_overrides[engine];
EngineID engine; for (uint i = 0; i < wos->overrides_count; i++) {
int i; WagonOverride *wo = &wos->overrides[i];
for (engine = 0; engine < TOTAL_NUM_ENGINES; engine++) {
wos = &_engine_wagon_overrides[engine];
for (i = 0; i < wos->overrides_count; i++) {
wo = &wos->overrides[i];
wo->group = NULL;
free(wo->train_id); free(wo->train_id);
} }
free(wos->overrides); free(wos->overrides);

4
src/newgrf_engine.h
View File

@ -13,8 +13,8 @@ extern int _traininfo_vehicle_pitch;
extern int _traininfo_vehicle_width; extern int _traininfo_vehicle_width;
void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group, byte *train_id, int trains); void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group, EngineID *train_id, uint trains);
const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byte overriding_engine); const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, EngineID overriding_engine);
void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGroup *group); void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGroup *group);
void SetRotorOverrideSprites(EngineID engine, const struct SpriteGroup *group); void SetRotorOverrideSprites(EngineID engine, const struct SpriteGroup *group);
SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle* v, Direction direction); SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle* v, Direction direction);