JailDoctor/arounders
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

- Ja funcionen els arounders, pero la corda falla. A investigar.

Browse Source
This commit is contained in:
JailDoctor
2023-10-20 20:08:25 +02:00
parent 136bc86f68
commit 6b63dbd70a
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/proc_arounders.cpp
View File

@@ -74,8 +74,8 @@ namespace arounders
void afegir() void afegir()
{ {
arounder *a = new arounder(); arounder *a = new arounder();
a->x = mapa::ini_x; a->x = mapa::ini_x*16+8;
a->y = mapa::ini_y; a->y = mapa::ini_y*16+8;
a->orientacio = mapa::arounders::orientacio_inicial; a->orientacio = mapa::arounders::orientacio_inicial;
a->frame = a->frameX = a->frameY = a->altura = 0; a->frame = a->frameX = a->frameY = a->altura = 0;
@@ -97,9 +97,9 @@ namespace arounders
{ {
arounder *a = arounders::first; arounder *a = arounders::first;
draw::setSource(sprites);
while (a) while (a)
{ {
draw::setSource(sprites);
draw::draw(a->x, a->y, 8, 8, a->frameX*8, a->frameY); draw::draw(a->x, a->y, 8, 8, a->frameX*8, a->frameY);
a = a->siguiente; a = a->siguiente;
} }
@@ -168,10 +168,30 @@ namespace arounders
case arounders::accions::suicidi: procesarSuicidi(a); break; case arounders::accions::suicidi: procesarSuicidi(a); break;
} }
if (a->x == mapa::fin_x && a->y == mapa::fin_y) initArrivat(a); if (a->x == (mapa::fin_x*16)+8 && a->y == (mapa::fin_y*16)+8) initArrivat(a);
a = a->siguiente; a = a->siguiente;
} }
a = arounders::first;
if (a)
{
while (a->siguiente) a = a->siguiente;
while (a) {
if (a->accio == arounders::accions::mort) {
arounder *borrar = a;
if (borrar->siguiente) borrar->siguiente->anterior = borrar->anterior;
if (borrar->anterior) borrar->anterior->siguiente = borrar->siguiente;
if (borrar == arounders::first) arounders::first = borrar->siguiente;
if (borrar == arounders::seleccionat) arounders::seleccionat = nullptr;
a = borrar->anterior;
delete borrar;
} else {
a = a->anterior;
}
}
}
} }
uint8_t get_pixel(const int x, const int y) uint8_t get_pixel(const int x, const int y)
@@ -316,7 +336,11 @@ namespace arounders
{ {
a->frame = 0; a->frame = 0;
a->prevista = arounders::accions::baixarcorda; a->prevista = arounders::accions::baixarcorda;
a->x = a->orientacio == arounders::orientacions::dreta ? a->x + 2 : a->x - 2; if (a->orientacio == arounders::orientacions::dreta) {
a->x += 2;
} else {
a->x -= 2;
}
procesarBaixarCorda(a); procesarBaixarCorda(a);
} }