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

(svn r1701) Style police ^^

release/0.4.5
tron 2005-01-27 21:18:03 +00:00
parent 99338d278d
commit 3e0dcfd47f
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aircraft_cmd.c
View File

@ -161,7 +161,7 @@ int32 CmdBuildAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
const AircraftVehicleInfo *avi = AircraftVehInfo(p1); const AircraftVehicleInfo *avi = AircraftVehInfo(p1);
Engine *e; Engine *e;
if (!(IsEngineBuildable(p1, VEH_Aircraft))) return CMD_ERROR; if (!IsEngineBuildable(p1, VEH_Aircraft)) return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);

15
engine.c
View File

@ -906,17 +906,20 @@ const ChunkHandler _engine_chunk_handlers[] = {
{ 'ENGS', LoadSave_ENGS, LoadSave_ENGS, CH_RIFF | CH_LAST}, { 'ENGS', LoadSave_ENGS, LoadSave_ENGS, CH_RIFF | CH_LAST},
}; };
/* /*
* returns true if an engine is valid, and it is of the specified type, and buildable by the current player, false otherwise * returns true if an engine is valid, of the specified type, and buildable by
* the current player, false otherwise
* *
* engine = index of the engine to check * engine = index of the engine to check
* type = the type the engine should be of (VEH_xxx) * type = the type the engine should be of (VEH_xxx)
*/ */
bool IsEngineBuildable(int engine, byte type) { bool IsEngineBuildable(uint engine, byte type)
Engine *e; {
const Engine *e;
// check if it's an engine that is in the engine array // check if it's an engine that is in the engine array
if (0 > engine || engine >= TOTAL_NUM_ENGINES ) return false; if (engine >= TOTAL_NUM_ENGINES) return false;
e = DEREF_ENGINE(engine); e = DEREF_ENGINE(engine);
@ -928,7 +931,3 @@ bool IsEngineBuildable(int engine, byte type) {
return true; return true;
} }

2
engine.h
View File

@ -133,7 +133,7 @@ void AcceptEnginePreview(Engine *e, int player);
void LoadCustomEngineNames(void); void LoadCustomEngineNames(void);
void DeleteCustomEngineNames(void); void DeleteCustomEngineNames(void);
bool IsEngineBuildable(int engine, byte type); bool IsEngineBuildable(uint engine, byte type);
enum { enum {
NUM_NORMAL_RAIL_ENGINES = 54, NUM_NORMAL_RAIL_ENGINES = 54,

2
roadveh_cmd.c
View File

@ -115,7 +115,7 @@ int32 CmdBuildRoadVeh(int x, int y, uint32 flags, uint32 p1, uint32 p2)
uint tile = TILE_FROM_XY(x,y); uint tile = TILE_FROM_XY(x,y);
Engine *e; Engine *e;
if (!(IsEngineBuildable(p1, VEH_Road))) return CMD_ERROR; if (!IsEngineBuildable(p1, VEH_Road)) return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);

2
ship_cmd.c
View File

@ -816,7 +816,7 @@ int32 CmdBuildShip(int x, int y, uint32 flags, uint32 p1, uint32 p2)
uint tile = TILE_FROM_XY(x,y); uint tile = TILE_FROM_XY(x,y);
Engine *e; Engine *e;
if (!(IsEngineBuildable(p1, VEH_Ship))) return CMD_ERROR; if (!IsEngineBuildable(p1, VEH_Ship)) return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);

2
train_cmd.c
View File

@ -525,7 +525,7 @@ int32 CmdBuildRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
Engine *e; Engine *e;
uint tile; uint tile;
if (!(IsEngineBuildable(p1, VEH_Train))) return CMD_ERROR; if (!IsEngineBuildable(p1, VEH_Train)) return CMD_ERROR;
_cmd_build_rail_veh_var1 = 0; _cmd_build_rail_veh_var1 = 0;