jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

Eliminat "const.h"

Browse Source
This commit is contained in:
Sergio
2024-09-28 10:16:35 +02:00
parent 8d263931b2
commit f2cc0dc352
28 changed files with 74 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/balloon.cpp
View File

@@ -1,5 +1,4 @@
#include "balloon.h"
#include "const.h"
#include "param.h"
// Constructor
@@ -281,9 +280,9 @@ void Balloon::allignTo(int x)
{
posX = float(x - (width / 2));
if (posX < PLAY_AREA_LEFT)
if (posX < param.game.playArea.rect.x)
{
posX = PLAY_AREA_LEFT + 1;
posX = param.game.playArea.rect.x + 1;
}
else if ((posX + width) > param.game.playArea.rect.w)
{
@@ -347,7 +346,7 @@ void Balloon::move()
posX += (velX * speed);
// Si queda fuera de pantalla, corregimos su posición y cambiamos su sentido
if ((posX < PLAY_AREA_LEFT) || (posX + width > param.game.playArea.rect.w))
if ((posX < param.game.playArea.rect.x) || (posX + width > param.game.playArea.rect.w))
{
// Corrige posición
posX -= (velX * speed);
@@ -369,10 +368,10 @@ void Balloon::move()
posY += (velY * speed);
// Si se sale por arriba
if (posY < PLAY_AREA_TOP)
if (posY < param.game.playArea.rect.y)
{
// Corrige
posY = PLAY_AREA_TOP;
posY = param.game.playArea.rect.y;
// Invierte sentido
velY = -velY;
@@ -508,7 +507,7 @@ void Balloon::updateState()
posX += velX;
// Comprueba no se salga por los laterales
if ((posX < PLAY_AREA_LEFT) || (posX > (param.game.playArea.rect.w - width)))
if ((posX < param.game.playArea.rect.x) || (posX > (param.game.playArea.rect.w - width)))
{
// Corrige y cambia el sentido de la velocidad
posX -= velX;