diff --git a/SpaceCadetPinball/SpaceCadetPinball.rc b/SpaceCadetPinball/SpaceCadetPinball.rc index cdb4241..185f666 100644 Binary files a/SpaceCadetPinball/SpaceCadetPinball.rc and b/SpaceCadetPinball/SpaceCadetPinball.rc differ diff --git a/SpaceCadetPinball/THole.cpp b/SpaceCadetPinball/THole.cpp index fc3e0aa..cb06149 100644 --- a/SpaceCadetPinball/THole.cpp +++ b/SpaceCadetPinball/THole.cpp @@ -82,11 +82,7 @@ void THole::Collision(TBall* ball, vector_type* nextPosition, vector_type* direc ball->Position.X = Circle.Center.X; ball->Position.Y = Circle.Center.Y; ball->Acceleration.Z = 0.0; - - // Ramp hole has no delay in FT. - auto captureTime = pb::FullTiltMode ? 0 : 0.5f; - Timer = timer::set(captureTime, this, TimerExpired); - + Timer = timer::set(0.5f, this, TimerExpired); if (!PinballTable->TiltLockFlag) { loader::play_sound(HardHitSoundId); diff --git a/SpaceCadetPinball/TTextBox.cpp b/SpaceCadetPinball/TTextBox.cpp index 03d31f6..db01c7e 100644 --- a/SpaceCadetPinball/TTextBox.cpp +++ b/SpaceCadetPinball/TTextBox.cpp @@ -153,7 +153,7 @@ void TTextBox::Display(const wchar_t* text, float time) } } -void TTextBox::Draw(bool redraw) +void TTextBox::Draw() { auto bmp = BgBmp; if (bmp) @@ -172,12 +172,6 @@ void TTextBox::Draw(bool redraw) bool display = false; while (Message1) { - if (redraw) - { - display = true; - break; - } - if (Message1->Time == -1.0f) { if (!Message1->NextMessage) @@ -189,8 +183,6 @@ void TTextBox::Draw(bool redraw) } else if (Message1->TimeLeft() >= -2.0f) { - if (Timer > 0) - timer::kill(Timer); Timer = timer::set(max(Message1->TimeLeft(), 0.25f), this, TimerExpired); display = true; break; diff --git a/SpaceCadetPinball/TTextBox.h b/SpaceCadetPinball/TTextBox.h index b21499d..a9dc04e 100644 --- a/SpaceCadetPinball/TTextBox.h +++ b/SpaceCadetPinball/TTextBox.h @@ -22,7 +22,7 @@ public: int Message(int code, float value) override; void Clear(); void Display(const wchar_t* text, float time); - void Draw(bool redraw = false); + void Draw(); static void TimerExpired(int timerId, void* tb); }; diff --git a/SpaceCadetPinball/control.cpp b/SpaceCadetPinball/control.cpp index 21b2a80..a23cb3d 100644 --- a/SpaceCadetPinball/control.cpp +++ b/SpaceCadetPinball/control.cpp @@ -2916,7 +2916,7 @@ void control::GameoverController(int code, TPinballComponent* caller) if (missionMsg & 0x200) { - int highscoreId = missionMsg % 5; + int highscoreId = missionMsg % 4; int highScore = pb::highscore_table[highscoreId].Score; auto nextHidhscoreId = highscoreId + 1; if (highScore > 0) diff --git a/SpaceCadetPinball/fullscrn.cpp b/SpaceCadetPinball/fullscrn.cpp index edcbf0b..c7084e4 100644 --- a/SpaceCadetPinball/fullscrn.cpp +++ b/SpaceCadetPinball/fullscrn.cpp @@ -377,7 +377,7 @@ void fullscrn::paint() fillRect(WindowRect1.right, menuHeight + WindowRect1.bottom, 0, 0); } } - pb::paint(); + render::paint(); fullscrn_flag1 = 0; } diff --git a/SpaceCadetPinball/options.cpp b/SpaceCadetPinball/options.cpp index 471f506..38697aa 100644 --- a/SpaceCadetPinball/options.cpp +++ b/SpaceCadetPinball/options.cpp @@ -81,9 +81,8 @@ LanguageMenuEntry options::LanguageMenu[] {L"Italiano", Languages::Italian}, {L"Magyar", Languages::Hungarian}, {L"Portugues do Brasil", Languages::BrazilianPortuguese}, - {L"Čeština", Languages::Czech}, - {L"Dansk", Languages::Danish}, - {L"Suomi", Languages::Finnish}, + {L"Čeština" , Languages::Czech}, + {L"Dansk" , Languages::Danish}, }; void options::ReadOptions() diff --git a/SpaceCadetPinball/options.h b/SpaceCadetPinball/options.h index c271cdd..dcb8cf8 100644 --- a/SpaceCadetPinball/options.h +++ b/SpaceCadetPinball/options.h @@ -5,7 +5,7 @@ enum class Languages { English = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), - Russian = MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), + Russian = MAKELANGID(LANG_RUSSIAN, SUBLANG_DEFAULT), TraditionalChinese = MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL), SimplifiedChinese = MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), Polish = MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND), @@ -17,7 +17,6 @@ enum class Languages BrazilianPortuguese = MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), Czech = MAKELANGID(LANG_CZECH, SUBLANG_CZECH_CZECH_REPUBLIC), Danish = MAKELANGID(LANG_DANISH, SUBLANG_DANISH_DENMARK), - Finnish = MAKELANGID(LANG_FINNISH, SUBLANG_FINNISH_FINLAND), }; struct LanguageMenuEntry diff --git a/SpaceCadetPinball/pb.cpp b/SpaceCadetPinball/pb.cpp index 2f061c7..e1dda2b 100644 --- a/SpaceCadetPinball/pb.cpp +++ b/SpaceCadetPinball/pb.cpp @@ -135,12 +135,6 @@ void pb::firsttime_setup() void pb::paint() { render::paint(); - if (score::msg_fontp == nullptr) - { - // DrawText writes to screen directly, text gets overwritten by full vScreen blit. - pinball::InfoTextBox->Draw(true); - pinball::MissTextBox->Draw(true); - } } void pb::mode_change(int mode) diff --git a/SpaceCadetPinball/resource.h b/SpaceCadetPinball/resource.h index aefee6f..f52f356 100644 --- a/SpaceCadetPinball/resource.h +++ b/SpaceCadetPinball/resource.h @@ -242,7 +242,7 @@ #define DLG_HIGHSCORES_EditName5 605 #define Menu1_AlternativeRender 601 #define Menu1_Language 700 -#define Menu1_LanguageMax 714 +#define Menu1_LanguageMax 713 // Next default values for new objects //