summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2009-05-22 19:47:26 +0000
committerfrosch <frosch@openttd.org>2009-05-22 19:47:26 +0000
commit09d64ff79dfb8dd52355fe269a582fe75b2615e0 (patch)
treef7763a70cff0fa55636b71f06cc14ad253377248
parent74ea34ca669b5027003a6c760c59903b69ddbee8 (diff)
downloadopenttd-09d64ff79dfb8dd52355fe269a582fe75b2615e0.tar.xz
(svn r16386) -Codechange: Move ShowAdditionalText() to build_vehicle_gui and make it static.
-rw-r--r--src/build_vehicle_gui.cpp22
-rw-r--r--src/vehicle_gui.cpp14
-rw-r--r--src/vehicle_gui.h1
3 files changed, 22 insertions, 15 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 955f5f3ad..72cfb0a29 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -12,6 +12,7 @@
#include "company_func.h"
#include "vehicle_gui.h"
#include "newgrf_engine.h"
+#include "newgrf_text.h"
#include "group.h"
#include "strings_func.h"
#include "window_func.h"
@@ -591,6 +592,27 @@ static int DrawAircraftPurchaseInfo(int left, int right, int y, EngineID engine_
}
/**
+ * Display additional text from NewGRF in the purchase information window
+ * @param left Left border of text bounding box
+ * @param right Right border of text bounding box
+ * @param y Top border of text bounding box
+ * @param engine Engine to query the additional purchase information for
+ * @return Bottom border of text bounding box
+ */
+static uint ShowAdditionalText(int left, int right, int y, EngineID engine)
+{
+ uint16 callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, NULL);
+ if (callback == CALLBACK_FAILED) return y;
+
+ /* STR_BLACK_STRING is used to start the string with {BLACK} */
+ SetDParam(0, GetGRFStringID(GetEngineGRFID(engine), 0xD000 + callback));
+ PrepareTextRefStackUsage(0);
+ uint result = DrawStringMultiLine(left, right, y, INT32_MAX, STR_BLACK_STRING);
+ StopTextRefStackUsage();
+ return result;
+}
+
+/**
* Draw the purchase info details of a vehicle at a given location.
* @param left,right,y location where to draw the info
* @param engine_number the engine of which to draw the info of
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 63ca667c4..14b9ae426 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -459,20 +459,6 @@ void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order, Window *pare
w->parent = parent;
}
-/** Display additional text from NewGRF in the purchase information window */
-uint ShowAdditionalText(int left, int right, int y, EngineID engine)
-{
- uint16 callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, NULL);
- if (callback == CALLBACK_FAILED) return y;
-
- /* STR_BLACK_STRING is used to start the string with {BLACK} */
- SetDParam(0, GetGRFStringID(GetEngineGRFID(engine), 0xD000 + callback));
- PrepareTextRefStackUsage(0);
- uint result = DrawStringMultiLine(left, right, y, INT32_MAX, STR_BLACK_STRING);
- StopTextRefStackUsage();
- return result;
-}
-
/** Display list of cargo types of the engine, for the purchase information window */
uint ShowRefitOptionsList(int left, int right, int y, EngineID engine)
{
diff --git a/src/vehicle_gui.h b/src/vehicle_gui.h
index 825775673..855b750ca 100644
--- a/src/vehicle_gui.h
+++ b/src/vehicle_gui.h
@@ -60,7 +60,6 @@ void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection);
void ShowBuildVehicleWindow(TileIndex tile, VehicleType type);
-uint ShowAdditionalText(int left, int right, int y, EngineID engine);
uint ShowRefitOptionsList(int left, int right, int y, EngineID engine);
StringID GetCargoSubtypeText(const Vehicle *v);