From a7863aa85865f672282ec5a3c5e2da0c313e317a Mon Sep 17 00:00:00 2001 From: Claudio Hoffmann <hoffmanncl72341@th-nuernberg.de> Date: Sun, 17 Jan 2021 15:25:04 +0100 Subject: [PATCH] Move score board and Game Over positions to screen space --- Scoreb.cpp | 28 ++++++++++++++-------------- Scoreb.hpp | 4 ++-- main.cpp | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Scoreb.cpp b/Scoreb.cpp index ceedfee..61c3fba 100644 --- a/Scoreb.cpp +++ b/Scoreb.cpp @@ -2,20 +2,20 @@ Score::Score(int W,int H) { - GameOverPos.X = W/2-16; - GameOverPos.Y = H/2-9; - ScoreBoard[5].ScorePos.X = W-70; - ScoreBoard[5].ScorePos.Y = 20; - ScoreBoard[4].ScorePos.X = W-60; - ScoreBoard[4].ScorePos.Y = 20; - ScoreBoard[3].ScorePos.X = W-50; - ScoreBoard[3].ScorePos.Y = 20; - ScoreBoard[2].ScorePos.X = W-40; - ScoreBoard[2].ScorePos.Y = 20; - ScoreBoard[1].ScorePos.X = W-30; - ScoreBoard[1].ScorePos.Y = 20; - ScoreBoard[0].ScorePos.X = W-20; - ScoreBoard[0].ScorePos.Y = 20; + GameOverPos.x = W/2-16; + GameOverPos.y = H/2-9; + ScoreBoard[5].ScorePos.x = W-70; + ScoreBoard[5].ScorePos.y = 20; + ScoreBoard[4].ScorePos.x = W-60; + ScoreBoard[4].ScorePos.y = 20; + ScoreBoard[3].ScorePos.x = W-50; + ScoreBoard[3].ScorePos.y = 20; + ScoreBoard[2].ScorePos.x = W-40; + ScoreBoard[2].ScorePos.y = 20; + ScoreBoard[1].ScorePos.x = W-30; + ScoreBoard[1].ScorePos.y = 20; + ScoreBoard[0].ScorePos.x = W-20; + ScoreBoard[0].ScorePos.y = 20; } ScoreB::ScoreB() { diff --git a/Scoreb.hpp b/Scoreb.hpp index 43a4097..63a6c1a 100644 --- a/Scoreb.hpp +++ b/Scoreb.hpp @@ -7,7 +7,7 @@ class ScoreB { public: ScoreB(); - Position ScorePos; + PixelPoint ScorePos; const PixelBuffer& getScoreSprite(); int number; @@ -20,7 +20,7 @@ class Score { public: Score(int screenwidth,int screenheight); - Position GameOverPos; + PixelPoint GameOverPos; const PixelBuffer& getGameOverSprite(); void SetScoreSprite(int Score); ScoreB ScoreBoard[6]; diff --git a/main.cpp b/main.cpp index 22ca2f6..8aa9c7d 100644 --- a/main.cpp +++ b/main.cpp @@ -220,8 +220,8 @@ public: int c = 0; for(auto & i : Highscore.ScoreBoard){ - i.ScorePos.X = screenWidth/2+25-c*10; - i.ScorePos.Y = screenHeigth/2+20; + i.ScorePos.x = screenWidth/2+25-c*10; + i.ScorePos.y = screenHeigth/2+20; c++; framebuffer.blit_topleft(i.ScorePos,i.getScoreSprite()); } -- GitLab