jaildesigner-jailgames/coffee_crisis
1
0
Fork 1
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Fixed offset from render messages with nokia font

Browse Source
This commit is contained in:
Sergio
2021-09-01 19:10:00 +02:00
parent 64369921ec
commit f0b9a1d134
5 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/game.cpp
View File

@@ -50,14 +50,14 @@ Game::Game(int numPlayers, SDL_Renderer *renderer, std::string *filelist, Lang *
mTextureText = new LTexture();
mTextureTextScoreBoard = new LTexture();
mTextureTextBig = new LTexture();
mTextureTextNokia = new LTexture();
mTextureTextNokiaBig = new LTexture();
mTextureTextNokia2 = new LTexture();
mTextureTextNokiaBig2 = new LTexture();
mText = new Text(mFileList[48], mTextureText, mRenderer);
mTextScoreBoard = new Text(mFileList[46], mTextureTextScoreBoard, mRenderer);
mTextBig = new Text(mFileList[47], mTextureTextBig, mRenderer);
mTextNokia = new Text(mFileList[52], mTextureTextNokia, mRenderer);
mTextNokiaBig = new Text(mFileList[55], mTextureTextNokiaBig, mRenderer);
mTextNokia2 = new Text(mFileList[57], mTextureTextNokia2, mRenderer);
mTextNokiaBig2 = new Text(mFileList[55], mTextureTextNokiaBig2, mRenderer);
mMenuGameOver = new Menu(mRenderer, mText, mInput, mFileList);
mMenuPause = new Menu(mRenderer, mText, mInput, mFileList);
@@ -194,13 +194,13 @@ Game::~Game()
delete mTextureTextBig;
mTextureTextBig = nullptr;
mTextureTextNokia->unload();
delete mTextureTextNokia;
mTextureTextNokia = nullptr;
mTextureTextNokia2->unload();
delete mTextureTextNokia2;
mTextureTextNokia2 = nullptr;
mTextureTextNokiaBig->unload();
delete mTextureTextNokiaBig;
mTextureTextNokiaBig = nullptr;
mTextureTextNokiaBig2->unload();
delete mTextureTextNokiaBig2;
mTextureTextNokiaBig2 = nullptr;
delete mText;
mText = nullptr;
@@ -211,11 +211,11 @@ Game::~Game()
delete mTextScoreBoard;
mTextScoreBoard = nullptr;
delete mTextNokia;
mTextNokia = nullptr;
delete mTextNokia2;
mTextNokia2 = nullptr;
delete mTextNokiaBig;
mTextNokiaBig = nullptr;
delete mTextNokiaBig2;
mTextNokiaBig2 = nullptr;
delete mMenuGameOver;
mMenuGameOver = nullptr;
@@ -541,8 +541,8 @@ bool Game::loadMedia()
success &= loadTextureFromFile(mTextureText, mFileList[30], mRenderer);
success &= loadTextureFromFile(mTextureTextScoreBoard, mFileList[27], mRenderer);
success &= loadTextureFromFile(mTextureTextBig, mFileList[29], mRenderer);
success &= loadTextureFromFile(mTextureTextNokia, mFileList[28], mRenderer);
success &= loadTextureFromFile(mTextureTextNokiaBig, mFileList[54], mRenderer);
success &= loadTextureFromFile(mTextureTextNokia2, mFileList[56], mRenderer);
success &= loadTextureFromFile(mTextureTextNokiaBig2, mFileList[54], mRenderer);
success &= loadTextureFromFile(mTexturePlayer1Legs, mFileList[39], mRenderer);
success &= loadTextureFromFile(mTexturePlayer1Head, mFileList[41], mRenderer);
@@ -2982,14 +2982,14 @@ void Game::renderMessages()
//const color_t color = {0x17, 0x17, 0x26};
//mTextBig->writeShadowed((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), color, 2);
//mTextBig->writeDX(TXT_STROKE, (int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), 1, noColor, 1, shdwTxtColor);
mTextNokiaBig->write((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), -2);
mTextNokiaBig2->write((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), -2);
}
// Time Stopped
if (mTimeStopped)
{
if ((mTimeStoppedCounter > 100) || (mTimeStoppedCounter % 10 > 4))
mText->writeDX(TXT_CENTER | TXT_STROKE, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mLang->getText(36) + std::to_string(mTimeStoppedCounter / 10), 1, noColor, 1, shdwTxtColor);
mTextNokia2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mLang->getText(36) + std::to_string(mTimeStoppedCounter / 10), 0, noColor, 1, shdwTxtColor);
if (mTimeStoppedCounter > 100)
{
@@ -3006,7 +3006,7 @@ void Game::renderMessages()
// D E M O
if (mDemo.enabled)
if (mDemo.counter % 30 > 14)
mTextBig->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mLang->getText(37), 0, noColor, 2, shdwTxtColor);
mTextNokiaBig2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mLang->getText(37), 0, noColor, 2, shdwTxtColor);
// STAGE NUMBER
if (mStageBitmapCounter < STAGE_COUNTER)
@@ -3014,13 +3014,13 @@ void Game::renderMessages()
std::string text = mLang->getText(38) + std::to_string(mStage[mCurrentStage].number);
if (!mGameCompleted)
{
mTextBig->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, 1, noColor, 2, shdwTxtColor);
mTextNokiaBig2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, -2, noColor, 2, shdwTxtColor);
}
else
{ // Texto de juego completado
text = mLang->getText(50);
mTextBig->writeDX(TXT_CENTER | TXT_STROKE, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, 1, noColor, 1, shdwTxtColor);
mText->writeDX(TXT_CENTER | TXT_STROKE, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter] + 17, mLang->getText(76), 1, noColor, 1, shdwTxtColor);
mTextNokiaBig2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, -2, noColor, 1, shdwTxtColor);
mTextNokia2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter] + 17, mLang->getText(76), 0, noColor, 1, shdwTxtColor);
}
}
}
@@ -3457,7 +3457,7 @@ void Game::initPaths()
}
// Letrero de GetReady
const int size = mTextBig->lenght(mLang->getText(75), -2);
const int size = mTextNokiaBig2->lenght(mLang->getText(75), -2);
const float start1 = PLAY_AREA_LEFT - size;
const float finish1 = PLAY_AREA_CENTER_X - (size / 2);