(svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes.
--- a/src/ai/default/default.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/ai/default/default.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/ai/trolly/build.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/ai/trolly/build.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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
--- a/src/ai/trolly/shared.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/ai/trolly/shared.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
{
--- a/src/ai/trolly/trolly.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/ai/trolly/trolly.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/aircraft.h Thu Dec 27 13:25:23 2007 +0000
+++ b/src/aircraft.h Thu Dec 27 13:35:39 2007 +0000
@@ -6,7 +6,7 @@
#define AIRCRAFT_H
#include "station_map.h"
-#include "vehicle.h"
+#include "vehicle_base.h"
#include "engine.h"
#include "variables.h"
--- a/src/aircraft_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/aircraft_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/aircraft_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/aircraft_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/airport_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/airport_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/articulated_vehicles.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/articulated_vehicles.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/articulated_vehicles.h Thu Dec 27 13:25:23 2007 +0000
+++ b/src/articulated_vehicles.h Thu Dec 27 13:35:39 2007 +0000
@@ -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);
--- a/src/autoreplace_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/autoreplace_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -18,6 +18,7 @@
#include "order.h"
#include "strings_func.h"
#include "command_func.h"
+#include "vehicle_func.h"
#include "functions.h"
/*
--- a/src/autoreplace_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/autoreplace_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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;
--- a/src/build_vehicle_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/build_vehicle_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 {
--- a/src/clear_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/clear_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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).
--- a/src/console_cmds.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/console_cmds.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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(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 */
--- a/src/date.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/date.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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
--- a/src/depot.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/depot.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -4,7 +4,6 @@
#include "stdafx.h"
#include "openttd.h"
-#include "vehicle.h"
#include "depot.h"
#include "landscape.h"
#include "table/strings.h"
--- a/src/depot_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/depot_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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 @@
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 */
--- a/src/disaster_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/disaster_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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,
--- a/src/dock_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/dock_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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();
--- a/src/economy.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/economy.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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.
--- a/src/elrail.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/elrail.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/engine.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/engine.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/group_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/group_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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
--- a/src/group_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/group_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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);
--- a/src/industry_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/industry_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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);
--- a/src/landscape.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/landscape.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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,
--- a/src/main_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/main_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/misc.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/misc.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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];
--- a/src/misc_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/misc_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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
--- a/src/misc_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/misc_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/network/network_server.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/network/network_server.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/newgrf.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/newgrf.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/newgrf_engine.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/newgrf_engine.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -19,6 +19,7 @@
#include "newgrf_cargo.h"
#include "cargotype.h"
#include "date_func.h"
+#include "vehicle_func.h"
int _traininfo_vehicle_pitch = 0;
--- a/src/newgrf_sound.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/newgrf_sound.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/news_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/news_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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
*
--- a/src/npf.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/npf.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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;
--- a/src/oldloader.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/oldloader.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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,
--- a/src/openttd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/openttd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/order_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/order_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/order_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/order_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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,
--- a/src/player_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/player_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/players.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/players.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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
--- a/src/rail_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/rail_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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] = {
--- a/src/rail_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/rail_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/road_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/road_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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))
--- a/src/road_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/road_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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);
--- a/src/roadveh.h Thu Dec 27 13:25:23 2007 +0000
+++ b/src/roadveh.h Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/roadveh_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/roadveh_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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] = {
--- a/src/roadveh_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/roadveh_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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
--- a/src/saveload.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/saveload.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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;
--- a/src/settings.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/settings.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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
--- a/src/settings_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/settings_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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;
--- a/src/ship.h Thu Dec 27 13:25:23 2007 +0000
+++ b/src/ship.h Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/ship_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/ship_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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};
--- a/src/ship_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/ship_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
{
--- a/src/smallmap_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/smallmap_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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[] = {
--- a/src/sound.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/sound.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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;
--- a/src/station.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/station.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/station_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/station_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/station_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/station_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/strings.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/strings.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/terraform_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/terraform_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/timetable_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/timetable_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/timetable_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/timetable_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
{
--- a/src/town_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/town_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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());
}
}
--- a/src/train.h Thu Dec 27 13:25:23 2007 +0000
+++ b/src/train.h Thu Dec 27 13:35:39 2007 +0000
@@ -6,7 +6,8 @@
#define TRAIN_H
#include "stdafx.h"
-#include "vehicle.h"
+#include "core/bitmath_func.hpp"
+#include "vehicle_base.h"
/*
--- a/src/train_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/train_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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);
--- a/src/train_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/train_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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;
--- a/src/tunnelbridge_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/tunnelbridge_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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[] = {
--- a/src/vehicle.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/vehicle.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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);
+ }
+}
--- a/src/vehicle.h Thu Dec 27 13:25:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,824 +0,0 @@
-/* $Id$ */
-
-/** @vehicle.h */
-
-#ifndef VEHICLE_H
-#define VEHICLE_H
-
-#include "vehicle_type.h"
-#include "track_type.h"
-#include "rail_type.h"
-#include "road_type.h"
-#include "cargo_type.h"
-#include "direction_type.h"
-#include "window_type.h"
-#include "gfx_type.h"
-#include "command_type.h"
-#include "date_type.h"
-#include "oldpool.h"
-#include "order.h"
-#include "cargopacket.h"
-#include "texteff.hpp"
-
-/** Road vehicle states */
-enum RoadVehicleStates {
- /*
- * Lower 4 bits are used for vehicle track direction. (Trackdirs)
- * When in a road stop (bit 5 or bit 6 set) these bits give the
- * track direction of the entry to the road stop.
- * As the entry direction will always be a diagonal
- * direction (X_NE, Y_SE, X_SW or Y_NW) only bits 0 and 3
- * are needed to hold this direction. Bit 1 is then used to show
- * that the vehicle is using the second road stop bay.
- * Bit 2 is then used for drive-through stops to show the vehicle
- * is stopping at this road stop.
- */
-
- /* Numeric values */
- RVSB_IN_DEPOT = 0xFE, ///< The vehicle is in a depot
- RVSB_WORMHOLE = 0xFF, ///< The vehicle is in a tunnel and/or bridge
-
- /* Bit numbers */
- RVS_USING_SECOND_BAY = 1, ///< Only used while in a road stop
- RVS_IS_STOPPING = 2, ///< Only used for drive-through stops. Vehicle will stop here
- RVS_DRIVE_SIDE = 4, ///< Only used when retrieving move data
- RVS_IN_ROAD_STOP = 5, ///< The vehicle is in a road stop
- RVS_IN_DT_ROAD_STOP = 6, ///< The vehicle is in a drive-through road stop
-
- /* Bit sets of the above specified bits */
- RVSB_IN_ROAD_STOP = 1 << RVS_IN_ROAD_STOP, ///< The vehicle is in a road stop
- RVSB_IN_ROAD_STOP_END = RVSB_IN_ROAD_STOP + TRACKDIR_END,
- RVSB_IN_DT_ROAD_STOP = 1 << RVS_IN_DT_ROAD_STOP, ///< The vehicle is in a drive-through road stop
- RVSB_IN_DT_ROAD_STOP_END = RVSB_IN_DT_ROAD_STOP + TRACKDIR_END,
-
- RVSB_TRACKDIR_MASK = 0x0F, ///< The mask used to extract track dirs
- RVSB_ROAD_STOP_TRACKDIR_MASK = 0x09 ///< Only bits 0 and 3 are used to encode the trackdir for road stops
-};
-
-enum VehStatus {
- VS_HIDDEN = 0x01,
- VS_STOPPED = 0x02,
- VS_UNCLICKABLE = 0x04,
- VS_DEFPAL = 0x08,
- VS_TRAIN_SLOWING = 0x10,
- VS_SHADOW = 0x20,
- VS_AIRCRAFT_BROKEN = 0x40,
- VS_CRASHED = 0x80,
-};
-
-enum VehicleFlags {
- VF_LOADING_FINISHED,
- VF_CARGO_UNLOADING,
- VF_BUILT_AS_PROTOTYPE,
- VF_TIMETABLE_STARTED, ///< Whether the vehicle has started running on the timetable yet.
- 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;
-
- /* cached values, recalculated on load and each time a vehicle is added to/removed from the consist. */
- uint16 cached_max_speed; // max speed of the consist. (minimum of the max speed of all vehicles in the consist)
- uint32 cached_power; // total power of the consist.
- uint8 cached_veh_length; // length of this vehicle in units of 1/8 of normal length, cached because this can be set by a callback
- uint16 cached_total_length; ///< Length of the whole train, valid only for first engine.
-
- /* cached values, recalculated when the cargo on a train changes (in addition to the conditions above) */
- uint32 cached_weight; // total weight of the consist.
- uint32 cached_veh_weight; // weight of the vehicle.
- uint32 cached_max_te; // max tractive effort of consist
- /**
- * Position/type of visual effect.
- * bit 0 - 3 = position of effect relative to vehicle. (0 = front, 8 = centre, 15 = rear)
- * bit 4 - 5 = type of effect. (0 = default for engine class, 1 = steam, 2 = diesel, 3 = electric)
- * bit 6 = disable visual effect.
- * bit 7 = disable powered wagons.
- */
- byte cached_vis_effect;
- byte user_def_data;
-
- /* NOSAVE: for wagon override - id of the first engine in train
- * 0xffff == not in train */
- EngineID first_engine;
-
- TrackBitsByte track;
- byte force_proceed;
- RailTypeByte railtype;
- RailTypeMask compatible_railtypes;
-
- byte flags;
-
- /* Link between the two ends of a multiheaded engine */
- Vehicle *other_multiheaded_part;
-
- /* Cached wagon override spritegroup */
- const struct SpriteGroup *cached_override;
-};
-
-enum {
- VRF_REVERSING = 0,
-
- /* used to calculate if train is going up or down */
- VRF_GOINGUP = 1,
- VRF_GOINGDOWN = 2,
-
- /* used to store if a wagon is powered or not */
- VRF_POWEREDWAGON = 3,
-
- /* used to reverse the visible direction of the vehicle */
- VRF_REVERSE_DIRECTION = 4,
-
- /* used to mark train as lost because PF can't find the route */
- VRF_NO_PATH_TO_DESTINATION = 5,
-
- /* used to mark that electric train engine is allowed to run on normal rail */
- VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL = 6,
-};
-
-struct VehicleAir {
- uint16 crashed_counter;
- uint16 cached_max_speed;
- byte pos;
- byte previous_pos;
- StationID targetairport;
- byte state;
-};
-
-struct VehicleRoad {
- byte state; ///< @see RoadVehicleStates
- byte frame;
- uint16 blocked_ctr;
- byte overtaking;
- byte overtaking_ctr;
- uint16 crashed_ctr;
- byte reverse_ctr;
- struct RoadStop *slot;
- byte slot_age;
- EngineID first_engine;
- byte cached_veh_length;
-
- RoadType roadtype;
- RoadTypes compatible_roadtypes;
-};
-
-struct VehicleSpecial {
- uint16 animation_state;
- byte animation_substate;
-};
-
-struct VehicleDisaster {
- uint16 image_override;
- VehicleID big_ufo_destroyer_target;
-};
-
-struct VehicleShip {
- TrackBitsByte state;
-};
-
-DECLARE_OLD_POOL(Vehicle, Vehicle, 9, 125)
-
-/* Some declarations of functions, so we can make them friendly */
-struct SaveLoad;
-extern const SaveLoad *GetVehicleDescription(VehicleType vt);
-extern void AfterLoadVehicles();
-struct LoadgameState;
-extern bool LoadOldVehicle(LoadgameState *ls, int num);
-
-struct Vehicle : PoolItem<Vehicle, VehicleID, &_Vehicle_pool> {
- VehicleTypeByte type; ///< Type of vehicle
- byte subtype; // subtype (Filled with values from EffectVehicles/TrainSubTypes/AircraftSubTypes)
-
-private:
- Vehicle *next; // pointer to the next vehicle in the chain
- Vehicle *previous; // NOSAVE: pointer to the previous vehicle in the chain
- Vehicle *first; // NOSAVE: pointer to the first vehicle in the chain
-public:
- friend const SaveLoad *GetVehicleDescription(VehicleType vt); // So we can use private/protected variables in the saveload code
- friend void AfterLoadVehicles(); // So we can set the previous and first pointers while loading
- friend bool LoadOldVehicle(LoadgameState *ls, int num); // So we can set the proper next pointer while loading
-
- Vehicle *depot_list; // NOSAVE: linked list to tell what vehicles entered a depot during the last tick. Used by autoreplace
-
- StringID string_id; // Displayed string
-
- UnitID unitnumber; // unit number, for display purposes only
- PlayerByte owner; // which player owns the vehicle?
-
- TileIndex tile; // Current tile index
- TileIndex dest_tile; // Heading for this tile
-
- int32 x_pos; // coordinates
- int32 y_pos;
- byte z_pos;
- DirectionByte direction; // facing
-
- byte spritenum; // currently displayed sprite index
- // 0xfd == custom sprite, 0xfe == custom second head sprite
- // 0xff == reserved for another custom sprite
- uint16 cur_image; // sprite number for this vehicle
- byte sprite_width; // width of vehicle sprite
- byte sprite_height; // height of vehicle sprite
- byte z_height; // z-height of vehicle sprite
- int8 x_offs; // x offset for vehicle sprite
- int8 y_offs; // y offset for vehicle sprite
- EngineID engine_type;
-
- TextEffectID fill_percent_te_id; // a text-effect id to a loading indicator object
-
- /* for randomized variational spritegroups
- * bitmask used to resolve them; parts of it get reseeded when triggers
- * of corresponding spritegroups get matched */
- byte random_bits;
- byte waiting_triggers; // triggers to be yet matched
-
- uint16 max_speed; // maximum speed
- uint16 cur_speed; // current speed
- byte subspeed; // fractional speed
- byte acceleration; // used by train & aircraft
- byte progress;
- uint32 motion_counter;
-
- byte vehstatus; // Status
- StationID last_station_visited;
-
- CargoID cargo_type; // type of cargo this vehicle is carrying
- uint16 cargo_cap; // total capacity
- byte cargo_subtype; ///< Used for livery refits (NewGRF variations)
- CargoList cargo; ///< The cargo this vehicle is carrying
-
-
- byte day_counter; // increased by one for each day
- byte tick_counter; // increased by one for each tick
-
- /* Begin Order-stuff */
- Order current_order; ///< The current order (+ status, like: loading)
- VehicleOrderID cur_order_index; ///< The index to the current order
-
- Order *orders; ///< Pointer to the first order for this vehicle
- VehicleOrderID num_orders; ///< How many orders there are in the list
-
- Vehicle *next_shared; ///< If not NULL, this points to the next vehicle that shared the order
- Vehicle *prev_shared; ///< If not NULL, this points to the prev vehicle that shared the order
- /* End Order-stuff */
-
- /* Boundaries for the current position in the world and a next hash link.
- * NOSAVE: All of those can be updated with VehiclePositionChanged() */
- int32 left_coord;
- int32 top_coord;
- int32 right_coord;
- int32 bottom_coord;
- Vehicle *next_hash;
- Vehicle *next_new_hash;
- Vehicle **old_new_hash;
-
- /* Related to age and service time */
- Date age; // Age in days
- Date max_age; // Maximum age
- Date date_of_last_service;
- Date service_interval;
- uint16 reliability;
- uint16 reliability_spd_dec;
- byte breakdown_ctr;
- byte breakdown_delay;
- byte breakdowns_since_last_service;
- byte breakdown_chance;
- Year build_year;
-
- bool leave_depot_instantly; // NOSAVE: stores if the vehicle needs to leave the depot it just entered. Used by autoreplace
-
- uint16 load_unload_time_rem;
- byte vehicle_flags; // Used for gradual loading and other miscellaneous things (@see VehicleFlags enum)
-
- Money profit_this_year;
- Money profit_last_year;
- Money value;
-
- GroupID group_id; ///< Index of group Pool array
-
- /* Used for timetabling. */
- uint32 current_order_time; ///< How many ticks have passed since this order started.
- int32 lateness_counter; ///< How many ticks late (or early if negative) this vehicle is.
-
- SpriteID colormap; // NOSAVE: cached color mapping
-
- union {
- VehicleRail rail;
- VehicleAir air;
- VehicleRoad road;
- VehicleSpecial special;
- VehicleDisaster disaster;
- VehicleShip ship;
- } u;
-
-
- /**
- * Allocates a lot of vehicles.
- * @param vl pointer to an array of vehicles to get allocated. Can be NULL if the vehicles aren't needed (makes it test only)
- * @param num number of vehicles to allocate room for
- * @return true if there is room to allocate all the vehicles
- */
- static bool AllocateList(Vehicle **vl, int num);
-
- /** Create a new vehicle */
- Vehicle();
-
- /** Destroy all stuff that (still) needs the virtual functions to work properly */
- void PreDestructor();
- /** We want to 'destruct' the right class. */
- virtual ~Vehicle();
-
- void BeginLoading();
- void LeaveStation();
-
- /**
- * Handle the loading of the vehicle; when not it skips through dummy
- * orders and does nothing in all other cases.
- * @param mode is the non-first call for this vehicle in this tick?
- */
- void HandleLoading(bool mode = false);
-
- /**
- * Get a string 'representation' of the vehicle type.
- * @return the string representation.
- */
- virtual const char* GetTypeString() const { return "base vehicle"; }
-
- /**
- * Marks the vehicles to be redrawn and updates cached variables
- *
- * This method marks the area of the vehicle on the screen as dirty.
- * It can be use to repaint the vehicle.
- *
- * @ingroup dirty
- */
- virtual void MarkDirty() {}
-
- /**
- * Updates the x and y offsets and the size of the sprite used
- * for this vehicle.
- * @param direction the direction the vehicle is facing
- */
- virtual void UpdateDeltaXY(Direction direction) {}
-
- /**
- * Sets the expense type associated to this vehicle type
- * @param income whether this is income or (running) expenses of the vehicle
- */
- virtual ExpensesType GetExpenseType(bool income) const { return EXPENSES_OTHER; }
-
- /**
- * Invalidates the vehicle list window of this type of vehicle
- */
- virtual WindowClass GetVehicleListWindowClass() const { return WC_NONE; }
-
- /**
- * Play the sound associated with leaving the station
- */
- virtual void PlayLeaveStationSound() const {}
-
- /**
- * Whether this is the primary vehicle in the chain.
- */
- virtual bool IsPrimaryVehicle() const { return false; }
-
- /**
- * Gets the sprite to show for the given direction
- * @param direction the direction the vehicle is facing
- * @return the sprite for the given vehicle in the given direction
- */
- virtual int GetImage(Direction direction) const { return 0; }
-
- /**
- * Gets the speed in mph that can be sent into SetDParam for string processing.
- * @return the vehicle's speed
- */
- virtual int GetDisplaySpeed() const { return 0; }
-
- /**
- * Gets the maximum speed in mph that can be sent into SetDParam for string processing.
- * @return the vehicle's maximum speed
- */
- virtual int GetDisplayMaxSpeed() const { return 0; }
-
- /**
- * Gets the running cost of a vehicle
- * @return the vehicle's running cost
- */
- virtual Money GetRunningCost() const { return 0; }
-
- /**
- * Check whether the vehicle is in the depot.
- * @return true if and only if the vehicle is in the depot.
- */
- virtual bool IsInDepot() const { return false; }
-
- /**
- * Check whether the vehicle is in the depot *and* stopped.
- * @return true if and only if the vehicle is in the depot and stopped.
- */
- virtual bool IsStoppedInDepot() const { return this->IsInDepot() && (this->vehstatus & VS_STOPPED) != 0; }
-
- /**
- * Calls the tick handler of the vehicle
- */
- virtual void Tick() {};
-
- /**
- * Gets the running cost of a vehicle that can be sent into SetDParam for string processing.
- * @return the vehicle's running cost
- */
- 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.
- */
- void SetNext(Vehicle *next);
-
- /**
- * Get the next vehicle of this vehicle.
- * @note articulated parts are also counted as vehicles.
- * @return the next vehicle or NULL when there isn't a next vehicle.
- */
- inline Vehicle *Next() const { return this->next; }
-
- /**
- * Get the previous vehicle of this vehicle.
- * @note articulated parts are also counted as vehicles.
- * @return the previous vehicle or NULL when there isn't a previous vehicle.
- */
- inline Vehicle *Previous() const { return this->previous; }
-
- /**
- * Get the first vehicle of this vehicle chain.
- * @return the first vehicle of the chain.
- */
- inline Vehicle *First() const { return this->first; }
-};
-
-/**
- * This class 'wraps' Vehicle; you do not actually instantiate this class.
- * You create a Vehicle using AllocateVehicle, so it is added to the pool
- * and you reinitialize that to a Train using:
- * v = new (v) Train();
- *
- * As side-effect the vehicle type is set correctly.
- *
- * A special vehicle is one of the following:
- * - smoke
- * - electric sparks for trains
- * - explosions
- * - bulldozer (road works)
- * - bubbles (industry)
- */
-struct SpecialVehicle : public Vehicle {
- /** Initializes the Vehicle to a special vehicle */
- SpecialVehicle() { this->type = VEH_SPECIAL; }
-
- /** We want to 'destruct' the right class. */
- virtual ~SpecialVehicle() {}
-
- const char *GetTypeString() const { return "special vehicle"; }
- void UpdateDeltaXY(Direction direction);
- void Tick();
-};
-
-/**
- * This class 'wraps' Vehicle; you do not actually instantiate this class.
- * You create a Vehicle using AllocateVehicle, so it is added to the pool
- * and you reinitialize that to a Train using:
- * v = new (v) Train();
- *
- * As side-effect the vehicle type is set correctly.
- */
-struct DisasterVehicle : public Vehicle {
- /** Initializes the Vehicle to a disaster vehicle */
- DisasterVehicle() { this->type = VEH_DISASTER; }
-
- /** We want to 'destruct' the right class. */
- virtual ~DisasterVehicle() {}
-
- const char *GetTypeString() const { return "disaster vehicle"; }
- void UpdateDeltaXY(Direction direction);
- void Tick();
-};
-
-/**
- * This class 'wraps' Vehicle; you do not actually instantiate this class.
- * You create a Vehicle using AllocateVehicle, so it is added to the pool
- * and you reinitialize that to a Train using:
- * v = new (v) Train();
- *
- * As side-effect the vehicle type is set correctly.
- */
-struct InvalidVehicle : public Vehicle {
- /** Initializes the Vehicle to a invalid vehicle */
- InvalidVehicle() { this->type = VEH_INVALID; }
-
- /** We want to 'destruct' the right class. */
- virtual ~InvalidVehicle() {}
-
- const char *GetTypeString() const { return "invalid 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);
-
-static inline VehicleID GetMaxVehicleIndex()
-{
- /* TODO - This isn't the real content of the function, but
- * with the new pool-system this will be replaced with one that
- * _really_ returns the highest index. Now it just returns
- * the next safe value we are sure about everything is below.
- */
- return GetVehiclePoolSize() - 1;
-}
-
-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)
-
-/**
- * Check if an index is a vehicle-index (so between 0 and max-vehicles)
- * @param index of the vehicle to query
- * @return Returns true if the vehicle-id is in range
- */
-static inline bool IsValidVehicleID(uint index)
-{
- return index < GetVehiclePoolSize() && GetVehicle(index)->IsValid();
-}
-
-/* Returns order 'index' of a vehicle or NULL when it doesn't exists */
-static inline Order *GetVehicleOrder(const Vehicle *v, int index)
-{
- Order *order = v->orders;
-
- if (index < 0) return NULL;
-
- while (order != NULL && index-- > 0)
- order = order->next;
-
- return order;
-}
-
-/**
- * Returns the last order of a vehicle, or NULL if it doesn't exists
- * @param v Vehicle to query
- * @return last order of a vehicle, if available
- */
-static inline Order *GetLastVehicleOrder(const Vehicle *v)
-{
- Order *order = v->orders;
-
- if (order == NULL) return NULL;
-
- while (order->next != NULL)
- order = order->next;
-
- return order;
-}
-
-/** Get the first vehicle of a shared-list, so we only have to walk forwards
- * @param v Vehicle to query
- * @return first vehicle of a shared-list
- */
-static inline Vehicle *GetFirstVehicleFromSharedList(const Vehicle *v)
-{
- Vehicle *u = (Vehicle *)v;
- while (u->prev_shared != NULL) u = u->prev_shared;
-
- 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
- */
-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 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 */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/vehicle_base.h Thu Dec 27 13:35:39 2007 +0000
@@ -0,0 +1,613 @@
+/* $Id$ */
+
+/** @file vehicle_base.h Base class for all vehicles. */
+
+#ifndef VEHICLE_BASE_H
+#define VEHICLE_BASE_H
+
+#include "vehicle_type.h"
+#include "track_type.h"
+#include "rail_type.h"
+#include "road_type.h"
+#include "cargo_type.h"
+#include "direction_type.h"
+#include "window_type.h"
+#include "gfx_type.h"
+#include "command_type.h"
+#include "date_type.h"
+#include "oldpool.h"
+#include "order.h"
+#include "cargopacket.h"
+#include "texteff.hpp"
+
+/** Road vehicle states */
+enum RoadVehicleStates {
+ /*
+ * Lower 4 bits are used for vehicle track direction. (Trackdirs)
+ * When in a road stop (bit 5 or bit 6 set) these bits give the
+ * track direction of the entry to the road stop.
+ * As the entry direction will always be a diagonal
+ * direction (X_NE, Y_SE, X_SW or Y_NW) only bits 0 and 3
+ * are needed to hold this direction. Bit 1 is then used to show
+ * that the vehicle is using the second road stop bay.
+ * Bit 2 is then used for drive-through stops to show the vehicle
+ * is stopping at this road stop.
+ */
+
+ /* Numeric values */
+ RVSB_IN_DEPOT = 0xFE, ///< The vehicle is in a depot
+ RVSB_WORMHOLE = 0xFF, ///< The vehicle is in a tunnel and/or bridge
+
+ /* Bit numbers */
+ RVS_USING_SECOND_BAY = 1, ///< Only used while in a road stop
+ RVS_IS_STOPPING = 2, ///< Only used for drive-through stops. Vehicle will stop here
+ RVS_DRIVE_SIDE = 4, ///< Only used when retrieving move data
+ RVS_IN_ROAD_STOP = 5, ///< The vehicle is in a road stop
+ RVS_IN_DT_ROAD_STOP = 6, ///< The vehicle is in a drive-through road stop
+
+ /* Bit sets of the above specified bits */
+ RVSB_IN_ROAD_STOP = 1 << RVS_IN_ROAD_STOP, ///< The vehicle is in a road stop
+ RVSB_IN_ROAD_STOP_END = RVSB_IN_ROAD_STOP + TRACKDIR_END,
+ RVSB_IN_DT_ROAD_STOP = 1 << RVS_IN_DT_ROAD_STOP, ///< The vehicle is in a drive-through road stop
+ RVSB_IN_DT_ROAD_STOP_END = RVSB_IN_DT_ROAD_STOP + TRACKDIR_END,
+
+ RVSB_TRACKDIR_MASK = 0x0F, ///< The mask used to extract track dirs
+ RVSB_ROAD_STOP_TRACKDIR_MASK = 0x09 ///< Only bits 0 and 3 are used to encode the trackdir for road stops
+};
+
+enum VehStatus {
+ VS_HIDDEN = 0x01,
+ VS_STOPPED = 0x02,
+ VS_UNCLICKABLE = 0x04,
+ VS_DEFPAL = 0x08,
+ VS_TRAIN_SLOWING = 0x10,
+ VS_SHADOW = 0x20,
+ VS_AIRCRAFT_BROKEN = 0x40,
+ VS_CRASHED = 0x80,
+};
+
+enum VehicleFlags {
+ VF_LOADING_FINISHED,
+ VF_CARGO_UNLOADING,
+ VF_BUILT_AS_PROTOTYPE,
+ VF_TIMETABLE_STARTED, ///< Whether the vehicle has started running on the timetable yet.
+ VF_AUTOFILL_TIMETABLE, ///< Whether the vehicle should fill in the timetable automatically.
+};
+
+struct VehicleRail {
+ uint16 last_speed; // NOSAVE: only used in UI
+ uint16 crash_anim_pos;
+
+ /* cached values, recalculated on load and each time a vehicle is added to/removed from the consist. */
+ uint16 cached_max_speed; // max speed of the consist. (minimum of the max speed of all vehicles in the consist)
+ uint32 cached_power; // total power of the consist.
+ uint8 cached_veh_length; // length of this vehicle in units of 1/8 of normal length, cached because this can be set by a callback
+ uint16 cached_total_length; ///< Length of the whole train, valid only for first engine.
+
+ /* cached values, recalculated when the cargo on a train changes (in addition to the conditions above) */
+ uint32 cached_weight; // total weight of the consist.
+ uint32 cached_veh_weight; // weight of the vehicle.
+ uint32 cached_max_te; // max tractive effort of consist
+ /**
+ * Position/type of visual effect.
+ * bit 0 - 3 = position of effect relative to vehicle. (0 = front, 8 = centre, 15 = rear)
+ * bit 4 - 5 = type of effect. (0 = default for engine class, 1 = steam, 2 = diesel, 3 = electric)
+ * bit 6 = disable visual effect.
+ * bit 7 = disable powered wagons.
+ */
+ byte cached_vis_effect;
+ byte user_def_data;
+
+ /* NOSAVE: for wagon override - id of the first engine in train
+ * 0xffff == not in train */
+ EngineID first_engine;
+
+ TrackBitsByte track;
+ byte force_proceed;
+ RailTypeByte railtype;
+ RailTypeMask compatible_railtypes;
+
+ byte flags;
+
+ /* Link between the two ends of a multiheaded engine */
+ Vehicle *other_multiheaded_part;
+
+ /* Cached wagon override spritegroup */
+ const struct SpriteGroup *cached_override;
+};
+
+enum {
+ VRF_REVERSING = 0,
+
+ /* used to calculate if train is going up or down */
+ VRF_GOINGUP = 1,
+ VRF_GOINGDOWN = 2,
+
+ /* used to store if a wagon is powered or not */
+ VRF_POWEREDWAGON = 3,
+
+ /* used to reverse the visible direction of the vehicle */
+ VRF_REVERSE_DIRECTION = 4,
+
+ /* used to mark train as lost because PF can't find the route */
+ VRF_NO_PATH_TO_DESTINATION = 5,
+
+ /* used to mark that electric train engine is allowed to run on normal rail */
+ VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL = 6,
+};
+
+struct VehicleAir {
+ uint16 crashed_counter;
+ uint16 cached_max_speed;
+ byte pos;
+ byte previous_pos;
+ StationID targetairport;
+ byte state;
+};
+
+struct VehicleRoad {
+ byte state; ///< @see RoadVehicleStates
+ byte frame;
+ uint16 blocked_ctr;
+ byte overtaking;
+ byte overtaking_ctr;
+ uint16 crashed_ctr;
+ byte reverse_ctr;
+ struct RoadStop *slot;
+ byte slot_age;
+ EngineID first_engine;
+ byte cached_veh_length;
+
+ RoadType roadtype;
+ RoadTypes compatible_roadtypes;
+};
+
+struct VehicleSpecial {
+ uint16 animation_state;
+ byte animation_substate;
+};
+
+struct VehicleDisaster {
+ uint16 image_override;
+ VehicleID big_ufo_destroyer_target;
+};
+
+struct VehicleShip {
+ TrackBitsByte state;
+};
+
+DECLARE_OLD_POOL(Vehicle, Vehicle, 9, 125)
+
+/* Some declarations of functions, so we can make them friendly */
+struct SaveLoad;
+extern const SaveLoad *GetVehicleDescription(VehicleType vt);
+extern void AfterLoadVehicles();
+struct LoadgameState;
+extern bool LoadOldVehicle(LoadgameState *ls, int num);
+
+struct Vehicle : PoolItem<Vehicle, VehicleID, &_Vehicle_pool>, BaseVehicle {
+ byte subtype; // subtype (Filled with values from EffectVehicles/TrainSubTypes/AircraftSubTypes)
+
+private:
+ Vehicle *next; // pointer to the next vehicle in the chain
+ Vehicle *previous; // NOSAVE: pointer to the previous vehicle in the chain
+ Vehicle *first; // NOSAVE: pointer to the first vehicle in the chain
+public:
+ friend const SaveLoad *GetVehicleDescription(VehicleType vt); // So we can use private/protected variables in the saveload code
+ friend void AfterLoadVehicles(); // So we can set the previous and first pointers while loading
+ friend bool LoadOldVehicle(LoadgameState *ls, int num); // So we can set the proper next pointer while loading
+
+ Vehicle *depot_list; // NOSAVE: linked list to tell what vehicles entered a depot during the last tick. Used by autoreplace
+
+ StringID string_id; // Displayed string
+
+ UnitID unitnumber; // unit number, for display purposes only
+ PlayerByte owner; // which player owns the vehicle?
+
+ TileIndex tile; // Current tile index
+ TileIndex dest_tile; // Heading for this tile
+
+ int32 x_pos; // coordinates
+ int32 y_pos;
+ byte z_pos;
+ DirectionByte direction; // facing
+
+ byte spritenum; // currently displayed sprite index
+ // 0xfd == custom sprite, 0xfe == custom second head sprite
+ // 0xff == reserved for another custom sprite
+ uint16 cur_image; // sprite number for this vehicle
+ byte sprite_width; // width of vehicle sprite
+ byte sprite_height; // height of vehicle sprite
+ byte z_height; // z-height of vehicle sprite
+ int8 x_offs; // x offset for vehicle sprite
+ int8 y_offs; // y offset for vehicle sprite
+ EngineID engine_type;
+
+ TextEffectID fill_percent_te_id; // a text-effect id to a loading indicator object
+
+ /* for randomized variational spritegroups
+ * bitmask used to resolve them; parts of it get reseeded when triggers
+ * of corresponding spritegroups get matched */
+ byte random_bits;
+ byte waiting_triggers; // triggers to be yet matched
+
+ uint16 max_speed; // maximum speed
+ uint16 cur_speed; // current speed
+ byte subspeed; // fractional speed
+ byte acceleration; // used by train & aircraft
+ byte progress;
+ uint32 motion_counter;
+
+ byte vehstatus; // Status
+ StationID last_station_visited;
+
+ CargoID cargo_type; // type of cargo this vehicle is carrying
+ uint16 cargo_cap; // total capacity
+ byte cargo_subtype; ///< Used for livery refits (NewGRF variations)
+ CargoList cargo; ///< The cargo this vehicle is carrying
+
+
+ byte day_counter; // increased by one for each day
+ byte tick_counter; // increased by one for each tick
+
+ /* Begin Order-stuff */
+ Order current_order; ///< The current order (+ status, like: loading)
+ VehicleOrderID cur_order_index; ///< The index to the current order
+
+ Order *orders; ///< Pointer to the first order for this vehicle
+ VehicleOrderID num_orders; ///< How many orders there are in the list
+
+ Vehicle *next_shared; ///< If not NULL, this points to the next vehicle that shared the order
+ Vehicle *prev_shared; ///< If not NULL, this points to the prev vehicle that shared the order
+ /* End Order-stuff */
+
+ /* Boundaries for the current position in the world and a next hash link.
+ * NOSAVE: All of those can be updated with VehiclePositionChanged() */
+ int32 left_coord;
+ int32 top_coord;
+ int32 right_coord;
+ int32 bottom_coord;
+ Vehicle *next_hash;
+ Vehicle *next_new_hash;
+ Vehicle **old_new_hash;
+
+ /* Related to age and service time */
+ Date age; // Age in days
+ Date max_age; // Maximum age
+ Date date_of_last_service;
+ Date service_interval;
+ uint16 reliability;
+ uint16 reliability_spd_dec;
+ byte breakdown_ctr;
+ byte breakdown_delay;
+ byte breakdowns_since_last_service;
+ byte breakdown_chance;
+ Year build_year;
+
+ bool leave_depot_instantly; // NOSAVE: stores if the vehicle needs to leave the depot it just entered. Used by autoreplace
+
+ uint16 load_unload_time_rem;
+ byte vehicle_flags; // Used for gradual loading and other miscellaneous things (@see VehicleFlags enum)
+
+ Money profit_this_year;
+ Money profit_last_year;
+ Money value;
+
+ GroupID group_id; ///< Index of group Pool array
+
+ /* Used for timetabling. */
+ uint32 current_order_time; ///< How many ticks have passed since this order started.
+ int32 lateness_counter; ///< How many ticks late (or early if negative) this vehicle is.
+
+ SpriteID colormap; // NOSAVE: cached color mapping
+
+ union {
+ VehicleRail rail;
+ VehicleAir air;
+ VehicleRoad road;
+ VehicleSpecial special;
+ VehicleDisaster disaster;
+ VehicleShip ship;
+ } u;
+
+
+ /**
+ * Allocates a lot of vehicles.
+ * @param vl pointer to an array of vehicles to get allocated. Can be NULL if the vehicles aren't needed (makes it test only)
+ * @param num number of vehicles to allocate room for
+ * @return true if there is room to allocate all the vehicles
+ */
+ static bool AllocateList(Vehicle **vl, int num);
+
+ /** Create a new vehicle */
+ Vehicle();
+
+ /** Destroy all stuff that (still) needs the virtual functions to work properly */
+ void PreDestructor();
+ /** We want to 'destruct' the right class. */
+ virtual ~Vehicle();
+
+ void BeginLoading();
+ void LeaveStation();
+
+ /**
+ * Handle the loading of the vehicle; when not it skips through dummy
+ * orders and does nothing in all other cases.
+ * @param mode is the non-first call for this vehicle in this tick?
+ */
+ void HandleLoading(bool mode = false);
+
+ /**
+ * Get a string 'representation' of the vehicle type.
+ * @return the string representation.
+ */
+ virtual const char* GetTypeString() const { return "base vehicle"; }
+
+ /**
+ * Marks the vehicles to be redrawn and updates cached variables
+ *
+ * This method marks the area of the vehicle on the screen as dirty.
+ * It can be use to repaint the vehicle.
+ *
+ * @ingroup dirty
+ */
+ virtual void MarkDirty() {}
+
+ /**
+ * Updates the x and y offsets and the size of the sprite used
+ * for this vehicle.
+ * @param direction the direction the vehicle is facing
+ */
+ virtual void UpdateDeltaXY(Direction direction) {}
+
+ /**
+ * Sets the expense type associated to this vehicle type
+ * @param income whether this is income or (running) expenses of the vehicle
+ */
+ virtual ExpensesType GetExpenseType(bool income) const { return EXPENSES_OTHER; }
+
+ /**
+ * Invalidates the vehicle list window of this type of vehicle
+ */
+ virtual WindowClass GetVehicleListWindowClass() const { return WC_NONE; }
+
+ /**
+ * Play the sound associated with leaving the station
+ */
+ virtual void PlayLeaveStationSound() const {}
+
+ /**
+ * Whether this is the primary vehicle in the chain.
+ */
+ virtual bool IsPrimaryVehicle() const { return false; }
+
+ /**
+ * Gets the sprite to show for the given direction
+ * @param direction the direction the vehicle is facing
+ * @return the sprite for the given vehicle in the given direction
+ */
+ virtual int GetImage(Direction direction) const { return 0; }
+
+ /**
+ * Gets the speed in mph that can be sent into SetDParam for string processing.
+ * @return the vehicle's speed
+ */
+ virtual int GetDisplaySpeed() const { return 0; }
+
+ /**
+ * Gets the maximum speed in mph that can be sent into SetDParam for string processing.
+ * @return the vehicle's maximum speed
+ */
+ virtual int GetDisplayMaxSpeed() const { return 0; }
+
+ /**
+ * Gets the running cost of a vehicle
+ * @return the vehicle's running cost
+ */
+ virtual Money GetRunningCost() const { return 0; }
+
+ /**
+ * Check whether the vehicle is in the depot.
+ * @return true if and only if the vehicle is in the depot.
+ */
+ virtual bool IsInDepot() const { return false; }
+
+ /**
+ * Check whether the vehicle is in the depot *and* stopped.
+ * @return true if and only if the vehicle is in the depot and stopped.
+ */
+ virtual bool IsStoppedInDepot() const { return this->IsInDepot() && (this->vehstatus & VS_STOPPED) != 0; }
+
+ /**
+ * Calls the tick handler of the vehicle
+ */
+ virtual void Tick() {};
+
+ /**
+ * Gets the running cost of a vehicle that can be sent into SetDParam for string processing.
+ * @return the vehicle's running cost
+ */
+ Money GetDisplayRunningCost() const { return (this->GetRunningCost() >> 8); }
+
+ /**
+ * Set the next vehicle of this vehicle.
+ * @param next the next vehicle. NULL removes the next vehicle.
+ */
+ void SetNext(Vehicle *next);
+
+ /**
+ * Get the next vehicle of this vehicle.
+ * @note articulated parts are also counted as vehicles.
+ * @return the next vehicle or NULL when there isn't a next vehicle.
+ */
+ inline Vehicle *Next() const { return this->next; }
+
+ /**
+ * Get the previous vehicle of this vehicle.
+ * @note articulated parts are also counted as vehicles.
+ * @return the previous vehicle or NULL when there isn't a previous vehicle.
+ */
+ inline Vehicle *Previous() const { return this->previous; }
+
+ /**
+ * Get the first vehicle of this vehicle chain.
+ * @return the first vehicle of the chain.
+ */
+ inline Vehicle *First() const { return this->first; }
+};
+
+/**
+ * This class 'wraps' Vehicle; you do not actually instantiate this class.
+ * You create a Vehicle using AllocateVehicle, so it is added to the pool
+ * and you reinitialize that to a Train using:
+ * v = new (v) Train();
+ *
+ * As side-effect the vehicle type is set correctly.
+ *
+ * A special vehicle is one of the following:
+ * - smoke
+ * - electric sparks for trains
+ * - explosions
+ * - bulldozer (road works)
+ * - bubbles (industry)
+ */
+struct SpecialVehicle : public Vehicle {
+ /** Initializes the Vehicle to a special vehicle */
+ SpecialVehicle() { this->type = VEH_SPECIAL; }
+
+ /** We want to 'destruct' the right class. */
+ virtual ~SpecialVehicle() {}
+
+ const char *GetTypeString() const { return "special vehicle"; }
+ void UpdateDeltaXY(Direction direction);
+ void Tick();
+};
+
+/**
+ * This class 'wraps' Vehicle; you do not actually instantiate this class.
+ * You create a Vehicle using AllocateVehicle, so it is added to the pool
+ * and you reinitialize that to a Train using:
+ * v = new (v) Train();
+ *
+ * As side-effect the vehicle type is set correctly.
+ */
+struct DisasterVehicle : public Vehicle {
+ /** Initializes the Vehicle to a disaster vehicle */
+ DisasterVehicle() { this->type = VEH_DISASTER; }
+
+ /** We want to 'destruct' the right class. */
+ virtual ~DisasterVehicle() {}
+
+ const char *GetTypeString() const { return "disaster vehicle"; }
+ void UpdateDeltaXY(Direction direction);
+ void Tick();
+};
+
+/**
+ * This class 'wraps' Vehicle; you do not actually instantiate this class.
+ * You create a Vehicle using AllocateVehicle, so it is added to the pool
+ * and you reinitialize that to a Train using:
+ * v = new (v) Train();
+ *
+ * As side-effect the vehicle type is set correctly.
+ */
+struct InvalidVehicle : public Vehicle {
+ /** Initializes the Vehicle to a invalid vehicle */
+ InvalidVehicle() { this->type = VEH_INVALID; }
+
+ /** We want to 'destruct' the right class. */
+ virtual ~InvalidVehicle() {}
+
+ const char *GetTypeString() const { return "invalid vehicle"; }
+ void Tick() {}
+};
+
+#define BEGIN_ENUM_WAGONS(v) do {
+#define END_ENUM_WAGONS(v) } while ((v = v->Next()) != NULL);
+
+static inline VehicleID GetMaxVehicleIndex()
+{
+ /* TODO - This isn't the real content of the function, but
+ * with the new pool-system this will be replaced with one that
+ * _really_ returns the highest index. Now it just returns
+ * the next safe value we are sure about everything is below.
+ */
+ return GetVehiclePoolSize() - 1;
+}
+
+static inline uint GetNumVehicles()
+{
+ return GetVehiclePoolSize();
+}
+
+#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)
+
+/**
+ * Check if an index is a vehicle-index (so between 0 and max-vehicles)
+ * @param index of the vehicle to query
+ * @return Returns true if the vehicle-id is in range
+ */
+static inline bool IsValidVehicleID(uint index)
+{
+ return index < GetVehiclePoolSize() && GetVehicle(index)->IsValid();
+}
+
+/* Returns order 'index' of a vehicle or NULL when it doesn't exists */
+static inline Order *GetVehicleOrder(const Vehicle *v, int index)
+{
+ Order *order = v->orders;
+
+ if (index < 0) return NULL;
+
+ while (order != NULL && index-- > 0)
+ order = order->next;
+
+ return order;
+}
+
+/**
+ * Returns the last order of a vehicle, or NULL if it doesn't exists
+ * @param v Vehicle to query
+ * @return last order of a vehicle, if available
+ */
+static inline Order *GetLastVehicleOrder(const Vehicle *v)
+{
+ Order *order = v->orders;
+
+ if (order == NULL) return NULL;
+
+ while (order->next != NULL)
+ order = order->next;
+
+ return order;
+}
+
+/** Get the first vehicle of a shared-list, so we only have to walk forwards
+ * @param v Vehicle to query
+ * @return first vehicle of a shared-list
+ */
+static inline Vehicle *GetFirstVehicleFromSharedList(const Vehicle *v)
+{
+ Vehicle *u = (Vehicle *)v;
+ while (u->prev_shared != NULL) u = u->prev_shared;
+
+ return u;
+}
+
+/**
+ * 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);
+
+void CheckVehicle32Day(Vehicle *v);
+
+#endif /* VEHICLE_BASE_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/vehicle_func.h Thu Dec 27 13:35:39 2007 +0000
@@ -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 */
--- a/src/vehicle_gui.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/vehicle_gui.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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 @@
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 @@
} 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();
+ }
+}
--- a/src/vehicle_gui.h Thu Dec 27 13:25:23 2007 +0000
+++ b/src/vehicle_gui.h Thu Dec 27 13:35:39 2007 +0000
@@ -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 @@
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 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)
{
--- a/src/vehicle_type.h Thu Dec 27 13:25:23 2007 +0000
+++ b/src/vehicle_type.h Thu Dec 27 13:35:39 2007 +0000
@@ -25,4 +25,31 @@
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 */
--- a/src/viewport.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/viewport.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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)
--- a/src/water_cmd.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/water_cmd.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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[] = {
--- a/src/waypoint.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/waypoint.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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,
--- a/src/window.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/window.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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;
--- a/src/yapf/yapf.hpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/yapf/yapf.hpp Thu Dec 27 13:35:39 2007 +0000
@@ -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"
--- a/src/yapf/yapf_rail.cpp Thu Dec 27 13:25:23 2007 +0000
+++ b/src/yapf/yapf_rail.cpp Thu Dec 27 13:35:39 2007 +0000
@@ -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