Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@ethanaobrien
ethanaobrien authored Jan 20, 2025
2 parents 2195abd + 5bec62c commit 0310084
Show file tree
Hide file tree
Showing 324 changed files with 3,876 additions and 3,479 deletions.
26 changes: 21 additions & 5 deletions data/language/eo-ZZ.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2169,7 +2169,6 @@ STR_3136 :Averto: Ĉi tiu desegnaĵo estos konstruita per alternativa tipo de
STR_3137 :Elekti Proksiman Pejzaĝon
STR_3138 :Vakigi Elektaĵon
STR_3139 :Kablolifto ne funkciiĝas kun ĉi tiu reĝimo de funkciado
STR_3140 :Kablolifto-monteto devas komenci tuj post stacio
STR_3141 :Reĝimo de multaj cirkvitoj ne eblas kun kablolifto-monteto
STR_3142 :{WINDOW_COLOUR_2}Kapacito: {BLACK}{STRINGID}
STR_3143 :Montri homojn sur mapo
Expand Down Expand Up @@ -2201,7 +2200,7 @@ STR_3188 :Trotuaro-Surskribaĵoj
STR_3189 :Heredaĵaj trotuaroj
STR_3190 :Trotuaro-Diversaĵoj
STR_3191 :Pejzaĝo-Grupoj
STR_3192 :Parkeniro
STR_3192 :Parkeniroj
STR_3193 :Akvo
STR_3195 :Listo da Inventaĵoj
STR_3196 :{WINDOW_COLOUR_2}Inventaĵo-Kategorio: {BLACK}{STRINGID}
Expand Down Expand Up @@ -2606,7 +2605,7 @@ STR_5368 :Restarigi staton de akcidentoj
STR_5371 :Elektado de objektoj
STR_5372 :Inversigi trenadon per dekstra musobutono
STR_5373 :Nomo {STRINGID}
STR_5374 :Dato {STRINGID}
STR_5374 :Dato modifita {STRINGID}
STR_5375 :▲
STR_5376 :▼
STR_5404 :Nomo jam ekzistas
Expand Down Expand Up @@ -3736,8 +3735,8 @@ STR_6671 :Montri ‘faktajn’ nomojn de dungitaro
STR_6672 :Baskuligi inter montrado de ‘faktaj’ dungitonomoj kaj dungitonumeroj
STR_6673 :Travidebla
STR_6674 :{MONTH}, Jaro {COMMA16}
STR_6675 :Nomoj de Gastoj
STR_6676 :Almenaŭ unu objecto de gastonomo elektendas
STR_6675 :Nomoj de Hometoj
STR_6676 :Almenaŭ unu objecto de hometonomo elektendas
STR_6677 :Aldoni strandojn ĉirkaŭ amasoj de akvo
STR_6678 :Fonto de altmapo:
STR_6679 :Ebenaĵo
Expand Down Expand Up @@ -3774,3 +3773,20 @@ STR_6709 :Entajpu glatan fortecon inter {COMMA16} kaj {COMMA16}
STR_6710 :Stabila ordigo
STR_6711 :Dosiernomo:
STR_6712 :Konservi
STR_6713 :{COMMA32} {STRINGID}
STR_6714 :Dosiernomo
STR_6715 :Dato modifita
STR_6716 :Dosiergrando
STR_6717 :Dosiergrando {STRINGID}
STR_6718 :Animacioj de Hometoj
STR_6719 :Almenaŭ unu animacio-objekto de gasto elektendas
STR_6720 :Almenaŭ unu animacio-objekto de faktoto elektendas
STR_6721 :Almenaŭ unu animacio-objekto de mekanikisto elektendas
STR_6722 :Almenaŭ unu animacio-objekto de gardisto elektendas
STR_6723 :Almenaŭ unu animacio-objekto de amuzisto elektendas
STR_6724 :Scenaro-Tekstoj
STR_6725 :X:
STR_6726 :Y:
STR_6727 :Plonĝlopo (maldekstre)
STR_6728 :Plonĝlopo (dekstre)
STR_6729 :Kablolifto-monteto devas komenci tuj post stacio aŭ bremso de blokparto
4 changes: 3 additions & 1 deletion data/language/ko-KR.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2173,7 +2173,6 @@ STR_3136 :경고: 다른 차량 종류로 대체되어 지어질 것이며
STR_3137 :근처 조형물 선택
STR_3138 :선택 초기화
STR_3139 :이 운행 모드에서는 케이블 리프트 힐을 작동할 수 없습니다
STR_3140 :케이블 리프트 힐은 탑승장 바로 다음에 건설해야 합니다
STR_3141 :케이블 리프트 힐을 사용하면 2바퀴 이상 차량을 운용할 수 없습니다
STR_3142 :{WINDOW_COLOUR_2}수용량: {BLACK}{STRINGID}
STR_3143 :손님을 지도에 표시합니다
Expand Down Expand Up @@ -3791,3 +3790,6 @@ STR_6723 :최소 하나 이상의 엔터테이너 애니메이션 오브젝
STR_6724 :시나리오 텍스트
STR_6725 :X:
STR_6726 :Y:
STR_6727 :다이브 루프 (왼쪽)
STR_6728 :다이브 루프 (오른쪽)
STR_6729 :케이블 리프트 힐은 탑승장이나 블록 브레이크 바로 다음에 건설해야 합니다
4 changes: 3 additions & 1 deletion data/language/pl-PL.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2169,7 +2169,6 @@ STR_3136 :Uwaga: Ten projekt trasy będzie wybudowany z alternatywnymi wagona
STR_3137 :Wybierz najbliższą scenerię
STR_3138 :Zresetuj wybór
STR_3139 :Wyciągarka nie może działać w tym trybie
STR_3140 :Wyciągarka musi znajdować się na początku trasy
STR_3141 :Wielokrotne pętle nie są dostępne w parze z wyciągarką
STR_3142 :{WINDOW_COLOUR_2}Pojemność: {BLACK}{STRINGID}
STR_3143 :Pokaż ludzi
Expand Down Expand Up @@ -3788,3 +3787,6 @@ STR_6723 :Należy wybrać co najmniej jeden obiekt animacji komika
STR_6724 :Teksty scenariuszy
STR_6725 :X:
STR_6726 :Y:
STR_6727 :Pętla nurkująca (w lewo)
STR_6728 :Pętla nurkująca (w prawo)
STR_6729 :Wyciągarka linowa musi znajdować się bezpośrednio po stacji lub hamulcu blokowym
4 changes: 3 additions & 1 deletion data/language/pt-BR.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2169,7 +2169,6 @@ STR_3136 :Aviso: Este projeto será construído com um tipo alternativo de ve
STR_3137 :Selecionar Cenários Próximos
STR_3138 :Reiniciar Seleção
STR_3139 :Cabo de elevação não funciona neste modo de operação
STR_3140 :Cabo de elevação deve estar imediatamente após a estação
STR_3141 :Várias voltas por ingresso não são possíveis com o cabo de elevação
STR_3142 :{WINDOW_COLOUR_2}Capacidade: {BLACK}{STRINGID}
STR_3143 :Mostrar pessoas no mapa
Expand Down Expand Up @@ -3788,3 +3787,6 @@ STR_6723 :Ao menos um objeto de animação de pessoinha de animador deve ser
STR_6724 :Textos dos Cenários
STR_6725 :X:
STR_6726 :Y:
STR_6727 :Loop em mergulho (esquerda)
STR_6728 :Loop em mergulho (direita)
STR_6729 :Cabo de elevação deve estar imediatamente após a estação ou freio bloqueador
2 changes: 2 additions & 0 deletions data/language/ru-RU.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3776,3 +3776,5 @@ STR_6724 :Тексты сценариев
STR_6725 :X:
STR_6726 :Y:
STR_6729 :Кабельный лифт должен начинаться сразу после станции или блок-тормоза
STR_6727 :Петля со спуском (левая)
STR_6728 :Петля со спуском (правая)
16 changes: 8 additions & 8 deletions src/openrct2-ui/CursorData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

namespace OpenRCT2::Ui
{
constexpr char rawTransparent = ' ';
constexpr char rawWhite = '.';
constexpr char rawBlack = 'X';
constexpr char kRawTransparent = ' ';
constexpr char kRawWhite = '.';
constexpr char kRawBlack = 'X';

constexpr static CursorData cursorFromBitMap(int x, int y, std::string_view bitmap)
{
Expand All @@ -35,15 +35,15 @@ namespace OpenRCT2::Ui
uint8_t dataBit{}, maskBit{};
switch (rawPixel)
{
case rawBlack:
case kRawBlack:
dataBit = 1;
maskBit = 1;
break;
case rawWhite:
case kRawWhite:
dataBit = 0;
maskBit = 1;
break;
case rawTransparent:
case kRawTransparent:
dataBit = 0;
maskBit = 0;
break;
Expand Down Expand Up @@ -947,7 +947,7 @@ namespace OpenRCT2::Ui
" X.X "
" X ");

static constexpr const CursorData* RawCursorData[] = {
static constexpr const CursorData* kRawCursorData[] = {
nullptr, // CursorID::Arrow
&kBlankCursorData, // CursorID::Blank
&kUpArrowCursorData, // CursorID::UpArrow
Expand Down Expand Up @@ -983,7 +983,7 @@ namespace OpenRCT2::Ui
const CursorData* result = nullptr;
if (cursorId != CursorID::Undefined && cursorId != CursorID::Count)
{
result = RawCursorData[EnumValue(cursorId)];
result = kRawCursorData[EnumValue(cursorId)];
}
return result;
}
Expand Down
6 changes: 3 additions & 3 deletions src/openrct2-ui/ProvisionalElements.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "ProvisionalElements.h"

#include <openrct2-ui/windows/Window.h>
#include <openrct2-ui/windows/Windows.h>
#include <openrct2/Context.h>
#include <openrct2/interface/Window.h>
#include <openrct2/interface/WindowClasses.h>
Expand All @@ -30,7 +30,7 @@ namespace OpenRCT2::Ui

FootpathRemoveProvisionalTemporarily();

auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
auto* windowMgr = GetWindowManager();
if (windowMgr->FindByClass(WindowClass::RideConstruction) != nullptr)
{
RideRemoveProvisionalTrackPiece();
Expand All @@ -50,7 +50,7 @@ namespace OpenRCT2::Ui

FootpathRestoreProvisional();

auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
auto* windowMgr = GetWindowManager();
if (windowMgr->FindByClass(WindowClass::RideConstruction) != nullptr)
{
RideRestoreProvisionalTrackPiece();
Expand Down
5 changes: 3 additions & 2 deletions src/openrct2-ui/TextComposition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
#include "UiContext.h"
#include "UiStringIds.h"
#include "interface/InGameConsole.h"
#include "interface/Window.h"

#include <SDL.h>
#include <openrct2-ui/interface/Window.h>
#include <openrct2-ui/windows/Windows.h>
#include <openrct2/core/Memory.hpp>
#include <openrct2/core/String.hpp>
#include <openrct2/core/UTF8.h>
Expand Down Expand Up @@ -171,7 +172,7 @@ void TextComposition::HandleMessage(const SDL_Event* e)
if ((modifier & KEYBOARD_PRIMARY_MODIFIER) && _session.Length)
{
OpenRCT2::GetContext()->GetUiContext()->SetClipboardText(_session.Buffer->c_str());
ContextShowError(STR_COPY_INPUT_TO_CLIPBOARD, STR_NONE, {});
ContextShowError(STR_COPY_INPUT_TO_CLIPBOARD, kStringIdNone, {});
}
break;
case SDLK_v:
Expand Down
8 changes: 4 additions & 4 deletions src/openrct2-ui/UiContext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ using namespace OpenRCT2::Ui;
class UiContext final : public IUiContext
{
private:
constexpr static uint32_t TOUCH_DOUBLE_TIMEOUT = 300;
constexpr static uint32_t kTouchDoubleTimeout = 300;

const std::unique_ptr<IPlatformUiContext> _platformUiContext;
const std::unique_ptr<IWindowManager> _windowManager;
Expand Down Expand Up @@ -181,12 +181,12 @@ class UiContext final : public IUiContext

void SetFullscreenMode(FULLSCREEN_MODE mode) override
{
static constexpr int32_t _sdlFullscreenFlags[] = {
static constexpr int32_t kSDLFullscreenFlags[] = {
0,
SDL_WINDOW_FULLSCREEN,
SDL_WINDOW_FULLSCREEN_DESKTOP,
};
uint32_t windowFlags = _sdlFullscreenFlags[EnumValue(mode)];
uint32_t windowFlags = kSDLFullscreenFlags[EnumValue(mode)];

// HACK Changing window size when in fullscreen usually has no effect
if (mode == FULLSCREEN_MODE::FULLSCREEN)
Expand Down Expand Up @@ -480,7 +480,7 @@ class UiContext final : public IUiContext

_cursorState.touchIsDouble
= (!_cursorState.touchIsDouble
&& e.tfinger.timestamp - _cursorState.touchDownTimestamp < TOUCH_DOUBLE_TIMEOUT);
&& e.tfinger.timestamp - _cursorState.touchDownTimestamp < kTouchDoubleTimeout);

if (_cursorState.touchIsDouble)
{
Expand Down
Loading

0 comments on commit 0310084

Please sign in to comment.