mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes.
This commit is contained in:
parent
4e66f5a04b
commit
384503e7d3
|
@ -12,7 +12,6 @@
|
|||
#include "../../station_map.h"
|
||||
#include "../../player.h"
|
||||
#include "../../tunnel_map.h"
|
||||
#include "../../vehicle.h"
|
||||
#include "../../engine.h"
|
||||
#include "../../command_func.h"
|
||||
#include "../../town.h"
|
||||
|
@ -26,6 +25,7 @@
|
|||
#include "../../date_func.h"
|
||||
#include "../../tunnelbridge_map.h"
|
||||
#include "../../window_func.h"
|
||||
#include "../../vehicle_func.h"
|
||||
#include "../../functions.h"
|
||||
#include "default.h"
|
||||
|
||||
|
|
|
@ -4,13 +4,14 @@
|
|||
#include "../../openttd.h"
|
||||
#include "../../debug.h"
|
||||
#include "../../road_map.h"
|
||||
#include "../../vehicle.h"
|
||||
#include "../../command_func.h"
|
||||
#include "trolly.h"
|
||||
#include "../../engine.h"
|
||||
#include "../../station.h"
|
||||
#include "../../variables.h"
|
||||
#include "../../bridge.h"
|
||||
#include "../../vehicle_func.h"
|
||||
#include "../../vehicle_base.h"
|
||||
#include "../ai.h"
|
||||
|
||||
// Build HQ
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
#include "../../openttd.h"
|
||||
#include "../../debug.h"
|
||||
#include "../../map_func.h"
|
||||
#include "../../vehicle_base.h"
|
||||
#include "trolly.h"
|
||||
#include "../../vehicle.h"
|
||||
|
||||
int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
|
||||
{
|
||||
|
|
|
@ -31,7 +31,8 @@
|
|||
#include "../../engine.h"
|
||||
#include "../../gui.h"
|
||||
#include "../../depot.h"
|
||||
#include "../../vehicle.h"
|
||||
#include "../../vehicle_base.h"
|
||||
#include "../../vehicle_func.h"
|
||||
#include "../../date_func.h"
|
||||
#include "../ai.h"
|
||||
#include "../../order.h"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#define AIRCRAFT_H
|
||||
|
||||
#include "station_map.h"
|
||||
#include "vehicle.h"
|
||||
#include "vehicle_base.h"
|
||||
#include "engine.h"
|
||||
#include "variables.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "landscape.h"
|
||||
#include "station_map.h"
|
||||
#include "table/strings.h"
|
||||
#include "vehicle.h"
|
||||
#include "timetable.h"
|
||||
#include "depot.h"
|
||||
#include "engine.h"
|
||||
|
@ -32,6 +31,7 @@
|
|||
#include "command_func.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
void Aircraft::UpdateDeltaXY(Direction direction)
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "engine.h"
|
||||
#include "viewport.h"
|
||||
#include "player.h"
|
||||
|
@ -17,6 +16,7 @@
|
|||
#include "vehicle_gui.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/**
|
||||
* Draw the details for the given vehicle at the position (x,y)
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "viewport.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "airport.h"
|
||||
#include "depot.h"
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "vehicle.h"
|
||||
#include "articulated_vehicles.h"
|
||||
#include "engine.h"
|
||||
#include "train.h"
|
||||
#include "roadveh.h"
|
||||
#include "newgrf_callbacks.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
uint CountArticulatedParts(EngineID engine_type, bool purchase_window)
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
#ifndef ARTICULATED_VEHICLES_H
|
||||
#define ARTICULATED_VEHICLES_H
|
||||
|
||||
#include "vehicle_type.h"
|
||||
|
||||
uint CountArticulatedParts(EngineID engine_type, bool purchase_window);
|
||||
void AddArticulatedParts(Vehicle **vl, VehicleType type);
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "order.h"
|
||||
#include "strings_func.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle_func.h"
|
||||
#include "functions.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include "rail.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
static RailType _railtype_selected_in_replace_gui;
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "articulated_vehicles.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "station.h"
|
||||
|
@ -29,6 +28,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
enum BuildVehicleWidgets {
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
#include "industry.h"
|
||||
#include "water_map.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "vehicle.h"
|
||||
#include "functions.h"
|
||||
#include "economy_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/*
|
||||
* In one terraforming command all four corners of a initial tile can be raised/lowered (though this is not available to the player).
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include "settings.h"
|
||||
#include "fios.h"
|
||||
#include "fileio.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "screenshot.h"
|
||||
#include "genworld.h"
|
||||
|
@ -30,6 +29,7 @@
|
|||
#include "functions.h"
|
||||
#include "map_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
// ** scriptfile handling ** //
|
||||
static FILE *_script_file;
|
||||
|
@ -137,19 +137,12 @@ DEF_CONSOLE_CMD(ConResetTile)
|
|||
|
||||
DEF_CONSOLE_CMD(ConStopAllVehicles)
|
||||
{
|
||||
Vehicle* v;
|
||||
if (argc == 0) {
|
||||
IConsoleHelp("Stops all vehicles in the game. For debugging only! Use at your own risk... Usage: 'stopall'");
|
||||
return true;
|
||||
}
|
||||
|
||||
FOR_ALL_VEHICLES(v) {
|
||||
/* Code ripped from CmdStartStopTrain. Can't call it, because of
|
||||
* ownership problems, so we'll duplicate some code, for now */
|
||||
v->vehstatus |= VS_STOPPED;
|
||||
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
|
||||
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
|
||||
}
|
||||
StopAllVehicles();
|
||||
return true;
|
||||
}
|
||||
#endif /* _DEBUG */
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "variables.h"
|
||||
#include "vehicle.h"
|
||||
#include "network/network.h"
|
||||
#include "network/network_data.h"
|
||||
#include "network/network_server.h"
|
||||
|
@ -13,6 +12,7 @@
|
|||
#include "window_func.h"
|
||||
#include "functions.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_base.h"
|
||||
#ifdef DEBUG_DUMP_COMMANDS
|
||||
#include "saveload.h"
|
||||
#endif
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "vehicle.h"
|
||||
#include "depot.h"
|
||||
#include "landscape.h"
|
||||
#include "table/strings.h"
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "depot.h"
|
||||
|
@ -22,6 +21,7 @@
|
|||
#include "spritecache.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/*
|
||||
* Since all depot window sizes aren't the same, we need to modify sizes a little.
|
||||
|
@ -171,14 +171,14 @@ static void DrawVehicleInDepot(Window *w, const Vehicle *v, int x, int y)
|
|||
|
||||
switch (v->type) {
|
||||
case VEH_TRAIN:
|
||||
DrawTrainImage(v, x + 21, sprite_y, w->hscroll.cap + 4, w->hscroll.pos, WP(w, depot_d).sel);
|
||||
DrawTrainImage(v, x + 21, sprite_y, WP(w, depot_d).sel, w->hscroll.cap + 4, w->hscroll.pos);
|
||||
|
||||
/* Number of wagons relative to a standard length wagon (rounded up) */
|
||||
SetDParam(0, (v->u.rail.cached_total_length + 7) / 8);
|
||||
DrawStringRightAligned(w->widget[DEPOT_WIDGET_MATRIX].right - 1, y + 4, STR_TINY_BLACK, TC_FROMSTRING); // Draw the counter
|
||||
break;
|
||||
|
||||
case VEH_ROAD: DrawRoadVehImage( v, x + 24, sprite_y, 1, WP(w, depot_d).sel); break;
|
||||
case VEH_ROAD: DrawRoadVehImage( v, x + 24, sprite_y, WP(w, depot_d).sel, 1); break;
|
||||
case VEH_SHIP: DrawShipImage( v, x + 19, sprite_y - 1, WP(w, depot_d).sel); break;
|
||||
case VEH_AIRCRAFT: {
|
||||
const Sprite *spr = GetSprite(v->GetImage(DIR_W));
|
||||
|
@ -273,7 +273,7 @@ static void DrawDepotWindow(Window *w)
|
|||
const Vehicle *v = WP(w, depot_d).wagon_list[num - WP(w, depot_d).engine_count];
|
||||
const Vehicle *u;
|
||||
|
||||
DrawTrainImage(v, x + 50, y, w->hscroll.cap - 29, 0, WP(w, depot_d).sel);
|
||||
DrawTrainImage(v, x + 50, y, WP(w, depot_d).sel, w->hscroll.cap - 29, 0);
|
||||
DrawString(x, y + 2, STR_8816, TC_FROMSTRING);
|
||||
|
||||
/*Draw the train counter */
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "industry_map.h"
|
||||
#include "station_map.h"
|
||||
#include "table/strings.h"
|
||||
#include "vehicle.h"
|
||||
#include "command_func.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "news.h"
|
||||
|
@ -39,6 +38,8 @@
|
|||
#include "strings_func.h"
|
||||
#include "date_func.h"
|
||||
#include "functions.h"
|
||||
#include "vehicle_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
enum DisasterSubType {
|
||||
ST_Zeppeliner,
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "variables.h"
|
||||
#include "water.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
static void ShowBuildDockStationPicker();
|
||||
static void ShowBuildDocksDepotPicker();
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "news.h"
|
||||
#include "player.h"
|
||||
#include "station.h"
|
||||
#include "vehicle.h"
|
||||
#include "command_func.h"
|
||||
#include "saveload.h"
|
||||
#include "industry.h"
|
||||
|
@ -40,6 +39,7 @@
|
|||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/**
|
||||
* Multiply two integer values and shift the results to right.
|
||||
|
|
|
@ -60,11 +60,11 @@
|
|||
#include "rail_map.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/elrail_data.h"
|
||||
#include "vehicle.h"
|
||||
#include "train.h"
|
||||
#include "rail_gui.h"
|
||||
#include "transparency.h"
|
||||
#include "tunnelbridge_map.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
static inline TLG GetTLG(TileIndex t)
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "engine.h"
|
||||
#include "player.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "news.h"
|
||||
#include "saveload.h"
|
||||
#include "variables.h"
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "player.h"
|
||||
#include "table/strings.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "saveload.h"
|
||||
#include "debug.h"
|
||||
#include "group.h"
|
||||
|
@ -20,6 +19,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/**
|
||||
* Update the num engines of a groupID. Decrease the old one and increase the new one
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "command_func.h"
|
||||
#include "engine.h"
|
||||
#include "vehicle_gui.h"
|
||||
|
@ -21,6 +20,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
struct Sorting {
|
||||
|
@ -473,7 +473,7 @@ static void GroupWndProc(Window *w, WindowEvent *e)
|
|||
|
||||
assert(v->type == gv->vehicle_type && v->owner == owner);
|
||||
|
||||
DrawVehicleImage(v, x + 19, y2 + 6, w->hscroll.cap, 0, gv->vehicle_sel);
|
||||
DrawVehicleImage(v, x + 19, y2 + 6, gv->vehicle_sel, w->hscroll.cap, 0);
|
||||
DrawVehicleProfitButton(v, x, y2 + 13);
|
||||
|
||||
SetDParam(0, v->unitnumber);
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include "command_func.h"
|
||||
#include "industry.h"
|
||||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
#include "news.h"
|
||||
#include "saveload.h"
|
||||
#include "sound.h"
|
||||
|
@ -40,6 +39,7 @@
|
|||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
void ShowIndustryViewWindow(int industry);
|
||||
void BuildOilRig(TileIndex tile);
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "landscape.h"
|
||||
#include "vehicle.h"
|
||||
#include "variables.h"
|
||||
#include "void_map.h"
|
||||
#include "water_map.h"
|
||||
|
@ -24,6 +23,7 @@
|
|||
#include "window_func.h"
|
||||
#include "functions.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
extern const TileTypeProcs
|
||||
_tile_type_clear_procs,
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include "command_func.h"
|
||||
#include "news.h"
|
||||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
#include "console.h"
|
||||
#include "sound.h"
|
||||
#include "network/network.h"
|
||||
|
@ -41,6 +40,7 @@
|
|||
#include "road_gui.h"
|
||||
#include "date_func.h"
|
||||
#include "functions.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
#include "network/network_data.h"
|
||||
#include "network/network_client.h"
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "string.h"
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
#include "vehicle.h"
|
||||
#include "saveload.h"
|
||||
#include "engine.h"
|
||||
#include "vehicle_gui.h"
|
||||
|
@ -26,6 +25,8 @@
|
|||
#include "functions.h"
|
||||
#include "map_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
#include "texteff.hpp"
|
||||
|
||||
char _name_array[512][32];
|
||||
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
#include "livery.h"
|
||||
#include "player_face.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "gfx_func.h"
|
||||
#include "functions.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/** Change the player's face.
|
||||
* @param tile unused
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "network/network.h"
|
||||
#include "string.h"
|
||||
#include "variables.h"
|
||||
#include "vehicle.h"
|
||||
#include "train.h"
|
||||
#include "tgp.h"
|
||||
#include "settings.h"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "../console.h"
|
||||
#include "../command_func.h"
|
||||
#include "../saveload.h"
|
||||
#include "../vehicle.h"
|
||||
#include "../station.h"
|
||||
#include "../variables.h"
|
||||
#include "../genworld.h"
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include "bridge.h"
|
||||
#include "town.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "vehicle.h"
|
||||
#include "newgrf_text.h"
|
||||
#include "table/sprites.h"
|
||||
#include "fontcache.h"
|
||||
|
@ -46,6 +45,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "gfx_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/* TTDPatch extended GRF format codec
|
||||
* (c) Petr Baudis 2004 (GPL'd)
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "newgrf_cargo.h"
|
||||
#include "cargotype.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
int _traininfo_vehicle_pitch = 0;
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
#include "oldpool.h"
|
||||
#include "sound.h"
|
||||
#include "engine.h"
|
||||
#include "vehicle.h"
|
||||
#include "newgrf_callbacks.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "newgrf_sound.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
static uint _sound_count = 0;
|
||||
STATIC_OLD_POOL(SoundInternal, FileEntry, 3, 1000, NULL, NULL)
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "window_gui.h"
|
||||
#include "viewport.h"
|
||||
#include "news.h"
|
||||
#include "vehicle.h"
|
||||
#include "sound.h"
|
||||
#include "variables.h"
|
||||
#include "string.h"
|
||||
|
@ -17,6 +16,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
/** @file news_gui.cpp
|
||||
*
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "npf.h"
|
||||
#include "vehicle.h"
|
||||
#include "bridge_map.h"
|
||||
#include "debug.h"
|
||||
#include "tile_cmd.h"
|
||||
|
@ -21,6 +20,7 @@
|
|||
#include "water_map.h"
|
||||
#include "tunnelbridge_map.h"
|
||||
#include "functions.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
static AyStar _npf_aystar;
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "station.h"
|
||||
#include "player.h"
|
||||
#include "engine.h"
|
||||
#include "vehicle.h"
|
||||
#include "aircraft.h"
|
||||
#include "roadveh.h"
|
||||
#include "ship.h"
|
||||
|
@ -24,6 +23,7 @@
|
|||
#include "zoom_func.h"
|
||||
#include "functions.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
enum {
|
||||
HEADER_SIZE = 49,
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "station_map.h"
|
||||
#include "town_map.h"
|
||||
#include "tunnel_map.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "window_func.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -62,6 +61,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "zoom_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
#include "bridge_map.h"
|
||||
#include "clear_map.h"
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#include "openttd.h"
|
||||
#include "order.h"
|
||||
#include "airport.h"
|
||||
#include "vehicle.h"
|
||||
#include "depot.h"
|
||||
#include "table/strings.h"
|
||||
#include "waypoint.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "town.h"
|
||||
#include "command_func.h"
|
||||
|
@ -25,6 +24,7 @@
|
|||
#include "order.h"
|
||||
#include "strings_func.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
enum OrderWindowWidgets {
|
||||
ORDER_WIDGET_CLOSEBOX = 0,
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "viewport.h"
|
||||
#include "player.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "network/network.h"
|
||||
#include "variables.h"
|
||||
#include "roadveh.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "table/sprites.h"
|
||||
#include "player.h"
|
||||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "news.h"
|
||||
#include "saveload.h"
|
||||
|
@ -29,6 +28,7 @@
|
|||
#include "gfx_func.h"
|
||||
#include "functions.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/**
|
||||
* Sets the local player and updates the patch settings that are set on a
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "landscape.h"
|
||||
#include "town_map.h"
|
||||
#include "tunnel_map.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "pathfind.h"
|
||||
|
@ -41,6 +40,7 @@
|
|||
#include "water.h"
|
||||
#include "tunnelbridge_map.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
const byte _track_sloped_sprites[14] = {
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "viewport.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "waypoint.h"
|
||||
#include "debug.h"
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "tile_cmd.h"
|
||||
#include "landscape.h"
|
||||
#include "town_map.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "player.h"
|
||||
|
@ -33,6 +32,8 @@
|
|||
#include "tunnelbridge_map.h"
|
||||
#include "window_func.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
|
||||
#define M(x) (1 << (x))
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
#include "road_cmd.h"
|
||||
#include "road_map.h"
|
||||
#include "station_map.h"
|
||||
#include "vehicle.h"
|
||||
//needed for catchments
|
||||
#include "station.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
static void ShowRVStationPicker(RoadStop::Type rs);
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef ROADVEH_H
|
||||
#define ROADVEH_H
|
||||
|
||||
#include "vehicle.h"
|
||||
#include "vehicle_base.h"
|
||||
#include "engine.h"
|
||||
#include "variables.h"
|
||||
#include "economy_func.h"
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include "roadveh.h"
|
||||
#include "station_map.h"
|
||||
#include "table/strings.h"
|
||||
#include "vehicle.h"
|
||||
#include "timetable.h"
|
||||
#include "engine.h"
|
||||
#include "command_func.h"
|
||||
|
@ -38,6 +37,7 @@
|
|||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
static const uint16 _roadveh_images[63] = {
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "depot.h"
|
||||
#include "vehicle_gui.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
void DrawRoadVehDetails(const Vehicle *v, int x, int y)
|
||||
|
@ -99,7 +99,7 @@ static inline int RoadVehLengthToPixels(int length)
|
|||
return (length * 28) / 8;
|
||||
}
|
||||
|
||||
void DrawRoadVehImage(const Vehicle *v, int x, int y, int count, VehicleID selection)
|
||||
void DrawRoadVehImage(const Vehicle *v, int x, int y, VehicleID selection, int count)
|
||||
{
|
||||
/* Road vehicle lengths are measured in eighths of the standard length, so
|
||||
* count is the number of standard vehicles that should be drawn. If it is
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "stdafx.h"
|
||||
#include "openttd.h"
|
||||
#include "debug.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "thread.h"
|
||||
#include "town.h"
|
||||
|
@ -31,6 +30,7 @@
|
|||
#include "core/alloc_func.hpp"
|
||||
#include "functions.h"
|
||||
#include "core/endian_func.hpp"
|
||||
#include "vehicle_base.h"
|
||||
#include <list>
|
||||
|
||||
extern const uint16 SAVEGAME_VERSION = 83;
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
#include "news.h"
|
||||
#include "window_func.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle_func.h"
|
||||
#ifdef WITH_FREETYPE
|
||||
#include "fontcache.h"
|
||||
#endif
|
||||
|
|
|
@ -19,11 +19,11 @@
|
|||
#include "town.h"
|
||||
#include "variables.h"
|
||||
#include "settings.h"
|
||||
#include "vehicle.h"
|
||||
#include "newgrf_townname.h"
|
||||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
static uint32 _difficulty_click_a;
|
||||
static uint32 _difficulty_click_b;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef SHIP_H
|
||||
#define SHIP_H
|
||||
|
||||
#include "vehicle.h"
|
||||
#include "vehicle_base.h"
|
||||
#include "engine.h"
|
||||
#include "variables.h"
|
||||
#include "economy_func.h"
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "landscape.h"
|
||||
#include "vehicle.h"
|
||||
#include "timetable.h"
|
||||
#include "command_func.h"
|
||||
#include "pathfind.h"
|
||||
|
@ -34,6 +33,7 @@
|
|||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
|
||||
|
||||
|
|
|
@ -10,12 +10,12 @@
|
|||
#include "table/sprites.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "depot.h"
|
||||
#include "vehicle_gui.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
void DrawShipImage(const Vehicle *v, int x, int y, VehicleID selection)
|
||||
{
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "tunnel_map.h"
|
||||
#include "viewport.h"
|
||||
#include "player.h"
|
||||
#include "vehicle.h"
|
||||
#include "town.h"
|
||||
#include "sound.h"
|
||||
#include "variables.h"
|
||||
|
@ -27,6 +26,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "zoom_func.h"
|
||||
#include "core/endian_func.hpp"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
|
||||
static const Widget _smallmap_widgets[] = {
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include "landscape.h"
|
||||
#include "mixer.h"
|
||||
#include "sound.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "fileio.h"
|
||||
#include "newgrf_sound.h"
|
||||
|
@ -15,6 +14,7 @@
|
|||
#include "window_gui.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "map_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
static uint _file_count;
|
||||
static FileEntry *_files;
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "station.h"
|
||||
#include "viewport.h"
|
||||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
#include "news.h"
|
||||
#include "saveload.h"
|
||||
#include "player.h"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
#include "news.h"
|
||||
#include "saveload.h"
|
||||
#include "player.h"
|
||||
|
@ -44,6 +43,7 @@
|
|||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
DEFINE_OLD_POOL_GENERIC(Station, Station)
|
||||
DEFINE_OLD_POOL_GENERIC(RoadStop, RoadStop)
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "command_func.h"
|
||||
#include "variables.h"
|
||||
#include "vehicle_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "table/sprites.h"
|
||||
#include "cargotype.h"
|
||||
#include "station_gui.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "namegen.h"
|
||||
#include "station.h"
|
||||
#include "town.h"
|
||||
#include "vehicle.h"
|
||||
#include "news.h"
|
||||
#include "screenshot.h"
|
||||
#include "waypoint.h"
|
||||
|
@ -26,7 +25,6 @@
|
|||
#include "debug.h"
|
||||
#include "newgrf_townname.h"
|
||||
#include "signs.h"
|
||||
#include "vehicle.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "spritecache.h"
|
||||
#include "fontcache.h"
|
||||
|
@ -35,6 +33,7 @@
|
|||
#include "functions.h"
|
||||
#include "core/endian_func.hpp"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
/* for opendir/readdir/closedir */
|
||||
# include "fios.h"
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "viewport.h"
|
||||
#include "sound.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle.h"
|
||||
#include "signs.h"
|
||||
#include "variables.h"
|
||||
#include "functions.h"
|
||||
|
|
|
@ -8,9 +8,10 @@
|
|||
#include "table/strings.h"
|
||||
#include "command_func.h"
|
||||
#include "player.h"
|
||||
#include "vehicle.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
|
||||
static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 time, bool is_journey)
|
||||
|
|
|
@ -12,10 +12,10 @@
|
|||
#include "window_gui.h"
|
||||
#include "textbuf_gui.h"
|
||||
#include "string.h"
|
||||
#include "vehicle.h"
|
||||
#include "cargotype.h"
|
||||
#include "depot.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
static int GetOrderFromTimetableWndPt(Window *w, int y, const Vehicle *v)
|
||||
{
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "command_func.h"
|
||||
#include "industry.h"
|
||||
#include "station.h"
|
||||
#include "vehicle.h"
|
||||
#include "player.h"
|
||||
#include "news.h"
|
||||
#include "saveload.h"
|
||||
|
@ -1793,7 +1792,7 @@ static void DoBuildTownHouse(Town *t, TileIndex tile)
|
|||
construction_counter = GB(r, 2, 2);
|
||||
}
|
||||
}
|
||||
MakeTownHouse(tile, t->index, construction_counter, construction_stage, house, VehicleRandomBits());
|
||||
MakeTownHouse(tile, t->index, construction_counter, construction_stage, house, Random());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
#define TRAIN_H
|
||||
|
||||
#include "stdafx.h"
|
||||
#include "vehicle.h"
|
||||
#include "core/bitmath_func.hpp"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "station_map.h"
|
||||
#include "table/strings.h"
|
||||
#include "tunnel_map.h"
|
||||
#include "vehicle.h"
|
||||
#include "timetable.h"
|
||||
#include "articulated_vehicles.h"
|
||||
#include "command_func.h"
|
||||
|
@ -43,6 +42,7 @@
|
|||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
static bool TrainCheckIfLineEnds(Vehicle *v);
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "vehicle_gui.h"
|
||||
|
@ -17,6 +16,7 @@
|
|||
#include "train.h"
|
||||
#include "newgrf_engine.h"
|
||||
#include "strings_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
void CcBuildWagon(bool success, TileIndex tile, uint32 p1, uint32 p2)
|
||||
{
|
||||
|
@ -68,7 +68,7 @@ int WagonLengthToPixels(int len)
|
|||
return (len * _traininfo_vehicle_width) / 8;
|
||||
}
|
||||
|
||||
void DrawTrainImage(const Vehicle *v, int x, int y, int count, int skip, VehicleID selection)
|
||||
void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip)
|
||||
{
|
||||
DrawPixelInfo tmp_dpi, *old_dpi;
|
||||
int dx = -(skip * 8) / _traininfo_vehicle_width;
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "landscape.h"
|
||||
#include "tunnel_map.h"
|
||||
#include "unmovable_map.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "player.h"
|
||||
|
@ -35,6 +34,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "date_func.h"
|
||||
#include "functions.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
|
||||
const Bridge orig_bridge[] = {
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "landscape.h"
|
||||
#include "vehicle.h"
|
||||
#include "timetable.h"
|
||||
#include "viewport.h"
|
||||
#include "news.h"
|
||||
|
@ -43,10 +42,16 @@
|
|||
#include "functions.h"
|
||||
#include "date_func.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
#define INVALID_COORD (0x7fffffff)
|
||||
#define GEN_HASH(x, y) ((GB((y), 6, 6) << 6) + GB((x), 7, 6))
|
||||
|
||||
VehicleID _vehicle_id_ctr_day;
|
||||
Vehicle *_place_clicked_vehicle;
|
||||
VehicleID _new_vehicle_id;
|
||||
uint16 _returned_refit_capacity;
|
||||
|
||||
|
||||
/* Tables used in vehicle.h to find the right command for a certain vehicle type */
|
||||
const uint32 _veh_build_proc_table[] = {
|
||||
|
@ -3182,3 +3187,15 @@ void SpecialVehicle::UpdateDeltaXY(Direction direction)
|
|||
this->sprite_height = 1;
|
||||
this->z_height = 1;
|
||||
}
|
||||
|
||||
void StopAllVehicles()
|
||||
{
|
||||
Vehicle *v;
|
||||
FOR_ALL_VEHICLES(v) {
|
||||
/* Code ripped from CmdStartStopTrain. Can't call it, because of
|
||||
* ownership problems, so we'll duplicate some code, for now */
|
||||
v->vehstatus |= VS_STOPPED;
|
||||
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
|
||||
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
/* $Id$ */
|
||||
|
||||
/** @vehicle.h */
|
||||
/** @file vehicle_base.h Base class for all vehicles. */
|
||||
|
||||
#ifndef VEHICLE_H
|
||||
#define VEHICLE_H
|
||||
#ifndef VEHICLE_BASE_H
|
||||
#define VEHICLE_BASE_H
|
||||
|
||||
#include "vehicle_type.h"
|
||||
#include "track_type.h"
|
||||
|
@ -74,20 +74,6 @@ enum VehicleFlags {
|
|||
VF_AUTOFILL_TIMETABLE, ///< Whether the vehicle should fill in the timetable automatically.
|
||||
};
|
||||
|
||||
/* Effect vehicle types */
|
||||
enum EffectVehicle {
|
||||
EV_CHIMNEY_SMOKE = 0,
|
||||
EV_STEAM_SMOKE = 1,
|
||||
EV_DIESEL_SMOKE = 2,
|
||||
EV_ELECTRIC_SPARK = 3,
|
||||
EV_SMOKE = 4,
|
||||
EV_EXPLOSION_LARGE = 5,
|
||||
EV_BREAKDOWN_SMOKE = 6,
|
||||
EV_EXPLOSION_SMALL = 7,
|
||||
EV_BULLDOZER = 8,
|
||||
EV_BUBBLE = 9
|
||||
};
|
||||
|
||||
struct VehicleRail {
|
||||
uint16 last_speed; // NOSAVE: only used in UI
|
||||
uint16 crash_anim_pos;
|
||||
|
@ -199,8 +185,7 @@ extern void AfterLoadVehicles();
|
|||
struct LoadgameState;
|
||||
extern bool LoadOldVehicle(LoadgameState *ls, int num);
|
||||
|
||||
struct Vehicle : PoolItem<Vehicle, VehicleID, &_Vehicle_pool> {
|
||||
VehicleTypeByte type; ///< Type of vehicle
|
||||
struct Vehicle : PoolItem<Vehicle, VehicleID, &_Vehicle_pool>, BaseVehicle {
|
||||
byte subtype; // subtype (Filled with values from EffectVehicles/TrainSubTypes/AircraftSubTypes)
|
||||
|
||||
private:
|
||||
|
@ -444,12 +429,6 @@ public:
|
|||
*/
|
||||
Money GetDisplayRunningCost() const { return (this->GetRunningCost() >> 8); }
|
||||
|
||||
/**
|
||||
* Is this vehicle a valid vehicle?
|
||||
* @return true if and only if the vehicle is valid.
|
||||
*/
|
||||
inline bool IsValid() const { return this->type != VEH_INVALID; }
|
||||
|
||||
/**
|
||||
* Set the next vehicle of this vehicle.
|
||||
* @param next the next vehicle. NULL removes the next vehicle.
|
||||
|
@ -543,113 +522,6 @@ struct InvalidVehicle : public Vehicle {
|
|||
void Tick() {}
|
||||
};
|
||||
|
||||
#define is_custom_sprite(x) (x >= 0xFD)
|
||||
#define IS_CUSTOM_FIRSTHEAD_SPRITE(x) (x == 0xFD)
|
||||
#define IS_CUSTOM_SECONDHEAD_SPRITE(x) (x == 0xFE)
|
||||
|
||||
typedef void *VehicleFromPosProc(Vehicle *v, void *data);
|
||||
|
||||
void VehicleServiceInDepot(Vehicle *v);
|
||||
void VehiclePositionChanged(Vehicle *v);
|
||||
Vehicle *GetLastVehicleInChain(Vehicle *v);
|
||||
uint CountVehiclesInChain(const Vehicle *v);
|
||||
bool IsEngineCountable(const Vehicle *v);
|
||||
void DeleteVehicleChain(Vehicle *v);
|
||||
void *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
|
||||
void *VehicleFromPosXY(int x, int y, void *data, VehicleFromPosProc *proc);
|
||||
void CallVehicleTicks();
|
||||
Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z);
|
||||
uint8 CalcPercentVehicleFilled(Vehicle *v, StringID *color);
|
||||
|
||||
void InitializeTrains();
|
||||
byte VehicleRandomBits();
|
||||
void ResetVehiclePosHash();
|
||||
void ResetVehicleColorMap();
|
||||
void CheckVehicle32Day(Vehicle *v);
|
||||
|
||||
bool CanRefitTo(EngineID engine_type, CargoID cid_to);
|
||||
CargoID FindFirstRefittableCargo(EngineID engine_type);
|
||||
CommandCost GetRefitCost(EngineID engine_type);
|
||||
|
||||
void ViewportAddVehicles(DrawPixelInfo *dpi);
|
||||
|
||||
SpriteID GetRotorImage(const Vehicle *v);
|
||||
|
||||
Vehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicle type);
|
||||
Vehicle *CreateEffectVehicleAbove(int x, int y, int z, EffectVehicle type);
|
||||
Vehicle *CreateEffectVehicleRel(const Vehicle *v, int x, int y, int z, EffectVehicle type);
|
||||
|
||||
uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y);
|
||||
|
||||
StringID VehicleInTheWayErrMsg(const Vehicle* v);
|
||||
Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z, bool without_crashed = false);
|
||||
Vehicle *GetVehicleTunnelBridge(TileIndex tile, TileIndex endtile);
|
||||
|
||||
bool UpdateSignalsOnSegment(TileIndex tile, DiagDirection direction);
|
||||
void SetSignalsOnBothDir(TileIndex tile, byte track);
|
||||
|
||||
Vehicle *CheckClickOnVehicle(const ViewPort *vp, int x, int y);
|
||||
|
||||
void DecreaseVehicleValue(Vehicle *v);
|
||||
void CheckVehicleBreakdown(Vehicle *v);
|
||||
void AgeVehicle(Vehicle *v);
|
||||
void VehicleEnteredDepotThisTick(Vehicle *v);
|
||||
|
||||
void BeginVehicleMove(Vehicle *v);
|
||||
void EndVehicleMove(Vehicle *v);
|
||||
|
||||
UnitID GetFreeUnitNumber(VehicleType type);
|
||||
|
||||
void TrainConsistChanged(Vehicle *v);
|
||||
void TrainPowerChanged(Vehicle *v);
|
||||
Money GetTrainRunningCost(const Vehicle *v);
|
||||
|
||||
bool VehicleNeedsService(const Vehicle *v);
|
||||
|
||||
uint GenerateVehicleSortList(const Vehicle*** sort_list, uint16 *length_of_array, VehicleType type, PlayerID owner, uint32 index, uint16 window_type);
|
||||
void BuildDepotVehicleList(VehicleType type, TileIndex tile, Vehicle ***engine_list, uint16 *engine_list_length, uint16 *engine_count, Vehicle ***wagon_list, uint16 *wagon_list_length, uint16 *wagon_count);
|
||||
CommandCost SendAllVehiclesToDepot(VehicleType type, uint32 flags, bool service, PlayerID owner, uint16 vlw_flag, uint32 id);
|
||||
void VehicleEnterDepot(Vehicle *v);
|
||||
|
||||
void InvalidateAutoreplaceWindow(EngineID e, GroupID id_g);
|
||||
|
||||
CommandCost MaybeReplaceVehicle(Vehicle *v, bool check, bool display_costs);
|
||||
bool CanBuildVehicleInfrastructure(VehicleType type);
|
||||
|
||||
void CcCloneVehicle(bool success, TileIndex tile, uint32 p1, uint32 p2);
|
||||
|
||||
/* Flags to add to p2 for goto depot commands */
|
||||
/* Note: bits 8-10 are used for VLW flags */
|
||||
enum {
|
||||
DEPOT_SERVICE = (1 << 0), // The vehicle will leave the depot right after arrival (serivce only)
|
||||
DEPOT_MASS_SEND = (1 << 1), // Tells that it's a mass send to depot command (type in VLW flag)
|
||||
DEPOT_DONT_CANCEL = (1 << 2), // Don't cancel current goto depot command if any
|
||||
DEPOT_LOCATE_HANGAR = (1 << 3), // Find another airport if the target one lacks a hangar
|
||||
};
|
||||
|
||||
struct GetNewVehiclePosResult {
|
||||
int x, y;
|
||||
TileIndex old_tile;
|
||||
TileIndex new_tile;
|
||||
};
|
||||
|
||||
/**
|
||||
* Returns the Trackdir on which the vehicle is currently located.
|
||||
* Works for trains and ships.
|
||||
* Currently works only sortof for road vehicles, since they have a fuzzy
|
||||
* concept of being "on" a trackdir. Dunno really what it returns for a road
|
||||
* vehicle that is halfway a tile, never really understood that part. For road
|
||||
* vehicles that are at the beginning or end of the tile, should just return
|
||||
* the diagonal trackdir on which they are driving. I _think_.
|
||||
* For other vehicles types, or vehicles with no clear trackdir (such as those
|
||||
* in depots), returns 0xFF.
|
||||
*/
|
||||
Trackdir GetVehicleTrackdir(const Vehicle* v);
|
||||
|
||||
/* returns true if staying in the same tile */
|
||||
GetNewVehiclePosResult GetNewVehiclePos(const Vehicle *v);
|
||||
Direction GetDirectionTowards(const Vehicle *v, int x, int y);
|
||||
|
||||
#define BEGIN_ENUM_WAGONS(v) do {
|
||||
#define END_ENUM_WAGONS(v) } while ((v = v->Next()) != NULL);
|
||||
|
||||
|
@ -668,24 +540,6 @@ static inline uint GetNumVehicles()
|
|||
return GetVehiclePoolSize();
|
||||
}
|
||||
|
||||
static inline bool IsPlayerBuildableVehicleType(VehicleType type)
|
||||
{
|
||||
switch (type) {
|
||||
case VEH_TRAIN:
|
||||
case VEH_ROAD:
|
||||
case VEH_SHIP:
|
||||
case VEH_AIRCRAFT:
|
||||
return true;
|
||||
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
static inline bool IsPlayerBuildableVehicleType(const Vehicle *v)
|
||||
{
|
||||
return IsPlayerBuildableVehicleType(v->type);
|
||||
}
|
||||
|
||||
#define FOR_ALL_VEHICLES_FROM(v, start) for (v = GetVehicle(start); v != NULL; v = (v->index + 1U < GetVehiclePoolSize()) ? GetVehicle(v->index + 1) : NULL) if (v->IsValid())
|
||||
#define FOR_ALL_VEHICLES(v) FOR_ALL_VEHICLES_FROM(v, 0)
|
||||
|
||||
|
@ -741,84 +595,19 @@ static inline Vehicle *GetFirstVehicleFromSharedList(const Vehicle *v)
|
|||
return u;
|
||||
}
|
||||
|
||||
/* NOSAVE: Return values from various commands. */
|
||||
VARDEF VehicleID _new_vehicle_id;
|
||||
VARDEF uint16 _returned_refit_capacity;
|
||||
|
||||
static const VehicleID INVALID_VEHICLE = 0xFFFF;
|
||||
|
||||
const struct Livery *GetEngineLivery(EngineID engine_type, PlayerID player, EngineID parent_engine_type, const Vehicle *v);
|
||||
|
||||
/**
|
||||
* Get the colour map for an engine. This used for unbuilt engines in the user interface.
|
||||
* @param engine_type ID of engine
|
||||
* @param player ID of player
|
||||
* @return A ready-to-use palette modifier
|
||||
* Returns the Trackdir on which the vehicle is currently located.
|
||||
* Works for trains and ships.
|
||||
* Currently works only sortof for road vehicles, since they have a fuzzy
|
||||
* concept of being "on" a trackdir. Dunno really what it returns for a road
|
||||
* vehicle that is halfway a tile, never really understood that part. For road
|
||||
* vehicles that are at the beginning or end of the tile, should just return
|
||||
* the diagonal trackdir on which they are driving. I _think_.
|
||||
* For other vehicles types, or vehicles with no clear trackdir (such as those
|
||||
* in depots), returns 0xFF.
|
||||
*/
|
||||
SpriteID GetEnginePalette(EngineID engine_type, PlayerID player);
|
||||
Trackdir GetVehicleTrackdir(const Vehicle* v);
|
||||
|
||||
/**
|
||||
* Get the colour map for a vehicle.
|
||||
* @param v Vehicle to get colour map for
|
||||
* @return A ready-to-use palette modifier
|
||||
*/
|
||||
SpriteID GetVehiclePalette(const Vehicle *v);
|
||||
void CheckVehicle32Day(Vehicle *v);
|
||||
|
||||
/* A lot of code calls for the invalidation of the status bar, which is widget 5.
|
||||
* Best is to have a virtual value for it when it needs to change again */
|
||||
#define STATUS_BAR 5
|
||||
|
||||
extern const uint32 _veh_build_proc_table[];
|
||||
extern const uint32 _veh_sell_proc_table[];
|
||||
extern const uint32 _veh_refit_proc_table[];
|
||||
extern const uint32 _send_to_depot_proc_table[];
|
||||
|
||||
/* Functions to find the right command for certain vehicle type */
|
||||
static inline uint32 GetCmdBuildVeh(VehicleType type)
|
||||
{
|
||||
return _veh_build_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdBuildVeh(const Vehicle *v)
|
||||
{
|
||||
return GetCmdBuildVeh(v->type);
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSellVeh(VehicleType type)
|
||||
{
|
||||
return _veh_sell_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSellVeh(const Vehicle *v)
|
||||
{
|
||||
return GetCmdSellVeh(v->type);
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdRefitVeh(VehicleType type)
|
||||
{
|
||||
return _veh_refit_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdRefitVeh(const Vehicle *v)
|
||||
{
|
||||
return GetCmdRefitVeh(v->type);
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSendToDepot(VehicleType type)
|
||||
{
|
||||
return _send_to_depot_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSendToDepot(const Vehicle *v)
|
||||
{
|
||||
return GetCmdSendToDepot(v->type);
|
||||
}
|
||||
|
||||
bool EnsureNoVehicleOnGround(TileIndex tile);
|
||||
|
||||
/* This one is not used anymore. */
|
||||
VARDEF VehicleID _vehicle_id_ctr_day;
|
||||
VARDEF Vehicle *_place_clicked_vehicle;
|
||||
|
||||
|
||||
#endif /* VEHICLE_H */
|
||||
#endif /* VEHICLE_BASE_H */
|
|
@ -0,0 +1,202 @@
|
|||
/* $Id$ */
|
||||
|
||||
/** @vehicle.h Functions related to vehicles. */
|
||||
|
||||
#ifndef VEHICLE_FUNC_H
|
||||
#define VEHICLE_FUNC_H
|
||||
|
||||
#include "tile_type.h"
|
||||
#include "strings_type.h"
|
||||
#include "gfx_type.h"
|
||||
#include "direction_type.h"
|
||||
#include "cargo_type.h"
|
||||
#include "command_type.h"
|
||||
#include "vehicle_type.h"
|
||||
|
||||
#define is_custom_sprite(x) (x >= 0xFD)
|
||||
#define IS_CUSTOM_FIRSTHEAD_SPRITE(x) (x == 0xFD)
|
||||
#define IS_CUSTOM_SECONDHEAD_SPRITE(x) (x == 0xFE)
|
||||
|
||||
typedef void *VehicleFromPosProc(Vehicle *v, void *data);
|
||||
|
||||
void VehicleServiceInDepot(Vehicle *v);
|
||||
void VehiclePositionChanged(Vehicle *v);
|
||||
Vehicle *GetLastVehicleInChain(Vehicle *v);
|
||||
uint CountVehiclesInChain(const Vehicle *v);
|
||||
bool IsEngineCountable(const Vehicle *v);
|
||||
void DeleteVehicleChain(Vehicle *v);
|
||||
void *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
|
||||
void *VehicleFromPosXY(int x, int y, void *data, VehicleFromPosProc *proc);
|
||||
void CallVehicleTicks();
|
||||
Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z);
|
||||
uint8 CalcPercentVehicleFilled(Vehicle *v, StringID *color);
|
||||
|
||||
void InitializeTrains();
|
||||
byte VehicleRandomBits();
|
||||
void ResetVehiclePosHash();
|
||||
void ResetVehicleColorMap();
|
||||
|
||||
bool CanRefitTo(EngineID engine_type, CargoID cid_to);
|
||||
CargoID FindFirstRefittableCargo(EngineID engine_type);
|
||||
CommandCost GetRefitCost(EngineID engine_type);
|
||||
|
||||
void ViewportAddVehicles(DrawPixelInfo *dpi);
|
||||
|
||||
SpriteID GetRotorImage(const Vehicle *v);
|
||||
|
||||
uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y);
|
||||
|
||||
StringID VehicleInTheWayErrMsg(const Vehicle* v);
|
||||
Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z, bool without_crashed = false);
|
||||
Vehicle *GetVehicleTunnelBridge(TileIndex tile, TileIndex endtile);
|
||||
|
||||
bool UpdateSignalsOnSegment(TileIndex tile, DiagDirection direction);
|
||||
void SetSignalsOnBothDir(TileIndex tile, byte track);
|
||||
|
||||
Vehicle *CheckClickOnVehicle(const ViewPort *vp, int x, int y);
|
||||
|
||||
void DecreaseVehicleValue(Vehicle *v);
|
||||
void CheckVehicleBreakdown(Vehicle *v);
|
||||
void AgeVehicle(Vehicle *v);
|
||||
void VehicleEnteredDepotThisTick(Vehicle *v);
|
||||
|
||||
void BeginVehicleMove(Vehicle *v);
|
||||
void EndVehicleMove(Vehicle *v);
|
||||
|
||||
UnitID GetFreeUnitNumber(VehicleType type);
|
||||
|
||||
void TrainConsistChanged(Vehicle *v);
|
||||
void TrainPowerChanged(Vehicle *v);
|
||||
Money GetTrainRunningCost(const Vehicle *v);
|
||||
|
||||
bool VehicleNeedsService(const Vehicle *v);
|
||||
|
||||
uint GenerateVehicleSortList(const Vehicle*** sort_list, uint16 *length_of_array, VehicleType type, PlayerID owner, uint32 index, uint16 window_type);
|
||||
void BuildDepotVehicleList(VehicleType type, TileIndex tile, Vehicle ***engine_list, uint16 *engine_list_length, uint16 *engine_count, Vehicle ***wagon_list, uint16 *wagon_list_length, uint16 *wagon_count);
|
||||
CommandCost SendAllVehiclesToDepot(VehicleType type, uint32 flags, bool service, PlayerID owner, uint16 vlw_flag, uint32 id);
|
||||
void VehicleEnterDepot(Vehicle *v);
|
||||
|
||||
void InvalidateAutoreplaceWindow(EngineID e, GroupID id_g);
|
||||
|
||||
CommandCost MaybeReplaceVehicle(Vehicle *v, bool check, bool display_costs);
|
||||
bool CanBuildVehicleInfrastructure(VehicleType type);
|
||||
|
||||
void CcCloneVehicle(bool success, TileIndex tile, uint32 p1, uint32 p2);
|
||||
|
||||
/* Flags to add to p2 for goto depot commands */
|
||||
/* Note: bits 8-10 are used for VLW flags */
|
||||
enum {
|
||||
DEPOT_SERVICE = (1 << 0), // The vehicle will leave the depot right after arrival (serivce only)
|
||||
DEPOT_MASS_SEND = (1 << 1), // Tells that it's a mass send to depot command (type in VLW flag)
|
||||
DEPOT_DONT_CANCEL = (1 << 2), // Don't cancel current goto depot command if any
|
||||
DEPOT_LOCATE_HANGAR = (1 << 3), // Find another airport if the target one lacks a hangar
|
||||
};
|
||||
|
||||
struct GetNewVehiclePosResult {
|
||||
int x, y;
|
||||
TileIndex old_tile;
|
||||
TileIndex new_tile;
|
||||
};
|
||||
|
||||
/* returns true if staying in the same tile */
|
||||
GetNewVehiclePosResult GetNewVehiclePos(const Vehicle *v);
|
||||
Direction GetDirectionTowards(const Vehicle *v, int x, int y);
|
||||
|
||||
static inline bool IsPlayerBuildableVehicleType(VehicleType type)
|
||||
{
|
||||
switch (type) {
|
||||
case VEH_TRAIN:
|
||||
case VEH_ROAD:
|
||||
case VEH_SHIP:
|
||||
case VEH_AIRCRAFT:
|
||||
return true;
|
||||
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
static inline bool IsPlayerBuildableVehicleType(const BaseVehicle *v)
|
||||
{
|
||||
return IsPlayerBuildableVehicleType(v->type);
|
||||
}
|
||||
|
||||
const struct Livery *GetEngineLivery(EngineID engine_type, PlayerID player, EngineID parent_engine_type, const Vehicle *v);
|
||||
|
||||
/**
|
||||
* Get the colour map for an engine. This used for unbuilt engines in the user interface.
|
||||
* @param engine_type ID of engine
|
||||
* @param player ID of player
|
||||
* @return A ready-to-use palette modifier
|
||||
*/
|
||||
SpriteID GetEnginePalette(EngineID engine_type, PlayerID player);
|
||||
|
||||
/**
|
||||
* Get the colour map for a vehicle.
|
||||
* @param v Vehicle to get colour map for
|
||||
* @return A ready-to-use palette modifier
|
||||
*/
|
||||
SpriteID GetVehiclePalette(const Vehicle *v);
|
||||
|
||||
/* A lot of code calls for the invalidation of the status bar, which is widget 5.
|
||||
* Best is to have a virtual value for it when it needs to change again */
|
||||
#define STATUS_BAR 5
|
||||
|
||||
extern const uint32 _veh_build_proc_table[];
|
||||
extern const uint32 _veh_sell_proc_table[];
|
||||
extern const uint32 _veh_refit_proc_table[];
|
||||
extern const uint32 _send_to_depot_proc_table[];
|
||||
|
||||
/* Functions to find the right command for certain vehicle type */
|
||||
static inline uint32 GetCmdBuildVeh(VehicleType type)
|
||||
{
|
||||
return _veh_build_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdBuildVeh(const BaseVehicle *v)
|
||||
{
|
||||
return GetCmdBuildVeh(v->type);
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSellVeh(VehicleType type)
|
||||
{
|
||||
return _veh_sell_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSellVeh(const BaseVehicle *v)
|
||||
{
|
||||
return GetCmdSellVeh(v->type);
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdRefitVeh(VehicleType type)
|
||||
{
|
||||
return _veh_refit_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdRefitVeh(const BaseVehicle *v)
|
||||
{
|
||||
return GetCmdRefitVeh(v->type);
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSendToDepot(VehicleType type)
|
||||
{
|
||||
return _send_to_depot_proc_table[type];
|
||||
}
|
||||
|
||||
static inline uint32 GetCmdSendToDepot(const BaseVehicle *v)
|
||||
{
|
||||
return GetCmdSendToDepot(v->type);
|
||||
}
|
||||
|
||||
bool EnsureNoVehicleOnGround(TileIndex tile);
|
||||
void StopAllVehicles();
|
||||
|
||||
Vehicle *CreateEffectVehicle(int x, int y, int z, EffectVehicle type);
|
||||
Vehicle *CreateEffectVehicleAbove(int x, int y, int z, EffectVehicle type);
|
||||
Vehicle *CreateEffectVehicleRel(const Vehicle *v, int x, int y, int z, EffectVehicle type);
|
||||
|
||||
extern VehicleID _vehicle_id_ctr_day;
|
||||
extern Vehicle *_place_clicked_vehicle;
|
||||
extern VehicleID _new_vehicle_id;
|
||||
extern uint16 _returned_refit_capacity;
|
||||
|
||||
#endif /* VEHICLE_H */
|
|
@ -9,7 +9,6 @@
|
|||
#include "station.h"
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
#include "vehicle.h"
|
||||
#include "engine.h"
|
||||
#include "gui.h"
|
||||
#include "window_gui.h"
|
||||
|
@ -32,6 +31,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
struct Sorting {
|
||||
Listing aircraft;
|
||||
|
@ -1004,7 +1004,7 @@ static void DrawVehicleListWindow(Window *w)
|
|||
SetDParam(0, v->profit_this_year);
|
||||
SetDParam(1, v->profit_last_year);
|
||||
|
||||
DrawVehicleImage(v, x + 19, y + 6, w->widget[VLW_WIDGET_LIST].right - w->widget[VLW_WIDGET_LIST].left - 20, 0, INVALID_VEHICLE);
|
||||
DrawVehicleImage(v, x + 19, y + 6, INVALID_VEHICLE, w->widget[VLW_WIDGET_LIST].right - w->widget[VLW_WIDGET_LIST].left - 20, 0);
|
||||
DrawString(x + 19, y + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
|
||||
|
||||
if ((v->type == VEH_TRAIN && v->string_id != STR_SV_TRAIN_NAME) ||
|
||||
|
@ -1544,7 +1544,7 @@ static void DrawVehicleDetailsWindow(Window *w)
|
|||
case VEH_ROAD:
|
||||
case VEH_SHIP:
|
||||
case VEH_AIRCRAFT:
|
||||
DrawVehicleImage(v, 3, 57, 0, 0, INVALID_VEHICLE);
|
||||
DrawVehicleImage(v, 3, 57, INVALID_VEHICLE, 0, 0);
|
||||
DrawVehicleDetails(v, 75, 57, w->vscroll.pos, w->vscroll.cap, det_tab);
|
||||
break;
|
||||
|
||||
|
@ -2168,3 +2168,14 @@ static void VehicleViewWndProc(Window *w, WindowEvent *e)
|
|||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
void DrawVehicleImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip)
|
||||
{
|
||||
switch (v->type) {
|
||||
case VEH_TRAIN: DrawTrainImage(v, x, y, selection, count, skip); break;
|
||||
case VEH_ROAD: DrawRoadVehImage(v, x, y, selection, count); break;
|
||||
case VEH_SHIP: DrawShipImage(v, x, y, selection); break;
|
||||
case VEH_AIRCRAFT: DrawAircraftImage(v, x, y, selection); break;
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#define VEHICLE_GUI_H
|
||||
|
||||
#include "window_gui.h"
|
||||
#include "vehicle.h"
|
||||
#include "vehicle_type.h"
|
||||
|
||||
void DrawVehicleProfitButton(const Vehicle *v, int x, int y);
|
||||
void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order);
|
||||
|
@ -50,8 +50,8 @@ void PlayerVehWndProc(Window *w, WindowEvent *e);
|
|||
|
||||
int DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number);
|
||||
|
||||
void DrawTrainImage(const Vehicle *v, int x, int y, int count, int skip, VehicleID selection);
|
||||
void DrawRoadVehImage(const Vehicle *v, int x, int y, int count, VehicleID selection);
|
||||
void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip);
|
||||
void DrawRoadVehImage(const Vehicle *v, int x, int y, VehicleID selection, int count);
|
||||
void DrawShipImage(const Vehicle *v, int x, int y, VehicleID selection);
|
||||
void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection);
|
||||
|
||||
|
@ -71,16 +71,7 @@ void ShowReplaceVehicleWindow(VehicleType vehicletype);
|
|||
void DrawSmallOrderList(const Vehicle *v, int x, int y);
|
||||
void ShowReplaceGroupVehicleWindow(GroupID group, VehicleType veh);
|
||||
|
||||
static inline void DrawVehicleImage(const Vehicle *v, int x, int y, int count, int skip, VehicleID selection)
|
||||
{
|
||||
switch (v->type) {
|
||||
case VEH_TRAIN: DrawTrainImage(v, x, y, count, skip, selection); break;
|
||||
case VEH_ROAD: DrawRoadVehImage(v, x, y, count, selection); break;
|
||||
case VEH_SHIP: DrawShipImage(v, x, y, selection); break;
|
||||
case VEH_AIRCRAFT: DrawAircraftImage(v, x, y, selection); break;
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
}
|
||||
void DrawVehicleImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip);
|
||||
|
||||
static inline uint GetVehicleListHeight(VehicleType type)
|
||||
{
|
||||
|
|
|
@ -25,4 +25,31 @@ typedef TinyEnumT<VehicleType> VehicleTypeByte;
|
|||
|
||||
struct Vehicle;
|
||||
|
||||
struct BaseVehicle
|
||||
{
|
||||
VehicleTypeByte type; ///< Type of vehicle
|
||||
|
||||
/**
|
||||
* Is this vehicle a valid vehicle?
|
||||
* @return true if and only if the vehicle is valid.
|
||||
*/
|
||||
inline bool IsValid() const { return this->type != VEH_INVALID; }
|
||||
};
|
||||
|
||||
static const VehicleID INVALID_VEHICLE = 0xFFFF;
|
||||
|
||||
/* Effect vehicle types */
|
||||
enum EffectVehicle {
|
||||
EV_CHIMNEY_SMOKE = 0,
|
||||
EV_STEAM_SMOKE = 1,
|
||||
EV_DIESEL_SMOKE = 2,
|
||||
EV_ELECTRIC_SPARK = 3,
|
||||
EV_SMOKE = 4,
|
||||
EV_EXPLOSION_LARGE = 5,
|
||||
EV_BREAKDOWN_SMOKE = 6,
|
||||
EV_EXPLOSION_SMALL = 7,
|
||||
EV_BULLDOZER = 8,
|
||||
EV_BUBBLE = 9
|
||||
};
|
||||
|
||||
#endif /* VEHICLE_TYPE_H */
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "landscape.h"
|
||||
#include "viewport.h"
|
||||
#include "vehicle.h"
|
||||
#include "station.h"
|
||||
#include "town.h"
|
||||
#include "signs.h"
|
||||
|
@ -25,6 +24,7 @@
|
|||
#include "transparency.h"
|
||||
#include "strings_func.h"
|
||||
#include "zoom_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
#define VIEWPORT_DRAW_MEM (65536 * 2)
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "table/strings.h"
|
||||
#include "tile_cmd.h"
|
||||
#include "landscape.h"
|
||||
#include "vehicle.h"
|
||||
#include "viewport.h"
|
||||
#include "command_func.h"
|
||||
#include "town.h"
|
||||
|
@ -32,6 +31,7 @@
|
|||
#include "strings_func.h"
|
||||
#include "functions.h"
|
||||
#include "window_func.h"
|
||||
#include "vehicle_func.h"
|
||||
|
||||
/** Array for the shore sprites */
|
||||
static const SpriteID _water_shore_sprites[] = {
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "waypoint.h"
|
||||
#include "variables.h"
|
||||
#include "table/strings.h"
|
||||
#include "vehicle.h"
|
||||
#include "yapf/yapf.h"
|
||||
#include "newgrf.h"
|
||||
#include "string.h"
|
||||
|
@ -28,6 +27,8 @@
|
|||
#include "window_func.h"
|
||||
#include "economy_func.h"
|
||||
#include "date_func.h"
|
||||
#include "vehicle_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
enum {
|
||||
MAX_WAYPOINTS_PER_TOWN = 64,
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
#include "window_gui.h"
|
||||
#include "zoom_func.h"
|
||||
#include "core/alloc_func.hpp"
|
||||
#include "vehicle.h"
|
||||
#include "map_func.h"
|
||||
#include "vehicle_base.h"
|
||||
|
||||
/* delta between mouse cursor and upper left corner of dragged window */
|
||||
static Point _drag_delta;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "track_dir.hpp"
|
||||
|
||||
#include "../vehicle.h"
|
||||
#include "../vehicle_base.h"
|
||||
#include "../depot.h"
|
||||
#include "../road_map.h"
|
||||
#include "../tunnel_map.h"
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include "yapf_node_rail.hpp"
|
||||
#include "yapf_costrail.hpp"
|
||||
#include "yapf_destrail.hpp"
|
||||
#include "../vehicle_func.h"
|
||||
|
||||
#define DEBUG_YAPF_CACHE 0
|
||||
|
||||
|
|
Loading…
Reference in New Issue