dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23080) -Feature: [NewGRF] Use variable 10 to enable vehicle GRFs to draw different sprites on the map and in various GUIs.

Browse Source
This commit is contained in:
frosch
2011-11-01 16:51:47 +00:00
parent a5ddc39bad
commit 6e61fee028
25 changed files with 124 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/engine_gui.cpp
View File

@@ -96,7 +96,7 @@ struct EnginePreviewWindow : Window {
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_ENGINE_NAME, TC_BLACK, SA_HOR_CENTER);
y += FONT_HEIGHT_NORMAL;
DrawVehicleEngine(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, this->width >> 1, y + VEHICLE_SPACE / 2, engine, GetEnginePalette(engine, _local_company));
DrawVehicleEngine(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, this->width >> 1, y + VEHICLE_SPACE / 2, engine, GetEnginePalette(engine, _local_company), EIT_PREVIEW);
y += VEHICLE_SPACE;
DrawStringMultiLine(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, r.bottom, GetEngineInfoString(engine), TC_FROMSTRING, SA_CENTER);
@@ -268,25 +268,25 @@ StringID GetEngineInfoString(EngineID engine)
* @param engine Engine to draw.
* @param pal Palette to use for drawing.
*/
void DrawVehicleEngine(int left, int right, int preferred_x, int y, EngineID engine, PaletteID pal)
void DrawVehicleEngine(int left, int right, int preferred_x, int y, EngineID engine, PaletteID pal, EngineImageType image_type)
{
const Engine *e = Engine::Get(engine);
switch (e->type) {
case VEH_TRAIN:
DrawTrainEngine(left, right, preferred_x, y, engine, pal);
DrawTrainEngine(left, right, preferred_x, y, engine, pal, image_type);
break;
case VEH_ROAD:
DrawRoadVehEngine(left, right, preferred_x, y, engine, pal);
DrawRoadVehEngine(left, right, preferred_x, y, engine, pal, image_type);
break;
case VEH_SHIP:
DrawShipEngine(left, right, preferred_x, y, engine, pal);
DrawShipEngine(left, right, preferred_x, y, engine, pal, image_type);
break;
case VEH_AIRCRAFT:
DrawAircraftEngine(left, right, preferred_x, y, engine, pal);
DrawAircraftEngine(left, right, preferred_x, y, engine, pal, image_type);
break;
default: NOT_REACHED();