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

(svn r19704) -Codechange: unify the style of GSF enums; now they're plural instead of mixed

release/1.1
rubidium 2010-04-24 11:52:58 +00:00
parent 8aad995e32
commit 3461430a34
4 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/api/ai_rail.cpp
View File

@ -164,7 +164,7 @@
if (station_id != AIStation::STATION_JOIN_ADJACENT) p1 |= (1 << 24); if (station_id != AIStation::STATION_JOIN_ADJACENT) p1 |= (1 << 24);
const GRFFile *file; const GRFFile *file;
uint16 res = GetAiPurchaseCallbackResult(GSF_STATION, cargo_id, 0, source_industry, goal_industry, min(255, distance / 2), AICE_STATION_GET_STATION_ID, source_station ? 0 : 1, min(15, num_platforms) << 4 | min(15, platform_length), &file); uint16 res = GetAiPurchaseCallbackResult(GSF_STATIONS, cargo_id, 0, source_industry, goal_industry, min(255, distance / 2), AICE_STATION_GET_STATION_ID, source_station ? 0 : 1, min(15, num_platforms) << 4 | min(15, platform_length), &file);
uint32 p2 = (AIStation::IsValidStation(station_id) ? station_id : INVALID_STATION) << 16; uint32 p2 = (AIStation::IsValidStation(station_id) ? station_id : INVALID_STATION) << 16;
if (res != CALLBACK_FAILED) { if (res != CALLBACK_FAILED) {
int index = 0; int index = 0;

60
src/newgrf.cpp
View File

@ -3059,16 +3059,16 @@ static void FeatureChangeInfo(ByteReader *buf)
* V new-info new bytes of info (variable size; depends on properties) */ * V new-info new bytes of info (variable size; depends on properties) */
static const VCI_Handler handler[] = { static const VCI_Handler handler[] = {
/* GSF_TRAIN */ RailVehicleChangeInfo, /* GSF_TRAINS */ RailVehicleChangeInfo,
/* GSF_ROAD */ RoadVehicleChangeInfo, /* GSF_ROADVEHICLES */ RoadVehicleChangeInfo,
/* GSF_SHIP */ ShipVehicleChangeInfo, /* GSF_SHIPS */ ShipVehicleChangeInfo,
/* GSF_AIRCRAFT */ AircraftVehicleChangeInfo, /* GSF_AIRCRAFT */ AircraftVehicleChangeInfo,
/* GSF_STATION */ StationChangeInfo, /* GSF_STATIONS */ StationChangeInfo,
/* GSF_CANAL */ CanalChangeInfo, /* GSF_CANALS */ CanalChangeInfo,
/* GSF_BRIDGE */ BridgeChangeInfo, /* GSF_BRIDGES */ BridgeChangeInfo,
/* GSF_TOWNHOUSE */ TownHouseChangeInfo, /* GSF_HOUSES */ TownHouseChangeInfo,
/* GSF_GLOBALVAR */ GlobalVarChangeInfo, /* GSF_GLOBALVAR */ GlobalVarChangeInfo,
/* GSF_INDUSTRYTILES */IndustrytilesChangeInfo, /* GSF_INDUSTRYTILES */ IndustrytilesChangeInfo,
/* GSF_INDUSTRIES */ IndustriesChangeInfo, /* GSF_INDUSTRIES */ IndustriesChangeInfo,
/* GSF_CARGOS */ NULL, // Cargo is handled during reservation /* GSF_CARGOS */ NULL, // Cargo is handled during reservation
/* GSF_SOUNDFX */ SoundEffectChangeInfo, /* GSF_SOUNDFX */ SoundEffectChangeInfo,
@ -3111,7 +3111,7 @@ static void SafeChangeInfo(ByteReader *buf)
uint numinfo = buf->ReadByte(); uint numinfo = buf->ReadByte();
buf->ReadExtendedByte(); // id buf->ReadExtendedByte(); // id
if (feature == GSF_BRIDGE && numprops == 1) { if (feature == GSF_BRIDGES && numprops == 1) {
uint8 prop = buf->ReadByte(); uint8 prop = buf->ReadByte();
/* Bridge property 0x0D is redefinition of sprite layout tables, which /* Bridge property 0x0D is redefinition of sprite layout tables, which
* is considered safe. */ * is considered safe. */
@ -3401,12 +3401,12 @@ static void NewSpriteGroup(ByteReader *buf)
default: default:
{ {
switch (feature) { switch (feature) {
case GSF_TRAIN: case GSF_TRAINS:
case GSF_ROAD: case GSF_ROADVEHICLES:
case GSF_SHIP: case GSF_SHIPS:
case GSF_AIRCRAFT: case GSF_AIRCRAFT:
case GSF_STATION: case GSF_STATIONS:
case GSF_CANAL: case GSF_CANALS:
case GSF_CARGOS: case GSF_CARGOS:
case GSF_AIRPORTS: case GSF_AIRPORTS:
case GSF_RAILTYPES: case GSF_RAILTYPES:
@ -3446,7 +3446,7 @@ static void NewSpriteGroup(ByteReader *buf)
break; break;
} }
case GSF_TOWNHOUSE: case GSF_HOUSES:
case GSF_AIRPORTTILES: case GSF_AIRPORTTILES:
case GSF_INDUSTRYTILES: { case GSF_INDUSTRYTILES: {
byte num_spriteset_ents = _cur_grffile->spriteset_numents; byte num_spriteset_ents = _cur_grffile->spriteset_numents;
@ -3568,7 +3568,7 @@ static void NewSpriteGroup(ByteReader *buf)
static CargoID TranslateCargo(uint8 feature, uint8 ctype) static CargoID TranslateCargo(uint8 feature, uint8 ctype)
{ {
/* Special cargo types for purchase list and stations */ /* Special cargo types for purchase list and stations */
if (feature == GSF_STATION && ctype == 0xFE) return CT_DEFAULT_NA; if (feature == GSF_STATIONS && ctype == 0xFE) return CT_DEFAULT_NA;
if (ctype == 0xFF) return CT_PURCHASE; if (ctype == 0xFF) return CT_PURCHASE;
if (_cur_grffile->cargo_max == 0) { if (_cur_grffile->cargo_max == 0) {
@ -3738,7 +3738,7 @@ static void StationMapSpriteGroup(ByteReader *buf, uint8 idcount)
uint16 groupid = buf->ReadWord(); uint16 groupid = buf->ReadWord();
if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) continue; if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) continue;
ctype = TranslateCargo(GSF_STATION, ctype); ctype = TranslateCargo(GSF_STATIONS, ctype);
if (ctype == CT_INVALID) continue; if (ctype == CT_INVALID) continue;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
@ -4028,22 +4028,22 @@ static void FeatureMapSpriteGroup(ByteReader *buf)
grfmsg(6, "FeatureMapSpriteGroup: Feature %d, %d ids", feature, idcount); grfmsg(6, "FeatureMapSpriteGroup: Feature %d, %d ids", feature, idcount);
switch (feature) { switch (feature) {
case GSF_TRAIN: case GSF_TRAINS:
case GSF_ROAD: case GSF_ROADVEHICLES:
case GSF_SHIP: case GSF_SHIPS:
case GSF_AIRCRAFT: case GSF_AIRCRAFT:
VehicleMapSpriteGroup(buf, feature, idcount); VehicleMapSpriteGroup(buf, feature, idcount);
return; return;
case GSF_CANAL: case GSF_CANALS:
CanalMapSpriteGroup(buf, idcount); CanalMapSpriteGroup(buf, idcount);
return; return;
case GSF_STATION: case GSF_STATIONS:
StationMapSpriteGroup(buf, idcount); StationMapSpriteGroup(buf, idcount);
return; return;
case GSF_TOWNHOUSE: case GSF_HOUSES:
TownHouseMapSpriteGroup(buf, idcount); TownHouseMapSpriteGroup(buf, idcount);
return; return;
@ -4123,9 +4123,9 @@ static void FeatureNewName(ByteReader *buf)
grfmsg(8, "FeatureNewName: 0x%04X <- %s", id, name); grfmsg(8, "FeatureNewName: 0x%04X <- %s", id, name);
switch (feature) { switch (feature) {
case GSF_TRAIN: case GSF_TRAINS:
case GSF_ROAD: case GSF_ROADVEHICLES:
case GSF_SHIP: case GSF_SHIPS:
case GSF_AIRCRAFT: case GSF_AIRCRAFT:
if (!generic) { if (!generic) {
Engine *e = GetNewEngine(_cur_grffile, (VehicleType)feature, id, HasBit(_cur_grfconfig->flags, GCF_STATIC)); Engine *e = GetNewEngine(_cur_grffile, (VehicleType)feature, id, HasBit(_cur_grfconfig->flags, GCF_STATIC));
@ -4142,7 +4142,7 @@ static void FeatureNewName(ByteReader *buf)
break; break;
} }
case GSF_TOWNHOUSE: case GSF_HOUSES:
default: default:
switch (GB(id, 8, 8)) { switch (GB(id, 8, 8)) {
case 0xC4: // Station class name case 0xC4: // Station class name
@ -4193,8 +4193,8 @@ static void FeatureNewName(ByteReader *buf)
break; break;
#if 0 #if 0
case GSF_CANAL : case GSF_CANALS:
case GSF_BRIDGE : case GSF_BRIDGES:
AddGRFString(_cur_spriteid, id, lang, name); AddGRFString(_cur_spriteid, id, lang, name);
switch (GB(id, 8, 8)) { switch (GB(id, 8, 8)) {
case 0xC9: // House name case 0xC9: // House name
@ -6839,7 +6839,7 @@ static void ActivateOldShore()
static void FinalisePriceBaseMultipliers() static void FinalisePriceBaseMultipliers()
{ {
extern const PriceBaseSpec _price_base_specs[]; extern const PriceBaseSpec _price_base_specs[];
static const uint32 override_features = (1 << GSF_TRAIN) | (1 << GSF_ROAD) | (1 << GSF_SHIP) | (1 << GSF_AIRCRAFT); static const uint32 override_features = (1 << GSF_TRAINS) | (1 << GSF_ROADVEHICLES) | (1 << GSF_SHIPS) | (1 << GSF_AIRCRAFT);
/* Evaluate grf overrides */ /* Evaluate grf overrides */
int num_grfs = _grf_files.Length(); int num_grfs = _grf_files.Length();

14
src/newgrf.h
View File

@ -41,14 +41,14 @@ enum GrfMiscBit {
}; };
enum GrfSpecFeature { enum GrfSpecFeature {
GSF_TRAIN, GSF_TRAINS,
GSF_ROAD, GSF_ROADVEHICLES,
GSF_SHIP, GSF_SHIPS,
GSF_AIRCRAFT, GSF_AIRCRAFT,
GSF_STATION, GSF_STATIONS,
GSF_CANAL, GSF_CANALS,
GSF_BRIDGE, GSF_BRIDGES,
GSF_TOWNHOUSE, GSF_HOUSES,
GSF_GLOBALVAR, GSF_GLOBALVAR,
GSF_INDUSTRYTILES, GSF_INDUSTRYTILES,
GSF_INDUSTRIES, GSF_INDUSTRIES,

18
src/table/pricebase.h
View File

@ -25,11 +25,11 @@ extern const PriceBaseSpec _price_base_specs[] = {
{ 200, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_STATION_BUS { 200, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_STATION_BUS
{ 200, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_STATION_TRUCK { 200, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_STATION_TRUCK
{ 350, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_STATION_DOCK { 350, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_STATION_DOCK
{ 400000, PCAT_CONSTRUCTION, GSF_TRAIN, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_TRAIN { 400000, PCAT_CONSTRUCTION, GSF_TRAINS, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_TRAIN
{ 2000, PCAT_CONSTRUCTION, GSF_TRAIN, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_WAGON { 2000, PCAT_CONSTRUCTION, GSF_TRAINS, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_WAGON
{ 700000, PCAT_CONSTRUCTION, GSF_AIRCRAFT, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_AIRCRAFT { 700000, PCAT_CONSTRUCTION, GSF_AIRCRAFT, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_AIRCRAFT
{ 14000, PCAT_CONSTRUCTION, GSF_ROAD, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_ROAD { 14000, PCAT_CONSTRUCTION, GSF_ROADVEHICLES, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_ROAD
{ 65000, PCAT_CONSTRUCTION, GSF_SHIP, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_SHIP { 65000, PCAT_CONSTRUCTION, GSF_SHIPS, INVALID_PRICE }, ///< PR_BUILD_VEHICLE_SHIP
{ 20, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_TREES { 20, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_TREES
{ 250, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_TERRAFORM { 250, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_TERRAFORM
{ 20, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_GRASS { 20, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_GRASS
@ -52,12 +52,12 @@ extern const PriceBaseSpec _price_base_specs[] = {
{ 55, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_STATION_DOCK { 55, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_STATION_DOCK
{ 1600, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_HOUSE { 1600, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_HOUSE
{ 40, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_ROAD { 40, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_CLEAR_ROAD
{ 5600, PCAT_RUNNING, GSF_TRAIN, INVALID_PRICE }, ///< PR_RUNNING_TRAIN_STEAM { 5600, PCAT_RUNNING, GSF_TRAINS, INVALID_PRICE }, ///< PR_RUNNING_TRAIN_STEAM
{ 5200, PCAT_RUNNING, GSF_TRAIN, INVALID_PRICE }, ///< PR_RUNNING_TRAIN_DIESEL { 5200, PCAT_RUNNING, GSF_TRAINS, INVALID_PRICE }, ///< PR_RUNNING_TRAIN_DIESEL
{ 4800, PCAT_RUNNING, GSF_TRAIN, INVALID_PRICE }, ///< PR_RUNNING_TRAIN_ELECTRIC { 4800, PCAT_RUNNING, GSF_TRAINS, INVALID_PRICE }, ///< PR_RUNNING_TRAIN_ELECTRIC
{ 9600, PCAT_RUNNING, GSF_AIRCRAFT, INVALID_PRICE }, ///< PR_RUNNING_AIRCRAFT { 9600, PCAT_RUNNING, GSF_AIRCRAFT, INVALID_PRICE }, ///< PR_RUNNING_AIRCRAFT
{ 1600, PCAT_RUNNING, GSF_ROAD, INVALID_PRICE }, ///< PR_RUNNING_ROADVEH { 1600, PCAT_RUNNING, GSF_ROADVEHICLES, INVALID_PRICE }, ///< PR_RUNNING_ROADVEH
{ 5600, PCAT_RUNNING, GSF_SHIP, INVALID_PRICE }, ///< PR_RUNNING_SHIP { 5600, PCAT_RUNNING, GSF_SHIPS, INVALID_PRICE }, ///< PR_RUNNING_SHIP
{1000000, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_INDUSTRY {1000000, PCAT_CONSTRUCTION, GSF_END, INVALID_PRICE }, ///< PR_BUILD_INDUSTRY
{ 1600, PCAT_CONSTRUCTION, GSF_END, PR_CLEAR_HOUSE }, ///< PR_CLEAR_INDUSTRY { 1600, PCAT_CONSTRUCTION, GSF_END, PR_CLEAR_HOUSE }, ///< PR_CLEAR_INDUSTRY
{ 40, PCAT_CONSTRUCTION, GSF_END, PR_CLEAR_ROUGH }, ///< PR_BUILD_UNMOVABLE { 40, PCAT_CONSTRUCTION, GSF_END, PR_CLEAR_ROUGH }, ///< PR_BUILD_UNMOVABLE