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 
# Conflicts:
#	src/vehicle.cpp
wip-string
Jonathan G Rennison 5 months ago
parent ea85bbda97 4fcd94a1cb
commit 7bd074f273
6 changed files with 845 additions and 831 deletions
Show Stats Download Patch File Download Diff File

2
src/lang/brazilian_portuguese.txt
Unescape Escape View File

@ -904,7 +904,7 @@ STR_NEWS_VEHICLE_IS_UNPROFITABLE :O lucro de {WHI
STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} não pode chegar ao próximo destino porque está fora de alcance
STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} parou porque uma readaptação ordenada falhou
STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Autorenovação falhou no {VEHICLE}{}{STRING}
STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Autorenovação falhou para {VEHICLE}{}{STRING}
STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE :{BIG_FONT}{BLACK}Nov{G o a} {STRING} já está disponível!
STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLACK}{ENGINE}

6
src/lang/english.txt
Unescape Escape View File

@ -903,7 +903,7 @@ STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}{VEHICLE
STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} can't get to the next destination because it is out of range
STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} stopped because an ordered refit failed
STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Autorenew failed on {VEHICLE}{}{STRING}
STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Autorenew failed on {VEHICLE}{}{STRING2}
STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE :{BIG_FONT}{BLACK}New {STRING} now available!
STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLACK}{ENGINE}
@ -4475,9 +4475,9 @@ STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}How to c
STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :is equal to
STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS :is not equal to
STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN :is less than
STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS :is less or equal to
STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS :is less than or equal to
STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN :is more than
STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS :is more or equal to
STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS :is more than or equal to
STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE :is true
STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE :is false

20
src/lang/latvian.txt
Unescape Escape View File

@ -905,7 +905,7 @@ STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}{VEHICLE
STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} nevar doties uz nākamo galamērķi, jo tas ir ārpus apgabala
STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} ir apstājies, jo neizdevās pasūtītā pielāgošana
STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Automātiskās atjaunošanas kļūda {VEHICLE}{}{STRING}
STR_NEWS_VEHICLE_AUTORENEW_FAILED :{WHITE}Automātiskā atjaunošana neizdevās transportlīdzeklī {VEHICLE}{}{STRING}
STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE :{BIG_FONT}{BLACK}Tagad ir pieejams jauns {STRING}!
STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLACK}{ENGINE}
@ -918,7 +918,7 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_LIST :{WHITE}{STATION
STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIG_FONT}{BLACK}Subsīdijas piedāvājums beidzies:{}{}{STRING} no {STRING} uz {STRING} subsidēšana ir atcelta
STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIG_FONT}{BLACK}Subsidēšana atcelta:{}{}{STRING} pārvadājumi no {STRING} uz {STRING} turpmāk vairs netiek subsidēti
STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Līnijas subsīdijas piedāvājums:{}{}Sākot no {STRING} līdz {STRING} uz {STRING} piesaistīs {NUM} gadu subsīdijas no vietējās pašvaldības!
STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIG_FONT}{BLACK}Līnijas subsīdijas piedāvājums:{}{}Krava: {STRING} no{STRING} uz {STRING} piesaistīs {NUM} gadu subsīdijas no vietējās pašvaldības!
###length 4
STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIG_FONT}{BLACK}Līnijas subsīdija tiek piešķirta {STRING}!{}{}{STRING} no {STRING} uz {STRING} tiks maksāts 50% vairāk nākamos {NUM} gad{P u us us}!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIG_FONT}{BLACK}Līnijas subsīdija tiek piešķrita {STRING}!{}{}{STRING} no {STRING} uz {STRING} tiks maksātas dubultās likmes nākamos {NUM} gad{P u us us}!
@ -1120,11 +1120,11 @@ STR_NUM_CUSTOM :Pielāgots
STR_NUM_CUSTOM_NUMBER :Pielāgots ({NUM})
STR_VARIETY_NONE :Nav
STR_VARIETY_VERY_LOW :Ļoti zema
STR_VARIETY_LOW :Zema
STR_VARIETY_MEDIUM :Vidēja
STR_VARIETY_HIGH :Augsta
STR_VARIETY_VERY_HIGH :Ļoti augsta
STR_VARIETY_VERY_LOW :Ļoti zems
STR_VARIETY_LOW :Zems
STR_VARIETY_MEDIUM :Vidējs
STR_VARIETY_HIGH :Augsts
STR_VARIETY_VERY_HIGH :Ļoti augsts
###length 5
STR_AI_SPEED_VERY_SLOW :Ļoti lēns
@ -2432,7 +2432,7 @@ STR_NETWORK_CLIENT_LIST_NEW_COMPANY :(Jauna kompāni
STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP :{BLACK}Izveidot jaunu kompāniju un pievienoties tai
STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP :{BLACK}Tas esat jūs
STR_NETWORK_CLIENT_LIST_PLAYER_ICON_HOST_TOOLTIP :{BLACK}Šis ir spēles īpašnieks
STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}Klientu: {NUM}; uzņēmumu: {NUM}/{NUM}
STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}klientu: {NUM}; kompāniju: {NUM}/{NUM}
STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT_TOOLTIP :{BLACK}Pašlaik savienoto klientu skaits, uzņēmumu skaits un maksimālais servera administratora atļautais uzņēmumu skaits
# Matches ConnectionType
@ -2506,8 +2506,8 @@ STR_NETWORK_ERROR_LOSTCONNECTION :{WHITE}Tīkla s
STR_NETWORK_ERROR_SAVEGAMEERROR :{WHITE}Nevar ielādēt saglabāto spēli
STR_NETWORK_ERROR_SERVER_START :{WHITE}Nevar uzsākt servera darbību
STR_NETWORK_ERROR_SERVER_ERROR :{WHITE}Tika pielaista protokola kļūda un savienojums tika slēgts
STR_NETWORK_ERROR_BAD_PLAYER_NAME :{WHITE} Jūsu spēlētāja vārds nav iestatīts. Nosaukumu var iestatīt vMultiplayer loga augšdaļā
STR_NETWORK_ERROR_BAD_SERVER_NAME :{WHITE} Jūsu servera nosaukums nav iestatīts. Nosaukumu var iestatīt Multiplayer loga augšdaļā
STR_NETWORK_ERROR_BAD_PLAYER_NAME :{WHITE} Jūsu spēlētāja vārds nav iestatīts. Nosaukumu var iestatīt šī loga augšdaļā
STR_NETWORK_ERROR_BAD_SERVER_NAME :{WHITE} Jūsu servera nosaukums nav iestatīts. Nosaukumu var iestatīt vairākspēlētāju loga augšdaļā
STR_NETWORK_ERROR_WRONG_REVISION :{WHITE}Klienta pārskats neatbilst servera pārskatam
STR_NETWORK_ERROR_WRONG_PASSWORD :{WHITE}Nepareiza parole
STR_NETWORK_ERROR_SERVER_FULL :{WHITE}Serveris ir pilns

2
src/lang/polish.txt
Unescape Escape View File

@ -2724,7 +2724,7 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}Nazwa gr
STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Ustaw hasło
STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Zabezpiecz grę hasłem jeśli nie chcesz, by była publicznie dostępna
STR_NETWORK_START_SERVER_VISIBILITY_LABEL :{BLACK}Widoczność
STR_NETWORK_START_SERVER_VISIBILITY_LABEL :{BLACK}Widoczność:
STR_NETWORK_START_SERVER_VISIBILITY_TOOLTIP :{BLACK}Czy inni ludzie mogą zobaczyć twój serwer na publicznej liście
STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} klient{P "" ów ów}
STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Dopuszczalna liczba klientów:

1610
src/lang/romanian.txt
View File

File diff suppressed because it is too large Load Diff

36
src/vehicle.cpp
Unescape Escape View File

@ -2049,21 +2049,35 @@ Vehicle *CheckClickOnVehicle(const Viewport *vp, int x, int y)
x = ScaleByZoom(x, vp->zoom) + vp->virtual_left;
y = ScaleByZoom(y, vp->zoom) + vp->virtual_top;
for (Vehicle *v : Vehicle::Iterate()) {
if (((v->vehstatus & VS_UNCLICKABLE) == 0) && v->IsDrawn() &&
x >= v->coord.left && x <= v->coord.right &&
y >= v->coord.top && y <= v->coord.bottom) {
/* The hash area to scan */
const ViewportHashBound vhb = GetViewportHashBound(x, x, y, y, 0, 0);
dist = std::max(
abs(((v->coord.left + v->coord.right) >> 1) - x),
abs(((v->coord.top + v->coord.bottom) >> 1) - y)
);
for (int hy = vhb.yl;; hy = (hy + (1 << 6)) & (0x3F << 6)) {
for (int hx = vhb.xl;; hx = (hx + 1) & 0x3F) {
Vehicle *v = _vehicle_viewport_hash[hx + hy]; // already masked & 0xFFF
if (dist < best_dist) {
found = v;
best_dist = dist;
while (v != nullptr) {
if (((v->vehstatus & VS_UNCLICKABLE) == 0) && v->IsDrawn() &&
x >= v->coord.left && x <= v->coord.right &&
y >= v->coord.top && y <= v->coord.bottom) {
dist = std::max(
abs(((v->coord.left + v->coord.right) >> 1) - x),
abs(((v->coord.top + v->coord.bottom) >> 1) - y)
);
if (dist < best_dist) {
found = v;
best_dist = dist;
}
}
v = v->hash_viewport_next;
}
if (hx == vhb.xu) break;
}
if (hy == vhb.yu) break;
}
return found;

Write Preview
Loading…
Cancel
Save