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

(svn r26934) -Fix (r26933): Don't statically initialise non-static variables.

release/1.5
peter1138 2014-09-28 09:21:51 +00:00
parent 2b9782fd95
commit 1748d7ad6b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine_gui.cpp
View File

@ -65,7 +65,7 @@ static const NWidgetPart _nested_engine_preview_widgets[] = {
}; };
struct EnginePreviewWindow : Window { struct EnginePreviewWindow : Window {
int vehicle_space = 40; // The space to show the vehicle image int vehicle_space; // The space to show the vehicle image
EnginePreviewWindow(WindowDesc *desc, WindowNumber window_number) : Window(desc) EnginePreviewWindow(WindowDesc *desc, WindowNumber window_number) : Window(desc)
{ {
@ -93,7 +93,7 @@ struct EnginePreviewWindow : Window {
case VEH_SHIP: GetShipSpriteSize( engine, x, y, x_offs, y_offs, image_type); break; case VEH_SHIP: GetShipSpriteSize( engine, x, y, x_offs, y_offs, image_type); break;
case VEH_AIRCRAFT: GetAircraftSpriteSize(engine, x, y, x_offs, y_offs, image_type); break; case VEH_AIRCRAFT: GetAircraftSpriteSize(engine, x, y, x_offs, y_offs, image_type); break;
} }
this->vehicle_space = max<int>(this->vehicle_space, y - y_offs); this->vehicle_space = max<int>(40, y - y_offs);
size->width = max(size->width, x - x_offs); size->width = max(size->width, x - x_offs);
SetDParam(0, GetEngineCategoryName(engine)); SetDParam(0, GetEngineCategoryName(engine));