Files
@ r17167:68f47a8db1b5
Branch filter:
Location: cpp/openttd-patchpack/source/src/aircraft_gui.cpp - annotation
r17167:68f47a8db1b5
3.7 KiB
text/x-c
(svn r21916) -Fix [FS#4442]: the minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to "fail". Make sure that the minimum speed always overrules the maximum speed
r5584:545d748cc681 r5584:545d748cc681 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6117:d11b4c5c0aea r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r8114:866ed489ed98 r8144:1432edd15267 r9274:76c4320046fb r13602:30f9b380fb13 r5584:545d748cc681 r8264:d493cb51fe8a r8264:d493cb51fe8a r7530:8eaeedf8b40c r11443:81f75d8ddd0c r11356:ae9277304002 r11443:81f75d8ddd0c r11443:81f75d8ddd0c r11443:81f75d8ddd0c r11443:81f75d8ddd0c r11356:ae9277304002 r12374:50d157b51c2c r7530:8eaeedf8b40c r13351:43a3e6e1e395 r9943:38700f276db2 r7530:8eaeedf8b40c r13806:2bc44cc74256 r12374:50d157b51c2c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r13610:8af771d39472 r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r11133:84e4d86c0cb1 r13351:43a3e6e1e395 r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r13351:43a3e6e1e395 r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r13351:43a3e6e1e395 r9943:38700f276db2 r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r9943:38700f276db2 r13351:43a3e6e1e395 r7530:8eaeedf8b40c r7530:8eaeedf8b40c r7530:8eaeedf8b40c r13599:f6ef46132fe6 r13599:f6ef46132fe6 r13599:f6ef46132fe6 r13599:f6ef46132fe6 r13599:f6ef46132fe6 r13599:f6ef46132fe6 r13599:f6ef46132fe6 r13599:f6ef46132fe6 r13599:f6ef46132fe6 r5780:df0b8d779b37 r16431:ec558deca9d7 r13602:30f9b380fb13 r13602:30f9b380fb13 r13602:30f9b380fb13 r13602:30f9b380fb13 r13602:30f9b380fb13 r13602:30f9b380fb13 r13602:30f9b380fb13 r14309:f445232b17f6 r13602:30f9b380fb13 r13602:30f9b380fb13 r12109:90df01928018 r11976:ae6aa97461b7 r5780:df0b8d779b37 r13602:30f9b380fb13 r5780:df0b8d779b37 r5780:df0b8d779b37 r13602:30f9b380fb13 r13602:30f9b380fb13 r13602:30f9b380fb13 r5780:df0b8d779b37 r5780:df0b8d779b37 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file aircraft_gui.cpp The GUI of aircraft. */
#include "stdafx.h"
#include "aircraft.h"
#include "vehicle_gui.h"
#include "newgrf_engine.h"
#include "strings_func.h"
#include "vehicle_func.h"
#include "window_gui.h"
#include "spritecache.h"
#include "table/strings.h"
/**
* Draw the details for the given vehicle at the given position
*
* @param v current vehicle
* @param left The left most coordinate to draw
* @param right The right most coordinate to draw
* @param y The y coordinate
*/
void DrawAircraftDetails(const Aircraft *v, int left, int right, int y)
{
int y_offset = (v->Next()->cargo_cap != 0) ? -(FONT_HEIGHT_NORMAL + 1): 0;
Money feeder_share = 0;
for (const Aircraft *u = v; u != NULL; u = u->Next()) {
if (u->IsNormalAircraft()) {
SetDParam(0, u->engine_type);
SetDParam(1, u->build_year);
SetDParam(2, u->value);
DrawString(left, right, y, STR_VEHICLE_INFO_BUILT_VALUE, TC_FROMSTRING, SA_LEFT | SA_STRIP);
SetDParam(0, u->cargo_type);
SetDParam(1, u->cargo_cap);
SetDParam(2, u->Next()->cargo_type);
SetDParam(3, u->Next()->cargo_cap);
SetDParam(4, GetCargoSubtypeText(u));
DrawString(left, right, y + FONT_HEIGHT_NORMAL, (u->Next()->cargo_cap != 0) ? STR_VEHICLE_INFO_CAPACITY_CAPACITY : STR_VEHICLE_INFO_CAPACITY);
}
if (u->cargo_cap != 0) {
uint cargo_count = u->cargo.Count();
y_offset += FONT_HEIGHT_NORMAL + 1;
if (cargo_count != 0) {
/* Cargo names (fix pluralness) */
SetDParam(0, u->cargo_type);
SetDParam(1, cargo_count);
SetDParam(2, u->cargo.Source());
DrawString(left, right, y + 2 * FONT_HEIGHT_NORMAL + 1 + y_offset, STR_VEHICLE_DETAILS_CARGO_FROM);
feeder_share += u->cargo.FeederShare();
}
}
}
SetDParam(0, feeder_share);
DrawString(left, right, y + 3 * FONT_HEIGHT_NORMAL + 3 + y_offset, STR_VEHICLE_INFO_FEEDER_CARGO_VALUE);
}
/**
* Draws an image of an aircraft
* @param v Front vehicle
* @param left The minimum horizontal position
* @param right The maximum horizontal position
* @param y Vertical position to draw at
* @param selection Selected vehicle to draw a frame around
*/
void DrawAircraftImage(const Vehicle *v, int left, int right, int y, VehicleID selection)
{
bool rtl = _current_text_dir == TD_RTL;
SpriteID sprite = v->GetImage(rtl ? DIR_E : DIR_W);
const Sprite *real_sprite = GetSprite(sprite, ST_NORMAL);
int x = rtl ? right - real_sprite->width - real_sprite->x_offs : left - real_sprite->x_offs;
bool helicopter = v->subtype == AIR_HELICOPTER;
PaletteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
DrawSprite(sprite, pal, x, y + 10);
if (helicopter) {
const Aircraft *a = Aircraft::From(v);
SpriteID rotor_sprite = GetCustomRotorSprite(a, true);
if (rotor_sprite == 0) rotor_sprite = SPR_ROTOR_STOPPED;
DrawSprite(rotor_sprite, PAL_NONE, x, y + 5);
}
if (v->index == selection) {
x += real_sprite->x_offs;
y += real_sprite->y_offs + 10 - (helicopter ? 5 : 0);
DrawFrameRect(x - 1, y - 1, x + real_sprite->width + 1, y + real_sprite->height + (helicopter ? 5 : 0) + 1, COLOUR_WHITE, FR_BORDERONLY);
}
}
|