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

(svn r16386) -Codechange: Move ShowAdditionalText() to build_vehicle_gui and make it static.

release/1.0
frosch 2009-05-22 19:47:26 +00:00
parent 74ea34ca66
commit 09d64ff79d
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/build_vehicle_gui.cpp
View File

@ -12,6 +12,7 @@
#include "company_func.h" #include "company_func.h"
#include "vehicle_gui.h" #include "vehicle_gui.h"
#include "newgrf_engine.h" #include "newgrf_engine.h"
#include "newgrf_text.h"
#include "group.h" #include "group.h"
#include "strings_func.h" #include "strings_func.h"
#include "window_func.h" #include "window_func.h"
@ -590,6 +591,27 @@ static int DrawAircraftPurchaseInfo(int left, int right, int y, EngineID engine_
return y; return y;
} }
/**
* 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. * Draw the purchase info details of a vehicle at a given location.
* @param left,right,y location where to draw the info * @param left,right,y location where to draw the info

14
src/vehicle_gui.cpp
View File

@ -459,20 +459,6 @@ void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order, Window *pare
w->parent = parent; 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 */ /** Display list of cargo types of the engine, for the purchase information window */
uint ShowRefitOptionsList(int left, int right, int y, EngineID engine) uint ShowRefitOptionsList(int left, int right, int y, EngineID engine)
{ {

1
src/vehicle_gui.h
View File

@ -60,7 +60,6 @@ void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection);
void ShowBuildVehicleWindow(TileIndex tile, VehicleType type); 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); uint ShowRefitOptionsList(int left, int right, int y, EngineID engine);
StringID GetCargoSubtypeText(const Vehicle *v); StringID GetCargoSubtypeText(const Vehicle *v);