Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
pull/21/merge
Jonathan G Rennison 7 years ago
parent 103cabb178 bf3fd277c1
commit 52dadc9252
5 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
src/company_gui.cpp
Unescape Escape View File

@ -2409,7 +2409,7 @@ struct CompanyWindow : Window
virtual void OnPlaceObject(Point pt, TileIndex tile)
{
if (DoCommandP(tile, OBJECT_HQ, 0, CMD_BUILD_OBJECT | CMD_MSG(STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS))) {
if (DoCommandP(tile, OBJECT_HQ, 0, CMD_BUILD_OBJECT | CMD_MSG(STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS)) && !_shift_pressed) {
ResetObjectToPlace();
this->RaiseButtons();
}

2
src/engine_gui.cpp
Unescape Escape View File

@ -128,7 +128,7 @@ struct EnginePreviewWindow : Window {
DoCommandP(0, this->window_number, 0, CMD_WANT_ENGINE_PREVIEW);
/* FALL THROUGH */
case WID_EP_NO:
delete this;
if (!_shift_pressed) delete this;
break;
}
}

6
src/fontcache.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ FontCache::FontCache(FontSize fs) : parent(FontCache::Get(fs)), fs(fs), height(_
ascender(_default_font_ascender[fs]), descender(_default_font_ascender[fs] - _default_font_height[fs]),
units_per_em(1)
{
assert(parent == NULL || this->fs == parent->fs);
assert(this->parent == NULL || this->fs == this->parent->fs);
FontCache::caches[this->fs] = this;
font_height_cache[this->fs] = this->height;
Layouter::ResetFontCache(this->fs);
@ -50,7 +50,7 @@ FontCache::FontCache(FontSize fs) : parent(FontCache::Get(fs)), fs(fs), height(_
/** Clean everything up. */
FontCache::~FontCache()
{
assert(this->fs == parent->fs);
assert(this->fs == this->parent->fs);
FontCache::caches[this->fs] = this->parent;
Layouter::ResetFontCache(this->fs);
}
@ -480,7 +480,7 @@ static bool GetFontAAState(FontSize size)
const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
{
if ((key & SPRITE_GLYPH) != 0) return parent->GetGlyph(key);
if ((key & SPRITE_GLYPH) != 0) return this->parent->GetGlyph(key);
/* Check for the glyph in our cache */
GlyphEntry *glyph = this->GetGlyphPtr(key);

64
src/lang/spanish.txt
Unescape Escape View File

@ -51,18 +51,18 @@ STR_CARGO_PLURAL_WHEAT :{G=m}Trigo
STR_CARGO_PLURAL_RUBBER :{G=m}Caucho
STR_CARGO_PLURAL_SUGAR :{G=m}Azúcar
STR_CARGO_PLURAL_TOYS :{G=m}Juguetes
STR_CARGO_PLURAL_CANDY :{G=m}Dulces
STR_CARGO_PLURAL_CANDY :{G=m}Caramelos
STR_CARGO_PLURAL_COLA :{G=f}Cola
STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodón Dulce
STR_CARGO_PLURAL_COTTON_CANDY :{G=m}Algodón de Azúcar
STR_CARGO_PLURAL_BUBBLES :{G=f}Burbujas
STR_CARGO_PLURAL_TOFFEE :{G=m}Caramelos
STR_CARGO_PLURAL_TOFFEE :{G=m}Tofes
STR_CARGO_PLURAL_BATTERIES :{G=f}Pilas
STR_CARGO_PLURAL_PLASTIC :{G=m}Plástico
STR_CARGO_PLURAL_FIZZY_DRINKS :{G=m}Refrescos
# Singular cargo name
STR_CARGO_SINGULAR_NOTHING :
STR_CARGO_SINGULAR_PASSENGER :{G=m}Pasajeros
STR_CARGO_SINGULAR_PASSENGER :{G=m}Pasajero
STR_CARGO_SINGULAR_COAL :{G=m}Carbón
STR_CARGO_SINGULAR_MAIL :{G=m}Correo
STR_CARGO_SINGULAR_OIL :{G=m}Petróleo
@ -85,11 +85,11 @@ STR_CARGO_SINGULAR_WHEAT :{G=m}Trigo
STR_CARGO_SINGULAR_RUBBER :{G=m}Caucho
STR_CARGO_SINGULAR_SUGAR :{G=m}Azúcar
STR_CARGO_SINGULAR_TOY :{G=m}Juguete
STR_CARGO_SINGULAR_CANDY :{G=m}Dulce
STR_CARGO_SINGULAR_CANDY :{G=m}Caramelo
STR_CARGO_SINGULAR_COLA :{G=f}Cola
STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodón Dulce
STR_CARGO_SINGULAR_COTTON_CANDY :{G=m}Algodón de Azúcar
STR_CARGO_SINGULAR_BUBBLE :{G=f}Burbuja
STR_CARGO_SINGULAR_TOFFEE :{G=m}Caramelo
STR_CARGO_SINGULAR_TOFFEE :{G=m}Tofe
STR_CARGO_SINGULAR_BATTERY :{G=f}Pila
STR_CARGO_SINGULAR_PLASTIC :{G=m}Plástico
STR_CARGO_SINGULAR_FIZZY_DRINK :{G=m}Refresco
@ -119,11 +119,11 @@ STR_QUANTITY_WHEAT :{WEIGHT_LONG} d
STR_QUANTITY_RUBBER :{VOLUME_LONG} de caucho
STR_QUANTITY_SUGAR :{WEIGHT_LONG} de azúcar
STR_QUANTITY_TOYS :{COMMA}{NBSP}juguete{P "" s}
STR_QUANTITY_SWEETS :{COMMA}{NBSP}bolsa{P "" s} de dulces
STR_QUANTITY_SWEETS :{COMMA}{NBSP}bolsa{P "" s} de caramelos
STR_QUANTITY_COLA :{VOLUME_LONG} de cola
STR_QUANTITY_CANDYFLOSS :{WEIGHT_LONG} de algodón dulce
STR_QUANTITY_BUBBLES :{COMMA} burbuja{P "" s}
STR_QUANTITY_TOFFEE :{WEIGHT_LONG} de caramelo{P "" s}
STR_QUANTITY_TOFFEE :{WEIGHT_LONG} de tofe{P "" s}
STR_QUANTITY_BATTERIES :{COMMA} pila{P "" s}
STR_QUANTITY_PLASTIC :{VOLUME_LONG} de plástico
STR_QUANTITY_FIZZY_DRINKS :{COMMA} refresco{P "" s}
@ -1577,7 +1577,7 @@ STR_CONFIG_SETTING_STATUSBAR_POS :Posición de la
STR_CONFIG_SETTING_STATUSBAR_POS_HELPTEXT :Posición horizontal de la barra de estado en la parte inferior de la pantalla
STR_CONFIG_SETTING_SNAP_RADIUS :Radio de fijación de ventana: {STRING}
STR_CONFIG_SETTING_SNAP_RADIUS_HELPTEXT :Distancia máxima entre ventanas antes de que la ventana que se está moviendo sea alineada automáticamente con las ventanas cercanas
STR_CONFIG_SETTING_SNAP_RADIUS_VALUE :{COMMA} pixel{P 0 "" s}
STR_CONFIG_SETTING_SNAP_RADIUS_VALUE :{COMMA} pixel{P 0 "" es}
STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED :deshabilitado
STR_CONFIG_SETTING_SOFT_LIMIT :Máximo número de ventanas sin anclar: {STRING}
STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT :Número máximo de ventanas sin anclar que pueden estar abiertas antes de que las más antiguas se cierren automáticamente para dejar paso a las nuevas
@ -2937,7 +2937,7 @@ STR_NEWGRF_BROKEN :{WHITE}Es proba
STR_NEWGRF_BROKEN_POWERED_WAGON :{WHITE}Ha cambiado el estado 'vagón motorizado' para '{1:ENGINE}' cuando no estaba dentro de un depósito
STR_NEWGRF_BROKEN_VEHICLE_LENGTH :{WHITE}Ha cambiado la longitud del vehículo para '{1:ENGINE}' cuando no estaba dentro de un depósito
STR_NEWGRF_BROKEN_CAPACITY :{WHITE}Ha cambiado la capacidad del vehículo para '{1:ENGINE}' fuera de un depósito o mientras no se estaba remodelando
STR_BROKEN_VEHICLE_LENGTH :{WHITE}Tren '{VEHICLE}' perteneciente a '{COMPANY}' tiene una longitud incorrecta. Puede ser debido a problemas con los NewGRF. El juego puede fallar
STR_BROKEN_VEHICLE_LENGTH :{WHITE}El tren '{VEHICLE}' perteneciente a '{COMPANY}' tiene una longitud incorrecta. Esto puede ser debido a problemas con los NewGRF. El juego puede desincronizarse o, incluso, fallar por completo
STR_NEWGRF_BUGGY :{WHITE}El NewGRF '{0:STRING}' da información incorrecta
STR_NEWGRF_BUGGY_ARTICULATED_CARGO :{WHITE}La información de carga/reforma para '{1:ENGINE}' difiere de la de lista de compra después de la construcción. Esto puede causar que la renovación/reemplazo automático no haga la reforma correcta
@ -4552,8 +4552,8 @@ STR_INDUSTRY_NAME_WATER_TOWER :{G=f}Torre de A
STR_INDUSTRY_NAME_FACTORY_2 :{G=f}Fábrica
STR_INDUSTRY_NAME_FARM_2 :{G=f}Granja
STR_INDUSTRY_NAME_LUMBER_MILL :{G=m}Aserradero
STR_INDUSTRY_NAME_COTTON_CANDY_FOREST :{G=m}Bosque de Algodón Dulce
STR_INDUSTRY_NAME_CANDY_FACTORY :{G=f}Fábrica de Dulces
STR_INDUSTRY_NAME_COTTON_CANDY_FOREST :{G=m}Bosque de Algodón de Azúcar
STR_INDUSTRY_NAME_CANDY_FACTORY :{G=f}Fábrica de Caramelos
STR_INDUSTRY_NAME_BATTERY_FARM :{G=f}Granja de Pilas
STR_INDUSTRY_NAME_COLA_WELLS :{G=m}Pozos de Cola
STR_INDUSTRY_NAME_TOY_SHOP :{G=f}Tienda de Juguetes
@ -4561,7 +4561,7 @@ STR_INDUSTRY_NAME_TOY_FACTORY :{G=f}Fábrica d
STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS :{G=f}Fuentes de Plástico
STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY :{G=f}Fábrica de Refrescos
STR_INDUSTRY_NAME_BUBBLE_GENERATOR :{G=m}Generador de Burbujas
STR_INDUSTRY_NAME_TOFFEE_QUARRY :{G=f}Cantera de Caramelos
STR_INDUSTRY_NAME_TOFFEE_QUARRY :{G=f}Cantera de Tofe
STR_INDUSTRY_NAME_SUGAR_MINE :{G=f}Mina de Azúcar
############ WARNING, using range 0x6000 for strings that are stored in the savegame
@ -4651,11 +4651,11 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WATER_TANKER :Cisterna de Agu
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FRUIT_TRUCK :Vagón de Fruta
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK :Vagón de Caucho
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK :Vagón de Azúcar
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER :Vagoneta de Algodón Dulce
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER :Vagoneta de Caramelos
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER :Vagoneta de Algodón de Azúcar
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER :Vagoneta de Tofe
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN :Vagón de Burbujas
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER :Cisterna de Cola
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN :Vagón de Dulces
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN :Vagón de Caramelos
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN :Vagón de Juguetes
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK :Vagón de Pilas
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK :Vagón de Refrescos
@ -4681,11 +4681,11 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WATER_TANKER :Cisterna de Agu
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FRUIT_TRUCK :Vagón de Fruta
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK :Vagón de Caucho
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK :Vagón de Azúcar
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER :Vagoneta de Algodón Dulce
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER :Vagoneta de Caramelos
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER :Vagoneta de Algodón de Azúcar
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER :Vagoneta de Tofe
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN :Vagón de Burbujas
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER :Cisterna de Cola
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN :Vagón de Dulces
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN :Vagón de Caramelos
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN :Vagón de Juguetes
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK :Vagón de Pilas
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK :Vagón de Refrescos
@ -4713,11 +4713,11 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER :Cisterna de Agu
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FRUIT_TRUCK :Vagón de Fruta
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK :Vagón de Caucho
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK :Vagón de Azúcar
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER :Vagoneta de Algodón Dulce
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER :Vagoneta de Caramelos
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER :Vagoneta de Algodón de Azúcar
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER :Vagoneta de Tofe
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN :Vagón de Burbujas
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER :Cisterna de Cola
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN :Vagón de Dulces
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN :Vagón de Caramelos
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN :Vagón de Juguetes
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK :Vagón de Pilas
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK :Vagón de Refrescos
@ -4786,18 +4786,18 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK :Camión de Azú
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COLA_TRUCK :Camión de Cola MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COLA_TRUCK :Camión de Cola Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COLA_TRUCK :Camión de Cola Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY :Camión de Algodón Dulce MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY :Camión de Algodón Dulce Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK :Camión de Algodón Dulce Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK :Camión de Caramelos MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOFFEE_TRUCK :Camión de Caramelos Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOFFEE_TRUCK :Camión de Caramelos Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY :Camión de Algodón de Azúcar MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY :Camión de Algodón de Azúcar Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK :Camión de Algodón de Azúcar Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK :Camión de Tofe MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOFFEE_TRUCK :Camión de Tofe Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOFFEE_TRUCK :Camión de Tofe Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOY_VAN :Furgón de Juguetes MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOY_VAN :Furgón de Juguetes Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOY_VAN :Furgón de Juguetes Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK :Camión de Dulces MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK :Camión de Dulces Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK :Camión de Dulces Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK :Camión de Caramelos MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK :Camión de Caramelos Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK :Camión de Caramelos Wizzowow
STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BATTERY_TRUCK :Camión de Pilas MightyMover
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BATTERY_TRUCK :Camión de Pilas Powernaught
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK :Camión de Pilas Wizzowow

1
src/linkgraph/linkgraph_gui.h
Unescape Escape View File

@ -77,7 +77,6 @@ protected:
Point GetStationMiddle(const Station *st) const;
void DrawForwBackLinks(Point pta, StationID sta, Point ptb, StationID stb) const;
void AddLinks(const Station *sta, const Station *stb);
void DrawLinks(const DrawPixelInfo *dpi) const;
void DrawStationDots(const DrawPixelInfo *dpi) const;

Write Preview
Loading…
Cancel
Save