commit 8b1ee612

Poul Sander · 2019-04-24 17:45
8b1ee612ad518578516510fd488c13dd25b31d75 patch · browse files
parent 4b4edc1af2300ceaec6193d72e12ce377641ed67

Fix the gamepad help screen

Changed files

M	source/code/HelpGamepadState.cpp before
M	source/code/main.cpp before

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

@@ -83,6 +83,8 @@ void HelpGamepadState::ProcessInput(const SDL_Event& event, bool& processed) {

extern sago::SagoSprite bExit;

+#define OFFSETX (-512+globalData.xsize/2)

void HelpGamepadState::Draw(SDL_Renderer* target) {

DrawBackground(target);

const sago::SagoSprite& gamepad = globalData.spriteHolder->GetSprite("help_controller");

@@ -100,15 +102,15 @@ void HelpGamepadState::Draw(SDL_Renderer* target) {

SDL_RenderDrawLine(target, globalData.xsize/2, 80, globalData.xsize/2, 90);

pushLabel.Draw(target, globalData.xsize/2, 80, sago::SagoTextField::Alignment::center, sago::SagoTextField::VerticalAlignment::bottom);

//Back lines

- SDL_RenderDrawLine(target, 625, 168, 800, 168);

- SDL_RenderDrawLine(target, 800, 158, 800, 195);

- SDL_RenderDrawLine(target, 490, 195, 800, 195);

- backLabel.Draw(target, 800, 156, sago::SagoTextField::Alignment::center, sago::SagoTextField::VerticalAlignment::bottom);

- SDL_RenderDrawLine(target, 625, 241, 900, 241);

- SDL_RenderDrawLine(target, 663, 207, 900, 207);

- 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);

+ SDL_RenderDrawLine(target, 625+OFFSETX, 168, 800+OFFSETX, 168);

+ SDL_RenderDrawLine(target, 800+OFFSETX, 158, 800+OFFSETX, 195);

+ SDL_RenderDrawLine(target, 490+OFFSETX, 195, 800+OFFSETX, 195);

+ backLabel.Draw(target, 800+OFFSETX, 156, sago::SagoTextField::Alignment::center, sago::SagoTextField::VerticalAlignment::bottom);

+ SDL_RenderDrawLine(target, 625+OFFSETX, 241, 900+OFFSETX, 241);

+ SDL_RenderDrawLine(target, 663+OFFSETX, 207, 900+OFFSETX, 207);

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

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

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

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

supportedControllers.Draw(target, 10, 600);

diff --git a/source/code/main.cpp b/source/code/main.cpp index 1535318..f924a2d 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -797,7 +797,7 @@ static void StartTwoPlayerVs() {

static void MoveBlockGameSdls( BlockGameSdl& game1, BlockGameSdl& game2 ) {

game1.SetTopXY(globalData.xsize/2-440, globalData.ysize/2-284);

- game2.SetTopXY(globalData.xsize/2+50, globalData.ysize/2-284);

+ game2.SetTopXY(globalData.xsize/2+40, globalData.ysize/2-284);

}

struct globalConfig {