From 1c38b63a3784d2d7a7a9a80017a80be4fcffc489 Mon Sep 17 00:00:00 2001 From: Misa Date: Tue, 28 Apr 2020 19:33:33 -0700 Subject: [PATCH] Move Lab backbox updates to Graphics::updatebackground() So that the backboxes don't go NYOOOOOOOOM. --- desktop_version/src/Graphics.cpp | 51 ++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index c828da61..60ef4c68 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -1964,29 +1964,6 @@ void Graphics::drawbackground( int t ) backboxrect.w = backboxes[i].w - 2; backboxrect.h = backboxes[i].h - 2; FillRect(backBuffer,backboxrect, bcol2); - - backboxes[i].x += backboxvx[i]; - backboxes[i].y += backboxvy[i]; - if (backboxes[i].x < -40) - { - backboxes[i].x = 320; - backboxes[i].y = fRandom() * 240; - } - if (backboxes[i].x > 320) - { - backboxes[i].x = -32; - backboxes[i].y = fRandom() * 240; - } - if (backboxes[i].y < -40) - { - backboxes[i].y = 240; - backboxes[i].x = fRandom() * 320; - } - if (backboxes[i].y > 260) - { - backboxes[i].y = -32; - backboxes[i].x = fRandom() * 320; - } } break; case 3: //Warp zone (horizontal) @@ -2200,6 +2177,34 @@ void Graphics::updatebackground(int t) starsspeed[i] = 4+int(fRandom()*4); } } + break; + case 2: + //Lab + for (int i = 0; i < 18; i++) + { + backboxes[i].x += backboxvx[i]; + backboxes[i].y += backboxvy[i]; + if (backboxes[i].x < -40) + { + backboxes[i].x = 320; + backboxes[i].y = fRandom() * 240; + } + if (backboxes[i].x > 320) + { + backboxes[i].x = -32; + backboxes[i].y = fRandom() * 240; + } + if (backboxes[i].y < -40) + { + backboxes[i].y = 240; + backboxes[i].x = fRandom() * 320; + } + if (backboxes[i].y > 260) + { + backboxes[i].y = -32; + backboxes[i].x = fRandom() * 320; + } + } } }