summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2007-01-21 22:57:52 +0000
committerbjarni <bjarni@openttd.org>2007-01-21 22:57:52 +0000
commitd82ae7427dfec4651ea4f17fc48a3958146c32ea (patch)
treec7c2bf4d3d49fd5660c122673121d7bc9fe91032 /src
parentb60e5c17cdfe0b2000260d3fb19db38867ff5e39 (diff)
downloadopenttd-d82ae7427dfec4651ea4f17fc48a3958146c32ea.tar.xz
(svn r8332) -Codechange: moved DrawAircraftImage() and CcBuildAircraft() from build_vehicle_gui.cpp to aircraft_gui.cpp
Diffstat (limited to 'src')
-rw-r--r--src/aircraft.h1
-rw-r--r--src/aircraft_gui.cpp26
-rw-r--r--src/build_vehicle_gui.cpp27
3 files changed, 27 insertions, 27 deletions
diff --git a/src/aircraft.h b/src/aircraft.h
index 15d2bbe27..4b92d38e3 100644
--- a/src/aircraft.h
+++ b/src/aircraft.h
@@ -20,6 +20,7 @@ static inline bool IsAircraftInHangarStopped(const Vehicle* v)
uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type);
+void CcBuildAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2);
void CcCloneAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2);
void HandleAircraftEnterHangar(Vehicle *v);
diff --git a/src/aircraft_gui.cpp b/src/aircraft_gui.cpp
index f9e49b9a9..b5b2f95e3 100644
--- a/src/aircraft_gui.cpp
+++ b/src/aircraft_gui.cpp
@@ -20,6 +20,32 @@
#include "vehicle_gui.h"
#include "newgrf_engine.h"
+void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection)
+{
+ SpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
+ DrawSprite(GetAircraftImage(v, DIR_W), pal, x + 25, y + 10);
+ if (v->subtype == 0) {
+ SpriteID rotor_sprite = GetCustomRotorSprite(v, true);
+ if (rotor_sprite == 0) rotor_sprite = SPR_ROTOR_STOPPED;
+ DrawSprite(rotor_sprite, PAL_NONE, x + 25, y + 5);
+ }
+ if (v->index == selection) {
+ DrawFrameRect(x - 1, y - 1, x + 58, y + 21, 0xF, FR_BORDERONLY);
+ }
+}
+
+void CcBuildAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2)
+{
+ if (success) {
+ const Vehicle *v = GetVehicle(_new_vehicle_id);
+
+ if (v->tile == _backup_orders_tile) {
+ _backup_orders_tile = 0;
+ RestoreVehicleOrders(v, _backup_orders_data);
+ }
+ ShowAircraftViewWindow(v);
+ }
+}
void CcCloneAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2)
{
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index c22bbd9a1..2b00aea00 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -488,33 +488,6 @@ void DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number)
}
}
-void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection)
-{
- SpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
- DrawSprite(GetAircraftImage(v, DIR_W), pal, x + 25, y + 10);
- if (v->subtype == 0) {
- SpriteID rotor_sprite = GetCustomRotorSprite(v, true);
- if (rotor_sprite == 0) rotor_sprite = SPR_ROTOR_STOPPED;
- DrawSprite(rotor_sprite, PAL_NONE, x + 25, y + 5);
- }
- if (v->index == selection) {
- DrawFrameRect(x - 1, y - 1, x + 58, y + 21, 0xF, FR_BORDERONLY);
- }
-}
-
-void CcBuildAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2)
-{
- if (success) {
- const Vehicle *v = GetVehicle(_new_vehicle_id);
-
- if (v->tile == _backup_orders_tile) {
- _backup_orders_tile = 0;
- RestoreVehicleOrders(v, _backup_orders_data);
- }
- ShowAircraftViewWindow(v);
- }
-}
-
/* Figure out what train EngineIDs to put in the list */
static void GenerateBuildTrainList(Window *w)
{