bug hunting coffee machine on windows

This commit is contained in:
2021-08-27 12:32:34 +02:00
parent 5d6047b642
commit 70324570c8
4 changed files with 48 additions and 34 deletions

View File

@@ -1623,7 +1623,7 @@ void Game::renderScoreBoard()
}
// STAGE
mTextScoreBoard->writeCentered(PLAY_AREA_CENTER_X, offset1-1, mTextStrings[57] + std::to_string(mStage[mCurrentStage].number));
mTextScoreBoard->writeCentered(PLAY_AREA_CENTER_X, offset1 - 1, mTextStrings[57] + std::to_string(mStage[mCurrentStage].number));
// POWER
mSpritePowerMeter->setSpriteClip(256, 184, 40, 8);
@@ -1633,7 +1633,7 @@ void Game::renderScoreBoard()
mSpritePowerMeter->render();
// HI-SCORE
mTextScoreBoard->writeCentered(PLAY_AREA_CENTER_X, offset3+1, mTextStrings[56] + updateScoreText(mHiScore));
mTextScoreBoard->writeCentered(PLAY_AREA_CENTER_X, offset3 + 1, mTextStrings[56] + updateScoreText(mHiScore));
}
// Actualiza las variables del jugador
@@ -2110,21 +2110,18 @@ void Game::checkPlayerItemCollision(int index)
{
case ITEM_POINTS_1_DISK:
mPlayer[index]->addScore(1000);
//setScore(mPlayer[index]->getScore());
updateHiScore();
createItemScoreSprite(mItem[i]->getPosX() + (mItem[i]->getWidth() / 2) - (m1000Bitmap->getWidth() / 2), mPlayer[index]->getPosY(), m1000Bitmap);
JA_PlaySound(mSoundItemPickup);
break;
case ITEM_POINTS_2_GAVINA:
mPlayer[index]->addScore(2500);
//setScore(mPlayer[index]->getScore());
updateHiScore();
createItemScoreSprite(mItem[i]->getPosX() + (mItem[i]->getWidth() / 2) - (m2500Bitmap->getWidth() / 2), mPlayer[index]->getPosY(), m2500Bitmap);
JA_PlaySound(mSoundItemPickup);
break;
case ITEM_POINTS_3_PACMAR:
mPlayer[index]->addScore(5000);
//setScore(mPlayer[index]->getScore());
updateHiScore();
createItemScoreSprite(mItem[i]->getPosX() + (mItem[i]->getWidth() / 2) - (m5000Bitmap->getWidth() / 2), mPlayer[index]->getPosY(), m5000Bitmap);
JA_PlaySound(mSoundItemPickup);
@@ -2141,6 +2138,12 @@ void Game::checkPlayerItemCollision(int index)
mPlayer[index]->setPowerUp(true);
JA_PlaySound(mSoundItemPickup);
mCoffeeMachineEnabled = false;
{
printf("-collision-\n");
printf("x\t%f\n", mItem[i]->getPosX());
printf("y\t%f\n", mItem[i]->getPosY());
printf("---\n");
}
break;
default:
@@ -2181,11 +2184,16 @@ void Game::checkBulletBalloonCollision()
const Uint8 droppeditem = dropItem();
if ((droppeditem != NO_KIND) && !(mDemo.enabled) && !(mDemo.recording))
{
createItem(mBalloon[i]->getPosX(), mBalloon[i]->getPosY(), droppeditem);
if (droppeditem != ITEM_COFFEE_MACHINE)
{
createItem(mBalloon[i]->getPosX(), mBalloon[i]->getPosY(), droppeditem);
JA_PlaySound(mSoundItemDrop);
}
else
{
createItem(mPlayer[index]->getPosX(), 0, droppeditem);
mCoffeeMachineEnabled = true;
}
}
break;
}