From 5cd01807b2737103845c4977ced36857159e3b1f Mon Sep 17 00:00:00 2001 From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com> Date: Sat, 23 Oct 2021 09:02:51 +0300 Subject: [PATCH] winmain: converted int to bool. Cleaned up some of the PR changes. --- SpaceCadetPinball/TBall.cpp | 23 ++++++++-------------- SpaceCadetPinball/THole.cpp | 14 +++++--------- SpaceCadetPinball/TPlunger.cpp | 2 +- SpaceCadetPinball/pb.cpp | 6 +++--- SpaceCadetPinball/winmain.cpp | 35 +++++++++++++++++----------------- SpaceCadetPinball/winmain.h | 7 ++++--- 6 files changed, 39 insertions(+), 48 deletions(-) diff --git a/SpaceCadetPinball/TBall.cpp b/SpaceCadetPinball/TBall.cpp index b086594..4b37e92 100644 --- a/SpaceCadetPinball/TBall.cpp +++ b/SpaceCadetPinball/TBall.cpp @@ -39,23 +39,16 @@ TBall::TBall(TPinballTable* table) : TPinballComponent(table, -1, false) auto groupIndex = loader::query_handle(ballGroupName); Offset = *loader::query_float_attribute(groupIndex, 0, 500); + auto visualCount = loader::query_visual_states(groupIndex); - int index = 0; - if (visualCount > 0) + for (auto index = 0; index < visualCount; ++index) { - auto visualZPtr = VisualZArray; - do - { - loader::query_visual(groupIndex, index, &visual); - if (ListBitmap) - ListBitmap->push_back(visual.Bitmap); - auto visVec = reinterpret_cast(loader::query_float_attribute(groupIndex, index, 501)); - auto zDepth = proj::z_distance(visVec); - ++index; - *visualZPtr = zDepth; - ++visualZPtr; - } - while (index < visualCount); + loader::query_visual(groupIndex, index, &visual); + if (ListBitmap) + ListBitmap->push_back(visual.Bitmap); + auto visVec = reinterpret_cast(loader::query_float_attribute(groupIndex, index, 501)); + auto zDepth = proj::z_distance(visVec); + VisualZArray[index] = zDepth; } RenderSprite = render::create_sprite(VisualTypes::Ball, nullptr, nullptr, 0, 0, nullptr); PinballTable->CollisionCompOffset = Offset; diff --git a/SpaceCadetPinball/THole.cpp b/SpaceCadetPinball/THole.cpp index 531e1df..49d1321 100644 --- a/SpaceCadetPinball/THole.cpp +++ b/SpaceCadetPinball/THole.cpp @@ -81,15 +81,11 @@ 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; - /*Full Tilt hack - ball doesn't delay at the ramp hole*/ - if (pb::FullTiltMode) - { - BallCapturedSecondStage = 1; - } - else - { - Timer = timer::set(0.5f, this, TimerExpired); - } + + // Ramp hole has no delay in FT. + auto captureTime = pb::FullTiltMode ? 0 : 0.5f; + Timer = timer::set(captureTime, this, TimerExpired); + if (!PinballTable->TiltLockFlag) { loader::play_sound(HardHitSoundId); diff --git a/SpaceCadetPinball/TPlunger.cpp b/SpaceCadetPinball/TPlunger.cpp index db9a1ca..488cd9c 100644 --- a/SpaceCadetPinball/TPlunger.cpp +++ b/SpaceCadetPinball/TPlunger.cpp @@ -94,7 +94,7 @@ int TPlunger::Message(int code, float value) if (PullbackTimer_) timer::kill(PullbackTimer_); PullbackTimer_ = 0; - if (code == 1005) // intended that this can never be reached (same as original) + if (code == 1005) loader::play_sound(SoundIndexP2); auto bmp = ListBitmap->at(0); auto zMap = ListZMap->at(0); diff --git a/SpaceCadetPinball/pb.cpp b/SpaceCadetPinball/pb.cpp index 4087d93..284ef7e 100644 --- a/SpaceCadetPinball/pb.cpp +++ b/SpaceCadetPinball/pb.cpp @@ -215,7 +215,7 @@ void pb::frame(float dtMilliSec) { if (dtMilliSec > 100) dtMilliSec = 100; - if (dtMilliSec < 0) + if (dtMilliSec <= 0) return; float dtSec = dtMilliSec * 0.001f; if (!mode_countdown(dtMilliSec)) @@ -317,7 +317,7 @@ void pb::window_size(int* width, int* height) void pb::pause_continue() { - winmain::single_step = (winmain::single_step == 0) ? 1 : 0; + winmain::single_step ^= true; pinball::InfoTextBox->Clear(); pinball::MissTextBox->Clear(); if (winmain::single_step) @@ -532,7 +532,7 @@ void pb::end_game() for (auto i = 0; i < playerCount; ++i) { - for (auto j = i+1; j < playerCount; ++j) + for (auto j = i + 1; j < playerCount; ++j) { if (scores[j] > scores[i]) { diff --git a/SpaceCadetPinball/winmain.cpp b/SpaceCadetPinball/winmain.cpp index f8926bc..83dfc66 100644 --- a/SpaceCadetPinball/winmain.cpp +++ b/SpaceCadetPinball/winmain.cpp @@ -15,16 +15,16 @@ SDL_Renderer* winmain::Renderer = nullptr; ImGuiIO* winmain::ImIO = nullptr; int winmain::return_value = 0; -int winmain::bQuit = 0; -int winmain::activated; +bool winmain::bQuit = false; +bool winmain::activated = false; int winmain::DispFrameRate = 0; int winmain::DispGRhistory = 0; -int winmain::single_step = 0; -int winmain::has_focus = 1; +bool winmain::single_step = false; +bool winmain::has_focus = true; int winmain::last_mouse_x; int winmain::last_mouse_y; int winmain::mouse_down; -int winmain::no_time_loss; +bool winmain::no_time_loss = false; bool winmain::restart = false; @@ -225,7 +225,7 @@ int winmain::WinMain(LPCSTR lpCmdLine) //last_mouse_x = x; //last_mouse_y = y; } - if (!single_step) + if (!single_step && !no_time_loss) { auto dt = static_cast(frameDuration.count()); auto dtWhole = static_cast(std::round(dt)); @@ -243,6 +243,7 @@ int winmain::WinMain(LPCSTR lpCmdLine) } updateCounter++; } + no_time_loss = false; if (UpdateToFrameCounter >= UpdateToFrameRatio) { @@ -595,7 +596,7 @@ int winmain::event_handler(const SDL_Event* event) { case SDL_QUIT: end_pause(); - bQuit = 1; + bQuit = true; fullscrn::shutdown(); return_value = 0; return 0; @@ -655,9 +656,9 @@ int winmain::event_handler(const SDL_Event* event) pb::frame(10); break; case SDLK_F10: - single_step = (single_step == 0) ? 1 : 0; - if (single_step == 0) - no_time_loss = 1; + single_step ^= true; + if (!single_step) + no_time_loss = true; break; default: break; @@ -713,21 +714,21 @@ int winmain::event_handler(const SDL_Event* event) case SDL_WINDOWEVENT_FOCUS_GAINED: case SDL_WINDOWEVENT_TAKE_FOCUS: case SDL_WINDOWEVENT_SHOWN: - activated = 1; + activated = true; Sound::Activate(); if (Options.Music && !single_step) midi::play_pb_theme(); - no_time_loss = 1; - has_focus = 1; + no_time_loss = true; + has_focus = true; break; case SDL_WINDOWEVENT_FOCUS_LOST: case SDL_WINDOWEVENT_HIDDEN: - activated = 0; + activated = false; fullscrn::activate(0); Options.FullScreen = false; Sound::Deactivate(); midi::music_stop(); - has_focus = 0; + has_focus = false; pb::loose_focus(); break; case SDL_WINDOWEVENT_SIZE_CHANGED: @@ -846,7 +847,7 @@ void winmain::end_pause() if (single_step) { pb::pause_continue(); - no_time_loss = 1; + no_time_loss = true; } } @@ -859,7 +860,7 @@ void winmain::new_game() void winmain::pause() { pb::pause_continue(); - no_time_loss = 1; + no_time_loss = true; } void winmain::Restart() diff --git a/SpaceCadetPinball/winmain.h b/SpaceCadetPinball/winmain.h index fc75257..b83369c 100644 --- a/SpaceCadetPinball/winmain.h +++ b/SpaceCadetPinball/winmain.h @@ -41,7 +41,7 @@ class winmain public: static std::string DatFileName; - static int single_step; + static bool single_step; static SDL_Window* MainWindow; static SDL_Renderer* Renderer; static ImGuiIO* ImIO; @@ -62,8 +62,9 @@ public: static bool RestartRequested() { return restart; } static void UpdateFrameRate(); private: - static int return_value, bQuit, DispFrameRate, DispGRhistory, activated; - static int has_focus, mouse_down, last_mouse_x, last_mouse_y, no_time_loss; + static int return_value, DispFrameRate, DispGRhistory; + static int mouse_down, last_mouse_x, last_mouse_y; + static bool no_time_loss, activated, bQuit, has_focus; static gdrv_bitmap8* gfr_display; static std::string FpsDetails; static bool restart;