commit aa7d74c5

Poul Sander · 2019-05-08 17:14
aa7d74c59f4c4055ab4472ee74cecbcdd3d0e318 patch · browse files
parent 8283ed72f6dba28ce1891ea2e03b60c7f7788472

Replaced exit button on "ScoreDisplay" with the same exit button as everywhere else

Changed files

M	source/code/ScoresDisplay.cpp before

diff --git a/source/code/ScoresDisplay.cpp b/source/code/ScoresDisplay.cpp index 39cf03d..99d21e9 100644 --- a/source/code/ScoresDisplay.cpp +++ b/source/code/ScoresDisplay.cpp

@@ -27,6 +27,10 @@ http://www.blockattack.net

#include "stats.h"

#include "MenuSystem.h"

+const int buttonOffsetX = 140;

+const int buttonOffsetY = 180;

+extern sago::SagoSprite bExit;

static void setButtonFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {

field.SetHolder(holder);

field.SetFont("freeserif");

@@ -210,7 +214,7 @@ void ScoresDisplay::Draw(SDL_Renderer*) {

const sago::SagoDataHolder* holder = &globalData.spriteHolder->GetDataHolder();

//Draw buttons:

- globalData.bHighScore.Draw(globalData.screen, 0, scoreX,scoreY);

+ bExit.Draw(globalData.screen, SDL_GetTicks(), globalData.xsize-buttonOffsetX, globalData.ysize-buttonOffsetY);

globalData.bBack.Draw(globalData.screen, 0, backX, backY);

static sago::SagoTextField backLabel;

setButtonFont(holder, backLabel, _("Back"));

@@ -260,8 +264,9 @@ void ScoresDisplay::Update() {

if (SDL_GetMouseState(nullptr,nullptr)&SDL_BUTTON(1) && bMouseUp) {

bMouseUp = false;

- //The Score button:

- if ((globalData.mousex>scoreX) && (globalData.mousex<scoreX+buttonXsize) && (globalData.mousey>scoreY) && (globalData.mousey<scoreY+buttonYsize)) {

+ //The Exit button:

+ if ((globalData.mousex>globalData.xsize-buttonOffsetX) && (globalData.mousex<globalData.xsize-buttonOffsetX+bExit.GetWidth())

+ && (globalData.mousey>globalData.ysize-buttonOffsetY) && (globalData.mousey<globalData.ysize-buttonOffsetY+bExit.GetHeight())) {

isActive = false;

}