commit 04918657

sago007 · 2017-11-27 14:06
0491865722d813f71bb8fb8318a00e5ae8902e75 patch · browse files
parent 4c5ca03b7dd19c0f97f846801532b435f8e56515

Small clean up

Changed files

M	source/code/BlockGameSdl.inc before
M	source/code/DialogBox.cpp before
M	source/code/FontWrapper.hpp before
M	source/code/ScoresDisplay.cpp before

diff --git a/source/code/BlockGameSdl.inc b/source/code/BlockGameSdl.inc index 7460302..66db8ee 100644 --- a/source/code/BlockGameSdl.inc +++ b/source/code/BlockGameSdl.inc

@@ -42,7 +42,7 @@ public:

}

void PrintTextCenteredBoard(int x, int y, const char* text) {

- globalData.button_font.drawCenter2(globalData.screen, x+topx+60, y+topy+10, text);

+ globalData.button_font.drawCenter(globalData.screen, x+topx+60, y+topy+10, text);

}

void PrintIntRightAlignedBoard(int x, int y, int number) {

diff --git a/source/code/DialogBox.cpp b/source/code/DialogBox.cpp index ad6376c..118f7b2 100644 --- a/source/code/DialogBox.cpp +++ b/source/code/DialogBox.cpp

@@ -99,9 +99,9 @@ void DialogBox::Draw(SDL_Renderer* target) {

this->x = globalData.xsize/2-300;

this->y = globalData.ysize/2-100;

DrawRectYellow(target, x, y, 200, 600);

- globalData.button_font.drawCenter2(target, x+300, y+20, header);

- globalData.button_font.drawCenter2(target, x+150, y+140, _("Enter to accept"));

- globalData.button_font.drawCenter2(target, x+450, y+140, _("Esc to cancel"));

+ globalData.button_font.drawCenter(target, x+300, y+20, header);

+ globalData.button_font.drawCenter(target, x+150, y+140, _("Enter to accept"));

+ globalData.button_font.drawCenter(target, x+450, y+140, _("Esc to cancel"));

DrawRectWhite(target, x+26, y+64, 54, 600-2*26);

NFont_Write(target, x+40, y+76,rk->GetString());

std::string strHolder = rk->GetString();

diff --git a/source/code/FontWrapper.hpp b/source/code/FontWrapper.hpp index 4a4a5c6..351ecf4 100644 --- a/source/code/FontWrapper.hpp +++ b/source/code/FontWrapper.hpp

@@ -36,7 +36,7 @@ public:

theFont.draw(target, x, y, "%s", text.c_str());

}

- void drawCenter2(SDL_Renderer* target, int x, int y, const std::string& text) {

+ void drawCenter(SDL_Renderer* target, int x, int y, const std::string& text) {

theFont.draw(target, x, y, NFont::CENTER, "%s", text.c_str());

}

diff --git a/source/code/ScoresDisplay.cpp b/source/code/ScoresDisplay.cpp index d3c286e..790e192 100644 --- a/source/code/ScoresDisplay.cpp +++ b/source/code/ScoresDisplay.cpp

@@ -159,11 +159,9 @@ void ScoresDisplay::Draw(SDL_Renderer*) {

//Draw buttons:

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

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

- //globalData.nf_button_font.draw(globalData.screen, backX+60,backY+10, NFont::CENTER,_("Back"));

- globalData.button_font.drawCenter2(globalData.screen, backX+60,backY+10,_("Back"));

+ globalData.button_font.drawCenter(globalData.screen, backX+60,backY+10,_("Back"));

globalData.bNext.Draw(globalData.screen, 0, nextX, nextY);

- //globalData.nf_button_font.draw(globalData.screen, nextX+60,nextY+10, NFont::CENTER,_("Next"));

- globalData.button_font.drawCenter2(globalData.screen, nextX+60,nextY+10,_("Next"));

+ globalData.button_font.drawCenter(globalData.screen, nextX+60,nextY+10,_("Next"));

//Draw page number

string pageXofY = SPrintStringF(_("Page %i of %i"), page+1, numberOfPages);