commit 4b4edc1a

Poul Sander · 2019-04-24 17:02
4b4edc1af2300ceaec6193d72e12ce377641ed67 patch · browse files
parent b70b71e36e172196a63bcd79443a5ba865b5d7d4

Moved the exit button on all screens

Changed files

M	source/code/HelpAboutState.cpp before
M	source/code/HelpGamepadState.cpp before
M	source/code/HelpHowtoState.cpp before
M	source/code/ShowFileState.cpp before

diff --git a/source/code/HelpAboutState.cpp b/source/code/HelpAboutState.cpp index 4459cae..6049a48 100644 --- a/source/code/HelpAboutState.cpp +++ b/source/code/HelpAboutState.cpp

@@ -29,8 +29,6 @@ https://blockattack.net

#include "version.h"

#include "sago/SagoMisc.hpp"

-const int xsize = 1024;

-const int ysize = 768;

const int buttonOffset = 160;

extern sago::SagoSprite bExit;

@@ -111,7 +109,7 @@ void HelpAboutState::Draw(SDL_Renderer* target) {

DrawRectYellow(target, 40, 90, 600, 900);

infoBox.SetMaxWidth(850);

infoBox.Draw(target, 50, 100);

- bExit.Draw(globalData.screen, SDL_GetTicks(), xsize-buttonOffset, ysize-buttonOffset);

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

#if DEBUG

static sago::SagoTextField mousePos;

mousePos.SetHolder(&globalData.spriteHolder->GetDataHolder());

@@ -132,8 +130,8 @@ void HelpAboutState::Update() {

bMouseUp = false;

//The Score button:

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

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

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

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

isActive = false;

}

diff --git a/source/code/HelpGamepadState.cpp b/source/code/HelpGamepadState.cpp index 5de9b16..144dd29 100644 --- a/source/code/HelpGamepadState.cpp +++ b/source/code/HelpGamepadState.cpp

@@ -27,8 +27,6 @@ https://blockattack.net

#include "MenuSystem.h"

#include "gamecontroller.h"

-const int xsize = 1024;

-const int ysize = 768;

const int buttonOffset = 160;

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

@@ -111,7 +109,7 @@ void HelpGamepadState::Draw(SDL_Renderer* target) {

SDL_RenderDrawLine(target, 900, 207, 900, 400);

switchLabel.Draw(target, 900, 404, sago::SagoTextField::Alignment::center);

confirmLabel.Draw(target, 900, 404+30, sago::SagoTextField::Alignment::center);

- bExit.Draw(globalData.screen, SDL_GetTicks(), xsize-buttonOffset, ysize-buttonOffset);

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

supportedControllers.Draw(target, 10, 600);

#if DEBUG

@@ -134,8 +132,8 @@ void HelpGamepadState::Update() {

bMouseUp = false;

//The Score button:

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

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

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

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

isActive = false;

}

diff --git a/source/code/HelpHowtoState.cpp b/source/code/HelpHowtoState.cpp index 075868c..b8f0d4e 100644 --- a/source/code/HelpHowtoState.cpp +++ b/source/code/HelpHowtoState.cpp

@@ -27,8 +27,6 @@ https://blockattack.net

#include "MenuSystem.h"

#include <cmath>

-const int xsize = 1024;

-const int ysize = 768;

const int buttonOffset = 160;

extern sago::SagoSprite bExit;

extern sago::SagoSprite bricks[7];

@@ -200,7 +198,7 @@ void HelpHowtoState::Draw(SDL_Renderer* target) {

DrawArrow(target, 600, 600, 650, 600);

DrawArrow(target, 525, 525, 525, 675);

chainField.Draw(target, 400, 710, sago::SagoTextField::Alignment::center);

- bExit.Draw(globalData.screen, SDL_GetTicks(), xsize-buttonOffset, ysize-buttonOffset);

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

#if DEBUG

static sago::SagoTextField mousePos;

mousePos.SetHolder(&globalData.spriteHolder->GetDataHolder());

@@ -221,8 +219,8 @@ void HelpHowtoState::Update() {

bMouseUp = false;

//The Score button:

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

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

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

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

isActive = false;

}

diff --git a/source/code/ShowFileState.cpp b/source/code/ShowFileState.cpp index 670433e..8aaae2d 100644 --- a/source/code/ShowFileState.cpp +++ b/source/code/ShowFileState.cpp

@@ -22,8 +22,6 @@ https://blockattack.net

#include "common.h"

#include "MenuSystem.h"

-const int xsize = 1024;

-const int ysize = 768;

const int buttonOffset = 160;

extern sago::SagoSprite bExit;

@@ -79,7 +77,7 @@ void ShowFileState::Draw(SDL_Renderer* target) {

infoBox.Draw(target, 50, 100);

DrawRectYellow(target, 40, 700, 50, 900);

filenameField.Draw(target, 50, 715);

- bExit.Draw(globalData.screen, SDL_GetTicks(), xsize-buttonOffset, ysize-buttonOffset);

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

#if DEBUG

static sago::SagoTextField mousePos;

mousePos.SetHolder(&globalData.spriteHolder->GetDataHolder());

@@ -100,8 +98,8 @@ void ShowFileState::Update() {

bMouseUp = false;

//The Score button:

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

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

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

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

isActive = false;

}