clang-format

This commit is contained in:
2026-04-04 13:03:20 +02:00
parent 6a09d7219d
commit baee62b375
36 changed files with 2576 additions and 2408 deletions

View File

@@ -1,68 +1,66 @@
#include "game/bola.hpp"
#include "core/jgame.hpp"
#include <stdlib.h>
Bola::Bola( JD8_Surface gfx, Prota* sam ) : Sprite( gfx ) {
this->sam = sam;
#include "core/jgame.hpp"
this->entitat = (Entitat*)malloc( sizeof( Entitat ) );
// Frames
this->entitat->num_frames = 2;
this->entitat->frames = (Frame*)malloc( this->entitat->num_frames * sizeof( Frame ) );
this->entitat->frames[0].w = 15;
this->entitat->frames[0].h = 15;
this->entitat->frames[0].x = 30;
this->entitat->frames[0].y = 155;
this->entitat->frames[1].w = 15;
this->entitat->frames[1].h = 15;
this->entitat->frames[1].x = 45;
this->entitat->frames[1].y = 155;
Bola::Bola(JD8_Surface gfx, Prota* sam)
: Sprite(gfx) {
this->sam = sam;
// Animacions
this->entitat->num_animacions = 1;
this->entitat->animacions = (Animacio*)malloc( this->entitat->num_animacions * sizeof( Animacio ) );
this->entitat->animacions[0].num_frames = 2;
this->entitat->animacions[0].frames = (Uint8*)malloc( 2 );
this->entitat->animacions[0].frames[0] = 0;
this->entitat->animacions[0].frames[1] = 1;
this->entitat = (Entitat*)malloc(sizeof(Entitat));
// Frames
this->entitat->num_frames = 2;
this->entitat->frames = (Frame*)malloc(this->entitat->num_frames * sizeof(Frame));
this->entitat->frames[0].w = 15;
this->entitat->frames[0].h = 15;
this->entitat->frames[0].x = 30;
this->entitat->frames[0].y = 155;
this->entitat->frames[1].w = 15;
this->entitat->frames[1].h = 15;
this->entitat->frames[1].x = 45;
this->entitat->frames[1].y = 155;
this->cur_frame = 0;
this->o = 0;
this->cycles_per_frame = 4;
this->x = 20;
this->y = 100;
this->contador = 0;
// Animacions
this->entitat->num_animacions = 1;
this->entitat->animacions = (Animacio*)malloc(this->entitat->num_animacions * sizeof(Animacio));
this->entitat->animacions[0].num_frames = 2;
this->entitat->animacions[0].frames = (Uint8*)malloc(2);
this->entitat->animacions[0].frames[0] = 0;
this->entitat->animacions[0].frames[1] = 1;
this->cur_frame = 0;
this->o = 0;
this->cycles_per_frame = 4;
this->x = 20;
this->y = 100;
this->contador = 0;
}
void Bola::draw() {
if( this->contador == 0 ) Sprite::draw();
if (this->contador == 0) Sprite::draw();
}
void Bola::update() {
if( this->contador == 0 ) {
// Augmentem la x
this->x++;
if( this->x == 280 ) this->contador = 200;
if (this->contador == 0) {
// Augmentem la x
this->x++;
if (this->x == 280) this->contador = 200;
// Augmentem el frame
if( JG_GetCycleCounter() % this->cycles_per_frame == 0 ) {
this->cur_frame++;
if( this->cur_frame == this->entitat->animacions[this->o].num_frames ) this->cur_frame = 0;
}
// Comprovem si ha tocat a Sam
if( this->x > ( this->sam->x - 7 ) && this->x < ( this->sam->x + 7 ) && this->y > ( this->sam->y - 7 ) && this->y < ( this->sam->y + 7 ) ) {
this->contador = 200;
info::vida--;
if( info::vida == 0 ) this->sam->o = 5;
}
} else {
this->contador--;
if( this->contador == 0 ) this->x = 20;
}
// Augmentem el frame
if (JG_GetCycleCounter() % this->cycles_per_frame == 0) {
this->cur_frame++;
if (this->cur_frame == this->entitat->animacions[this->o].num_frames) this->cur_frame = 0;
}
// Comprovem si ha tocat a Sam
if (this->x > (this->sam->x - 7) && this->x < (this->sam->x + 7) && this->y > (this->sam->y - 7) && this->y < (this->sam->y + 7)) {
this->contador = 200;
info::vida--;
if (info::vida == 0) this->sam->o = 5;
}
} else {
this->contador--;
if (this->contador == 0) this->x = 20;
}
}

View File

@@ -1,22 +1,17 @@
#pragma once
#include "game/sprite.hpp"
#include "game/prota.hpp"
#include "game/info.hpp"
#include "game/prota.hpp"
#include "game/sprite.hpp"
class Bola : public Sprite {
public:
Bola(JD8_Surface gfx, Prota* sam);
public:
Bola( JD8_Surface gfx, Prota* sam );
void draw();
void update();
protected:
Uint8 contador;
Prota* sam;
void draw();
void update();
protected:
Uint8 contador;
Prota* sam;
};

View File

@@ -1,64 +1,61 @@
#include "game/engendro.hpp"
#include "core/jgame.hpp"
#include <stdlib.h>
Engendro::Engendro( JD8_Surface gfx, Uint16 x, Uint16 y ) : Sprite( gfx ) {
#include "core/jgame.hpp"
this->entitat = (Entitat*)malloc( sizeof( Entitat ) );
// Frames
this->entitat->num_frames = 4;
this->entitat->frames = (Frame*)malloc( this->entitat->num_frames * sizeof( Frame ) );
Engendro::Engendro(JD8_Surface gfx, Uint16 x, Uint16 y)
: Sprite(gfx) {
this->entitat = (Entitat*)malloc(sizeof(Entitat));
// Frames
this->entitat->num_frames = 4;
this->entitat->frames = (Frame*)malloc(this->entitat->num_frames * sizeof(Frame));
Uint8 frame = 0;
for( int y = 50; y <= 65; y+=15 ) {
for( int x = 225; x <= 240; x+=15 ) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
this->entitat->frames[frame].x = x;
this->entitat->frames[frame].y = y;
frame++;
}
}
Uint8 frame = 0;
for (int y = 50; y <= 65; y += 15) {
for (int x = 225; x <= 240; x += 15) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
this->entitat->frames[frame].x = x;
this->entitat->frames[frame].y = y;
frame++;
}
}
// Animacions
this->entitat->num_animacions = 1;
this->entitat->animacions = (Animacio*)malloc( this->entitat->num_animacions * sizeof( Animacio ) );
this->entitat->animacions[0].num_frames = 6;
this->entitat->animacions[0].frames = (Uint8*)malloc( 6 );
this->entitat->animacions[0].frames[0] = 0;
this->entitat->animacions[0].frames[1] = 1;
this->entitat->animacions[0].frames[2] = 2;
this->entitat->animacions[0].frames[3] = 3;
this->entitat->animacions[0].frames[4] = 2;
this->entitat->animacions[0].frames[5] = 1;
this->cur_frame = 0;
this->vida = 18;
this->x = x;
this->y = y;
this->o = 0;
this->cycles_per_frame = 30;
// Animacions
this->entitat->num_animacions = 1;
this->entitat->animacions = (Animacio*)malloc(this->entitat->num_animacions * sizeof(Animacio));
this->entitat->animacions[0].num_frames = 6;
this->entitat->animacions[0].frames = (Uint8*)malloc(6);
this->entitat->animacions[0].frames[0] = 0;
this->entitat->animacions[0].frames[1] = 1;
this->entitat->animacions[0].frames[2] = 2;
this->entitat->animacions[0].frames[3] = 3;
this->entitat->animacions[0].frames[4] = 2;
this->entitat->animacions[0].frames[5] = 1;
this->cur_frame = 0;
this->vida = 18;
this->x = x;
this->y = y;
this->o = 0;
this->cycles_per_frame = 30;
}
void Engendro::draw() {
Sprite::draw();
Sprite::draw();
}
bool Engendro::update() {
bool mort = false;
bool mort = false;
if (JG_GetCycleCounter() % this->cycles_per_frame == 0) {
this->cur_frame++;
if (this->cur_frame == this->entitat->animacions[this->o].num_frames) this->cur_frame = 0;
this->vida--;
}
if( JG_GetCycleCounter() % this->cycles_per_frame == 0 ) {
this->cur_frame++;
if( this->cur_frame == this->entitat->animacions[this->o].num_frames ) this->cur_frame = 0;
this->vida--;
}
if (vida == 0) mort = true;
if( vida == 0 ) mort = true;
return mort;
return mort;
}

View File

@@ -3,16 +3,12 @@
#include "game/sprite.hpp"
class Engendro : public Sprite {
public:
Engendro(JD8_Surface gfx, Uint16 x, Uint16 y);
public:
Engendro( JD8_Surface gfx, Uint16 x, Uint16 y );
void draw();
bool update();
protected:
Uint8 vida;
void draw();
bool update();
protected:
Uint8 vida;
};

View File

@@ -1,14 +1,13 @@
#include "game/info.hpp"
namespace info
{
int num_piramide;
int num_habitacio;
int diners;
int diamants;
int vida;
int momies;
int engendros;
bool nou_personatge;
bool pepe_activat;
};
namespace info {
int num_piramide;
int num_habitacio;
int diners;
int diamants;
int vida;
int momies;
int engendros;
bool nou_personatge;
bool pepe_activat;
}; // namespace info

View File

@@ -1,14 +1,13 @@
#pragma once
namespace info
{
extern int num_piramide;
extern int num_habitacio;
extern int diners;
extern int diamants;
extern int vida;
extern int momies;
extern int engendros;
extern bool nou_personatge;
extern bool pepe_activat;
};
namespace info {
extern int num_piramide;
extern int num_habitacio;
extern int diners;
extern int diamants;
extern int vida;
extern int momies;
extern int engendros;
extern bool nou_personatge;
extern bool pepe_activat;
}; // namespace info

View File

@@ -1,292 +1,278 @@
#include "game/mapa.hpp"
#include <stdlib.h>
#include "core/jgame.hpp"
#include "core/jinput.hpp"
#include <stdlib.h>
Mapa::Mapa( JD8_Surface gfx, Prota* sam ) {
Mapa::Mapa(JD8_Surface gfx, Prota* sam) {
this->gfx = gfx;
this->sam = sam;
this->gfx = gfx;
this->sam = sam;
this->preparaFondoEstatic();
this->preparaTombes();
this->preparaFondoEstatic();
this->preparaTombes();
this->ultim_vertex.columna = 255;
this->frame_torxes = 0;
this->farao = false;
this->clau = false;
this->porta_oberta = false;
this->nova_momia = false;
this->ultim_vertex.columna = 255;
this->frame_torxes = 0;
this->farao = false;
this->clau = false;
this->porta_oberta = false;
this->nova_momia = false;
}
Mapa::~Mapa(void) {
JD8_FreeSurface( this->fondo );
JD8_FreeSurface(this->fondo);
}
void Mapa::draw() {
if (info::num_piramide != 4) {
switch (sam->o) {
case 0: // Down
JD8_BlitCKToSurface(sam->x, sam->y, this->gfx, 15, 125 + sam->frame_pejades, 15, 1, this->fondo, 255);
break;
case 1: // Up
JD8_BlitCKToSurface(sam->x, sam->y + 15, this->gfx, 0, 125 + (14 - sam->frame_pejades), 15, 1, this->fondo, 255);
break;
case 2: // Right
JD8_BlitCKToSurface(sam->x + 7, sam->y, this->gfx, 30 + sam->frame_pejades, 125, 1, 15, this->fondo, 255);
break;
case 3: // Left
JD8_BlitCKToSurface(sam->x + 8, sam->y, this->gfx, 45 + (14 - sam->frame_pejades), 125, 1, 15, this->fondo, 255);
break;
}
}
if( info::num_piramide != 4 ) {
switch( sam->o ) {
case 0: // Down
JD8_BlitCKToSurface( sam->x, sam->y, this->gfx, 15, 125 + sam->frame_pejades, 15, 1, this->fondo, 255 );
break;
case 1: // Up
JD8_BlitCKToSurface( sam->x, sam->y + 15, this->gfx, 0, 125 + ( 14 - sam->frame_pejades ), 15, 1, this->fondo, 255 );
break;
case 2: // Right
JD8_BlitCKToSurface( sam->x + 7, sam->y, this->gfx, 30 + sam->frame_pejades, 125, 1, 15, this->fondo, 255 );
break;
case 3: // Left
JD8_BlitCKToSurface( sam->x + 8, sam->y, this->gfx, 45 + ( 14 - sam->frame_pejades ), 125, 1, 15, this->fondo, 255 );
break;
}
}
JD8_Blit(this->fondo);
JD8_Blit( this->fondo );
// Pinta tombes
for (int y = 0; y < 4; y++) {
for (int x = 0; x < 4; x++) {
JD8_BlitCK(35 + (x * 65), 45 + (y * 35), this->gfx, this->tombes[x + y * 4].x, this->tombes[x + y * 4].y, 50, 20, 255);
}
}
JD8_BlitCK( 45, 15, this->gfx, 30 + ( this->frame_torxes * 25 ), 80, 25, 15, 255 );
JD8_BlitCK( 95, 15, this->gfx, 30 + ( this->frame_torxes * 25 ), 80, 25, 15, 255 );
JD8_BlitCK( 195, 15, this->gfx, 30 + ( this->frame_torxes * 25 ), 80, 25, 15, 255 );
JD8_BlitCK( 245, 15, this->gfx, 30 + ( this->frame_torxes * 25 ), 80, 25, 15, 255 );
// Pinta tombes
for (int y = 0; y < 4; y++) {
for (int x = 0; x < 4; x++) {
JD8_BlitCK(35 + (x * 65), 45 + (y * 35), this->gfx, this->tombes[x + y * 4].x, this->tombes[x + y * 4].y, 50, 20, 255);
}
}
JD8_BlitCK(45, 15, this->gfx, 30 + (this->frame_torxes * 25), 80, 25, 15, 255);
JD8_BlitCK(95, 15, this->gfx, 30 + (this->frame_torxes * 25), 80, 25, 15, 255);
JD8_BlitCK(195, 15, this->gfx, 30 + (this->frame_torxes * 25), 80, 25, 15, 255);
JD8_BlitCK(245, 15, this->gfx, 30 + (this->frame_torxes * 25), 80, 25, 15, 255);
};
void Mapa::update() {
if (((sam->x - 20) % 65 == 0) && ((sam->y - 30) % 35 == 0) && ((this->ultim_vertex.columna != (sam->x - 20) / 65) || (this->ultim_vertex.fila != (sam->y - 30) / 35))) {
this->vertex.columna = (sam->x - 20) / 65;
this->vertex.fila = (sam->y - 30) / 35;
if (this->ultim_vertex.columna != 255) this->comprovaUltimCami();
this->ultim_vertex = this->vertex;
}
if( ( ( sam->x - 20 ) % 65 == 0 ) && ( ( sam->y - 30 ) % 35 == 0 ) && ( ( this->ultim_vertex.columna != ( sam->x - 20 ) / 65 ) || ( this->ultim_vertex.fila != ( sam->y - 30 ) / 35 ) ) ) {
this->vertex.columna = ( sam->x - 20 ) / 65;
this->vertex.fila = ( sam->y - 30 ) / 35;
if( this->ultim_vertex.columna != 255 ) this->comprovaUltimCami();
this->ultim_vertex = this->vertex;
}
if( this->porta_oberta && sam->x == 150 && sam->y == 30 ) {
if( JI_KeyPressed( SDL_SCANCODE_UP ) ) {
this->sam->o = 4;
this->sam->y -= 15;
}
}
if( JG_GetCycleCounter()%8 == 0 ) {
this->frame_torxes++;
this->frame_torxes = this->frame_torxes % 4;
}
if (this->porta_oberta && sam->x == 150 && sam->y == 30) {
if (JI_KeyPressed(SDL_SCANCODE_UP)) {
this->sam->o = 4;
this->sam->y -= 15;
}
}
if (JG_GetCycleCounter() % 8 == 0) {
this->frame_torxes++;
this->frame_torxes = this->frame_torxes % 4;
}
}
bool Mapa::novaMomia() {
bool resultat = nova_momia;
nova_momia = false;
return resultat;
bool resultat = nova_momia;
nova_momia = false;
return resultat;
}
void Mapa::preparaFondoEstatic() {
// Prepara el fondo est<73>tic de l'habitaci<63>
this->fondo = JD8_NewSurface();
if (info::num_piramide == 6) {
JD8_BlitToSurface(9, 2, this->gfx, 227, 185, 92, 7, this->fondo); // Text "SECRETA"
} else {
JD8_BlitToSurface(9, 2, this->gfx, 60, 185, 39, 7, this->fondo); // Text "NIVELL"
JD8_BlitToSurface(72, 6, this->gfx, 153, 189, 3, 1, this->fondo); // Ralleta entre num piramide i num habitacio
}
JD8_BlitToSurface(130, 2, this->gfx, 225, 192, 19, 8, this->fondo); // Montonet de monedes + signe '='
JD8_BlitToSurface(220, 2, this->gfx, 160, 185, 48, 7, this->fondo); // Text "ENERGIA"
if (info::diners >= 200) JD8_BlitToSurface(175, 3, this->gfx, 60, 193, 7, 6, this->fondo);
// Prepara el fondo est<73>tic de l'habitaci<63>
this->fondo = JD8_NewSurface();
if (info::num_piramide == 6) {
JD8_BlitToSurface(9, 2, this->gfx, 227, 185, 92, 7, this->fondo); // Text "SECRETA"
}
else {
JD8_BlitToSurface(9, 2, this->gfx, 60, 185, 39, 7, this->fondo); // Text "NIVELL"
JD8_BlitToSurface(72, 6, this->gfx, 153, 189, 3, 1, this->fondo); // Ralleta entre num piramide i num habitacio
}
JD8_BlitToSurface(130, 2, this->gfx, 225, 192, 19, 8, this->fondo); // Montonet de monedes + signe '='
JD8_BlitToSurface(220, 2, this->gfx, 160, 185, 48, 7, this->fondo); // Text "ENERGIA"
if (info::diners >= 200) JD8_BlitToSurface(175, 3, this->gfx, 60, 193, 7, 6, this->fondo);
// Pinta taulells
for (int y = 0; y < 11; y++) {
for (int x = 0; x < 19; x++) {
switch (info::num_piramide) {
case 1:
JD8_BlitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx, 0, 80, 15, 15, this->fondo);
break;
case 2:
JD8_BlitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx, 25, 95, 15, 15, this->fondo);
break;
case 3:
JD8_BlitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx, 40, 95, 15, 15, this->fondo);
break;
case 4:
JD8_BlitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx, 175 + ((rand() % 3) * 15), 80, 15, 15, this->fondo);
break;
case 5:
JD8_BlitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx, 130, 80, 15, 15, this->fondo);
break;
case 6:
JD8_BlitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx, 145, 80, 15, 15, this->fondo);
break;
}
}
}
// Pinta taulells
for( int y = 0; y < 11; y++ ) {
for( int x = 0; x < 19; x++ ) {
switch( info::num_piramide ) {
case 1:
JD8_BlitToSurface( 20+(x*15), 30+(y*15), this->gfx, 0, 80, 15, 15, this->fondo );
break;
case 2:
JD8_BlitToSurface( 20+(x*15), 30+(y*15), this->gfx, 25, 95, 15, 15, this->fondo );
break;
case 3:
JD8_BlitToSurface( 20+(x*15), 30+(y*15), this->gfx, 40, 95, 15, 15, this->fondo );
break;
case 4:
JD8_BlitToSurface( 20+(x*15), 30+(y*15), this->gfx, 175 + ((rand()%3)*15), 80, 15, 15, this->fondo );
break;
case 5:
JD8_BlitToSurface( 20+(x*15), 30+(y*15), this->gfx, 130, 80, 15, 15, this->fondo );
break;
case 6:
JD8_BlitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx, 145, 80, 15, 15, this->fondo);
break;
}
}
}
// Pinta vores de les parets
JD8_BlitCKToSurface(5, 15, this->gfx, 30, 110, 15, 15, this->fondo, 255);
JD8_BlitCKToSurface(295, 15, this->gfx, 45, 110, 15, 15, this->fondo, 255);
JD8_BlitCKToSurface(5, 180, this->gfx, 0, 155, 15, 20, this->fondo, 255);
JD8_BlitCKToSurface(295, 180, this->gfx, 15, 155, 15, 20, this->fondo, 255);
// Pinta parets verticals
for (int i = 0; i < 10; i++) {
JD8_BlitToSurface(5, 30 + (i * 15), this->gfx, 0, 110, 15, 15, this->fondo);
JD8_BlitToSurface(295, 30 + (i * 15), this->gfx, 15, 110, 15, 15, this->fondo);
}
// Pinta vores de les parets
JD8_BlitCKToSurface( 5, 15, this->gfx, 30, 110, 15, 15, this->fondo, 255 );
JD8_BlitCKToSurface( 295, 15, this->gfx, 45, 110, 15, 15, this->fondo, 255 );
JD8_BlitCKToSurface( 5, 180, this->gfx, 0, 155, 15, 20, this->fondo, 255 );
JD8_BlitCKToSurface( 295, 180, this->gfx, 15, 155, 15, 20, this->fondo, 255 );
// Pinta parets hortzintals
for (int i = 0; i < 11; i++) {
JD8_BlitToSurface(20 + (i * 25), 185, this->gfx, 0, 95, 25, 15, this->fondo);
JD8_BlitToSurface(20 + (i * 25), 15, this->gfx, 0, 95, 25, 15, this->fondo);
}
// Pinta parets verticals
for( int i = 0; i < 10; i++ ) {
JD8_BlitToSurface( 5, 30+(i*15), this->gfx, 0, 110, 15, 15, this->fondo );
JD8_BlitToSurface( 295, 30+(i*15), this->gfx, 15, 110, 15, 15, this->fondo );
}
// Pinta la porta
JD8_BlitCKToSurface(150, 18, this->gfx, 0, 143, 15, 12, this->fondo, 255);
// Pinta parets hortzintals
for( int i = 0; i < 11; i++ ) {
JD8_BlitToSurface( 20+(i*25), 185, this->gfx, 0, 95, 25, 15, this->fondo );
JD8_BlitToSurface( 20+(i*25), 15, this->gfx, 0, 95, 25, 15, this->fondo );
}
// Pinta la porta
JD8_BlitCKToSurface( 150, 18, this->gfx, 0, 143, 15, 12, this->fondo, 255 );
if( info::num_piramide == 2 ) {
JD8_BlitToSurface( 5, 100, this->gfx, 30, 140, 15, 15, this->fondo );
}
if (info::num_piramide == 2) {
JD8_BlitToSurface(5, 100, this->gfx, 30, 140, 15, 15, this->fondo);
}
}
void swap( Uint8& a, Uint8& b ) {
Uint8 temp = a;
a = b;
b = temp;
void swap(Uint8& a, Uint8& b) {
Uint8 temp = a;
a = b;
b = temp;
}
void Mapa::preparaTombes() {
const Uint8 contingut = info::num_piramide == 6 ? CONTE_DIAMANT : CONTE_RES;
int cx = info::num_piramide == 6 ? 270 : 0;
int cy = info::num_piramide == 6 ? 50 : 0;
const Uint8 contingut = info::num_piramide == 6 ? CONTE_DIAMANT : CONTE_RES;
int cx = info::num_piramide == 6 ? 270 : 0;
int cy = info::num_piramide == 6 ? 50 : 0;
for( int i = 0; i < 16; i++ ) {
this->tombes[i].contingut = contingut;
this->tombes[i].oberta = false;
this->tombes[i].costat[0] = false;
this->tombes[i].costat[1] = false;
this->tombes[i].costat[2] = false;
this->tombes[i].costat[3] = false;
this->tombes[i].x = cx;
this->tombes[i].y = cy;
}
if (info::num_piramide == 6) return;
this->tombes[0].contingut = CONTE_FARAO;
this->tombes[1].contingut = CONTE_CLAU;
this->tombes[2].contingut = CONTE_PERGAMI;
this->tombes[3].contingut = CONTE_MOMIA;
for( int i = 4; i < 8; i++ ) this->tombes[i].contingut = CONTE_RES;
for( int i = 8; i < 16; i++ ) this->tombes[i].contingut = CONTE_TRESOR;
for (int i = 0; i < 16; i++) {
this->tombes[i].contingut = contingut;
this->tombes[i].oberta = false;
this->tombes[i].costat[0] = false;
this->tombes[i].costat[1] = false;
this->tombes[i].costat[2] = false;
this->tombes[i].costat[3] = false;
this->tombes[i].x = cx;
this->tombes[i].y = cy;
}
if (info::num_piramide == 6) return;
this->tombes[0].contingut = CONTE_FARAO;
this->tombes[1].contingut = CONTE_CLAU;
this->tombes[2].contingut = CONTE_PERGAMI;
this->tombes[3].contingut = CONTE_MOMIA;
for (int i = 4; i < 8; i++) this->tombes[i].contingut = CONTE_RES;
for (int i = 8; i < 16; i++) this->tombes[i].contingut = CONTE_TRESOR;
for( int i = 0; i < 50; i++ ) swap( this->tombes[rand()%16].contingut, this->tombes[rand()%16].contingut );
for (int i = 0; i < 50; i++) swap(this->tombes[rand() % 16].contingut, this->tombes[rand() % 16].contingut);
}
Uint8 minim( Uint8 a, Uint8 b ) {
return (a<b)?a:b;
Uint8 minim(Uint8 a, Uint8 b) {
return (a < b) ? a : b;
}
void Mapa::comprovaUltimCami() {
Uint8 col_aux = abs(this->vertex.columna - this->ultim_vertex.columna);
Uint8 fil_aux = abs(this->vertex.fila - this->ultim_vertex.fila);
Uint8 col_aux = abs( this->vertex.columna - this->ultim_vertex.columna );
Uint8 fil_aux = abs( this->vertex.fila - this->ultim_vertex.fila );
if (col_aux > fil_aux) { // Cam<61> horitzontal
Uint8 cami_fila = this->vertex.fila;
Uint8 cami_columna = minim(this->vertex.columna, this->ultim_vertex.columna);
if( col_aux > fil_aux ) { // Cam<61> horitzontal
Uint8 cami_fila = this->vertex.fila;
Uint8 cami_columna = minim( this->vertex.columna, this->ultim_vertex.columna );
Sint8 caixa_avall = (cami_fila << 2) + cami_columna;
Sint8 caixa_amunt = caixa_avall - 4;
Sint8 caixa_avall = ( cami_fila << 2 ) + cami_columna;
Sint8 caixa_amunt = caixa_avall - 4;
if (caixa_avall < 16) {
this->tombes[caixa_avall].costat[0] = true;
this->comprovaCaixa(caixa_avall);
}
if (caixa_amunt >= 0) {
this->tombes[caixa_amunt].costat[2] = true;
this->comprovaCaixa(caixa_amunt);
}
} else { // Cam<61> vertical
Uint8 cami_columna = this->vertex.columna;
Uint8 cami_fila = minim(this->vertex.fila, this->ultim_vertex.fila);
if( caixa_avall < 16 ) {
this->tombes[caixa_avall].costat[0] = true;
this->comprovaCaixa( caixa_avall );
}
if( caixa_amunt >= 0 ) {
this->tombes[caixa_amunt].costat[2] = true;
this->comprovaCaixa( caixa_amunt );
}
} else { // Cam<61> vertical
Uint8 cami_columna = this->vertex.columna;
Uint8 cami_fila = minim( this->vertex.fila, this->ultim_vertex.fila );
Sint8 caixa_dreta = (cami_fila << 2) + cami_columna;
Sint8 caixa_esquerra = caixa_dreta - 1;
Sint8 caixa_dreta = ( cami_fila << 2 ) + cami_columna;
Sint8 caixa_esquerra = caixa_dreta - 1;
if( caixa_dreta <= ( cami_fila << 2 ) + 3 ) {
this->tombes[caixa_dreta].costat[3] = true;
this->comprovaCaixa( caixa_dreta );
}
if( caixa_esquerra >= ( cami_fila << 2 ) ) {
this->tombes[caixa_esquerra].costat[1] = true;
this->comprovaCaixa( caixa_esquerra );
}
}
if (caixa_dreta <= (cami_fila << 2) + 3) {
this->tombes[caixa_dreta].costat[3] = true;
this->comprovaCaixa(caixa_dreta);
}
if (caixa_esquerra >= (cami_fila << 2)) {
this->tombes[caixa_esquerra].costat[1] = true;
this->comprovaCaixa(caixa_esquerra);
}
}
}
void Mapa::comprovaCaixa( Uint8 num )
{
// Si la tomba ja està oberta, no hi ha res que mirar
if( this->tombes[num].oberta ) return;
void Mapa::comprovaCaixa(Uint8 num) {
// Si la tomba ja està oberta, no hi ha res que mirar
if (this->tombes[num].oberta) return;
// Si algun costat encara no està passat, no hi ha res que fer
for( int i = 0; i < 4; i++ ) if( !this->tombes[num].costat[i] ) return;
// Si algun costat encara no està passat, no hi ha res que fer
for (int i = 0; i < 4; i++)
if (!this->tombes[num].costat[i]) return;
// Sinó, pos la acabem d'obrir
this->tombes[num].oberta = true;
// Sinó, pos la acabem d'obrir
this->tombes[num].oberta = true;
// Comprobem el premi del kinder sorpresa
switch( this->tombes[num].contingut )
{
case CONTE_RES:
this->tombes[num].x = 50;
break;
case CONTE_TRESOR:
this->tombes[num].x = 100;
info::diners++;
break;
case CONTE_FARAO:
this->tombes[num].x = 150;
this->farao = true;
break;
case CONTE_CLAU:
this->tombes[num].x = 200;
this->clau = true;
break;
case CONTE_MOMIA:
this->tombes[num].y = 175;
this->nova_momia = true;
break;
case CONTE_PERGAMI:
this->tombes[num].x = 250;
this->sam->pergami = true;
break;
case CONTE_DIAMANT:
this->tombes[num].y = 70;
info::diamants++;
info::diners += VALOR_DIAMANT;
if (info::diamants == 16) this->farao = this->clau = true;
break;
}
// Comprobem el premi del kinder sorpresa
switch (this->tombes[num].contingut) {
case CONTE_RES:
this->tombes[num].x = 50;
break;
case CONTE_TRESOR:
this->tombes[num].x = 100;
info::diners++;
break;
case CONTE_FARAO:
this->tombes[num].x = 150;
this->farao = true;
break;
case CONTE_CLAU:
this->tombes[num].x = 200;
this->clau = true;
break;
case CONTE_MOMIA:
this->tombes[num].y = 175;
this->nova_momia = true;
break;
case CONTE_PERGAMI:
this->tombes[num].x = 250;
this->sam->pergami = true;
break;
case CONTE_DIAMANT:
this->tombes[num].y = 70;
info::diamants++;
info::diners += VALOR_DIAMANT;
if (info::diamants == 16) this->farao = this->clau = true;
break;
}
this->comprovaPorta();
this->comprovaPorta();
}
void Mapa::comprovaPorta() {
if( this->clau && this->farao ) {
JD8_BlitCKToSurface( 150, 18, this->gfx, 15, 143, 15, 12, this->fondo, 255 );
porta_oberta = true;
}
if (this->clau && this->farao) {
JD8_BlitCKToSurface(150, 18, this->gfx, 15, 143, 15, 12, this->fondo, 255);
porta_oberta = true;
}
}

View File

@@ -1,7 +1,6 @@
#pragma once
#include "core/jdraw8.hpp"
#include "game/info.hpp"
#include "game/prota.hpp"
@@ -15,50 +14,46 @@
#define VALOR_DIAMANT 5
struct Tomba {
bool costat[4];
Uint8 contingut;
bool oberta;
Uint16 x, y;
bool costat[4];
Uint8 contingut;
bool oberta;
Uint16 x, y;
};
struct Vertex {
Uint8 columna;
Uint8 fila;
Uint8 columna;
Uint8 fila;
};
class Mapa {
public:
Mapa(JD8_Surface gfx, Prota* sam);
~Mapa(void);
public:
void draw();
void update();
bool novaMomia();
void comprovaCaixa(Uint8 num);
Mapa( JD8_Surface gfx, Prota* sam );
~Mapa(void);
Tomba tombes[16];
void draw();
void update();
bool novaMomia();
void comprovaCaixa( Uint8 num );
protected:
void preparaFondoEstatic();
void preparaTombes();
Tomba tombes[16];
void comprovaUltimCami();
void comprovaPorta();
protected:
JD8_Surface gfx;
JD8_Surface fondo;
Vertex vertex;
Vertex ultim_vertex;
Uint8 frame_torxes;
void preparaFondoEstatic();
void preparaTombes();
void comprovaUltimCami();
void comprovaPorta();
JD8_Surface gfx;
JD8_Surface fondo;
Vertex vertex;
Vertex ultim_vertex;
Uint8 frame_torxes;
Prota* sam;
bool farao;
bool clau;
bool porta_oberta;
bool nova_momia;
Prota* sam;
bool farao;
bool clau;
bool porta_oberta;
bool nova_momia;
};

View File

@@ -1,62 +1,60 @@
#include "game/marcador.hpp"
Marcador::Marcador( JD8_Surface gfx, Prota* sam ) {
this->gfx = gfx;
this->sam = sam;
Marcador::Marcador(JD8_Surface gfx, Prota* sam) {
this->gfx = gfx;
this->sam = sam;
}
Marcador::~Marcador(void) {
Marcador::~Marcador(void) {
}
void Marcador::draw() {
if (info::num_piramide < 6) {
this->pintaNumero(55, 2, info::num_piramide);
this->pintaNumero(80, 2, info::num_habitacio);
}
if (info::num_piramide < 6) {
this->pintaNumero(55, 2, info::num_piramide);
this->pintaNumero(80, 2, info::num_habitacio);
}
this->pintaNumero( 149, 2, info::diners / 100 );
this->pintaNumero( 156, 2, ( info::diners % 100 ) / 10 );
this->pintaNumero( 163, 2, info::diners % 10 );
this->pintaNumero(149, 2, info::diners / 100);
this->pintaNumero(156, 2, (info::diners % 100) / 10);
this->pintaNumero(163, 2, info::diners % 10);
if( this->sam->pergami ) JD8_BlitCK( 190, 1, this->gfx, 209, 185, 15, 14, 255 );
if (this->sam->pergami) JD8_BlitCK(190, 1, this->gfx, 209, 185, 15, 14, 255);
JD8_BlitCK( 271, 1, this->gfx, 0, 20, 15, info::vida*3, 255 );
if( info::vida < 5 ) JD8_BlitCK( 271, 1+(info::vida*3), this->gfx, 75, 20, 15, 15-(info::vida*3), 255 );
JD8_BlitCK(271, 1, this->gfx, 0, 20, 15, info::vida * 3, 255);
if (info::vida < 5) JD8_BlitCK(271, 1 + (info::vida * 3), this->gfx, 75, 20, 15, 15 - (info::vida * 3), 255);
}
void Marcador::pintaNumero( Uint16 x, Uint16 y, Uint8 num ) {
switch( num ) {
case 0:
JD8_BlitCK( x, y, this->gfx, 141, 193, 10, 7, 255 );
break;
case 1:
JD8_BlitCK( x, y, this->gfx, 100, 185, 10, 7, 255 );
break;
case 2:
JD8_BlitCK( x, y, this->gfx, 110, 185, 10, 7, 255 );
break;
case 3:
JD8_BlitCK( x, y, this->gfx, 120, 185, 10, 7, 255 );
break;
case 4:
JD8_BlitCK( x, y, this->gfx, 130, 185, 10, 7, 255 );
break;
case 5:
JD8_BlitCK( x, y, this->gfx, 140, 185, 10, 7, 255 );
break;
case 6:
JD8_BlitCK( x, y, this->gfx, 101, 193, 10, 7, 255 );
break;
case 7:
JD8_BlitCK( x, y, this->gfx, 111, 193, 10, 7, 255 );
break;
case 8:
JD8_BlitCK( x, y, this->gfx, 121, 193, 10, 7, 255 );
break;
case 9:
JD8_BlitCK( x, y, this->gfx, 131, 193, 10, 7, 255 );
break;
}
void Marcador::pintaNumero(Uint16 x, Uint16 y, Uint8 num) {
switch (num) {
case 0:
JD8_BlitCK(x, y, this->gfx, 141, 193, 10, 7, 255);
break;
case 1:
JD8_BlitCK(x, y, this->gfx, 100, 185, 10, 7, 255);
break;
case 2:
JD8_BlitCK(x, y, this->gfx, 110, 185, 10, 7, 255);
break;
case 3:
JD8_BlitCK(x, y, this->gfx, 120, 185, 10, 7, 255);
break;
case 4:
JD8_BlitCK(x, y, this->gfx, 130, 185, 10, 7, 255);
break;
case 5:
JD8_BlitCK(x, y, this->gfx, 140, 185, 10, 7, 255);
break;
case 6:
JD8_BlitCK(x, y, this->gfx, 101, 193, 10, 7, 255);
break;
case 7:
JD8_BlitCK(x, y, this->gfx, 111, 193, 10, 7, 255);
break;
case 8:
JD8_BlitCK(x, y, this->gfx, 121, 193, 10, 7, 255);
break;
case 9:
JD8_BlitCK(x, y, this->gfx, 131, 193, 10, 7, 255);
break;
}
}

View File

@@ -5,19 +5,15 @@
#include "game/prota.hpp"
class Marcador {
public:
Marcador(JD8_Surface gfx, Prota* sam);
~Marcador(void);
public:
void draw();
Marcador( JD8_Surface gfx, Prota* sam );
~Marcador(void);
void draw();
protected:
void pintaNumero( Uint16 x, Uint16 y, Uint8 num );
JD8_Surface gfx;
Prota* sam;
protected:
void pintaNumero(Uint16 x, Uint16 y, Uint8 num);
JD8_Surface gfx;
Prota* sam;
};

View File

@@ -1,166 +1,165 @@
#include "game/modulegame.hpp"
#include "core/jgame.hpp"
#include "core/jdraw8.hpp"
#include "core/jail_audio.hpp"
#include "core/jinput.hpp"
#include "core/jdraw8.hpp"
#include "core/jfile.hpp"
#include "core/jgame.hpp"
#include "core/jinput.hpp"
ModuleGame::ModuleGame() {
this->gfx = JD8_LoadSurface(info::pepe_activat ? "frames2.gif" : "frames.gif");
JG_SetUpdateTicks(10);
this->gfx = JD8_LoadSurface( info::pepe_activat ? "frames2.gif" : "frames.gif" );
JG_SetUpdateTicks(10);
this->sam = new Prota( this->gfx );
this->mapa = new Mapa( this->gfx, this->sam );
this->marcador = new Marcador( this->gfx, this->sam );
if( info::num_piramide == 2 ) {
this->bola = new Bola( this->gfx, this->sam );
} else {
this->bola = NULL;
}
this->momies = NULL;
this->final = 0;
this->iniciarMomies();
this->sam = new Prota(this->gfx);
this->mapa = new Mapa(this->gfx, this->sam);
this->marcador = new Marcador(this->gfx, this->sam);
if (info::num_piramide == 2) {
this->bola = new Bola(this->gfx, this->sam);
} else {
this->bola = NULL;
}
this->momies = NULL;
this->final = 0;
this->iniciarMomies();
}
ModuleGame::~ModuleGame(void) {
JD8_FadeOut();
JD8_FadeOut();
if( this->bola != NULL ) delete this->bola;
if( this->momies != NULL ) {
this->momies->clear();
delete this->momies;
}
delete this->marcador;
delete this->mapa;
delete this->sam;
JD8_FreeSurface( this->gfx );
if (this->bola != NULL) delete this->bola;
if (this->momies != NULL) {
this->momies->clear();
delete this->momies;
}
delete this->marcador;
delete this->mapa;
delete this->sam;
JD8_FreeSurface(this->gfx);
}
int ModuleGame::Go() {
this->Draw();
this->Draw();
const char* music = info::num_piramide == 3 ? "00000008.ogg" : (info::num_piramide == 2 ? "00000007.ogg" : (info::num_piramide == 6 ? "00000002.ogg" : "00000006.ogg"));
const char* current_music = JA_GetMusicFilename();
if ((JA_GetMusicState() != JA_MUSIC_PLAYING) || !(strcmp(music, current_music) == 0)) {
int size;
char* buffer = file_getfilebuffer(music, size);
JA_PlayMusic(JA_LoadMusic((Uint8*)buffer, size, music));
}
const char* music = info::num_piramide == 3 ? "00000008.ogg" : (info::num_piramide == 2 ? "00000007.ogg" : (info::num_piramide == 6 ? "00000002.ogg" : "00000006.ogg"));
const char *current_music = JA_GetMusicFilename();
if ( (JA_GetMusicState()!=JA_MUSIC_PLAYING) || !(strcmp(music, current_music) == 0)) {
int size;
char *buffer = file_getfilebuffer(music, size);
JA_PlayMusic(JA_LoadMusic((Uint8*)buffer, size, music));
}
JD8_FadeToPal(JD8_LoadPalette(info::pepe_activat ? "frames2.gif" : "frames.gif"));
JD8_FadeToPal( JD8_LoadPalette(info::pepe_activat ? "frames2.gif" : "frames.gif") );
while (this->final == 0 && !JG_Quitting()) {
this->Draw();
this->Update();
}
while (this->final == 0 && !JG_Quitting()) {
// JS_FadeOutMusic();
this->Draw();
this->Update();
}
//JS_FadeOutMusic();
if( this->final == 1 ) {
info::num_habitacio++;
if( info::num_habitacio == 6 ) {
info::num_habitacio = 1;
info::num_piramide++;
}
if (info::num_piramide == 6 && info::num_habitacio == 2) info::num_piramide++;
} else if (this->final == 2) {
if (this->final == 1) {
info::num_habitacio++;
if (info::num_habitacio == 6) {
info::num_habitacio = 1;
info::num_piramide++;
}
if (info::num_piramide == 6 && info::num_habitacio == 2) info::num_piramide++;
} else if (this->final == 2) {
info::num_piramide = 100;
}
if( JG_Quitting() ) {
return -1;
} else {
if (info::num_habitacio == 1 || info::num_piramide == 100 || info::num_piramide == 7) {
return 1;
} else {
return 0;
}
}
if (JG_Quitting()) {
return -1;
} else {
if (info::num_habitacio == 1 || info::num_piramide == 100 || info::num_piramide == 7) {
return 1;
} else {
return 0;
}
}
}
void ModuleGame::Draw() {
this->mapa->draw();
this->marcador->draw();
this->sam->draw();
if (this->momies != NULL) this->momies->draw();
if (this->bola != NULL) this->bola->draw();
this->mapa->draw();
this->marcador->draw();
this->sam->draw();
if( this->momies != NULL ) this->momies->draw();
if( this->bola != NULL ) this->bola->draw();
JD8_Flip();
JD8_Flip();
}
void ModuleGame::Update() {
if (JG_ShouldUpdate()) {
JI_Update();
if (JG_ShouldUpdate()) {
JI_Update();
this->final = this->sam->update();
if( this->momies != NULL && this->momies->update() ) {
Momia* seguent = this->momies->next;
delete this->momies;
this->momies = seguent;
info::momies--;
}
if( this->bola != NULL ) this->bola->update();
this->mapa->update();
if( this->mapa->novaMomia() ) {
if( this->momies != NULL ) {
this->momies->insertar( new Momia( this->gfx, true, 0, 0, this->sam ) );
info::momies++;
} else {
this->momies = new Momia( this->gfx, true, 0, 0, this->sam );
info::momies++;
}
}
this->final = this->sam->update();
if (this->momies != NULL && this->momies->update()) {
Momia* seguent = this->momies->next;
delete this->momies;
this->momies = seguent;
info::momies--;
}
if (this->bola != NULL) this->bola->update();
this->mapa->update();
if (this->mapa->novaMomia()) {
if (this->momies != NULL) {
this->momies->insertar(new Momia(this->gfx, true, 0, 0, this->sam));
info::momies++;
} else {
this->momies = new Momia(this->gfx, true, 0, 0, this->sam);
info::momies++;
}
}
if( JI_CheatActivated( "reviu" ) ) info::vida = 5;
if( JI_CheatActivated( "alone" ) ) {
if( this->momies != NULL ) {
this->momies->clear();
delete this->momies;
this->momies = NULL;
info::momies = 0;
}
}
if( JI_CheatActivated( "obert" ) ) {
for( int i = 0; i < 16; i++ ) {
this->mapa->tombes[i].costat[0] = true;
this->mapa->tombes[i].costat[1] = true;
this->mapa->tombes[i].costat[2] = true;
this->mapa->tombes[i].costat[3] = true;
this->mapa->comprovaCaixa( i );
}
}
if (JI_CheatActivated("reviu")) info::vida = 5;
if (JI_CheatActivated("alone")) {
if (this->momies != NULL) {
this->momies->clear();
delete this->momies;
this->momies = NULL;
info::momies = 0;
}
}
if (JI_CheatActivated("obert")) {
for (int i = 0; i < 16; i++) {
this->mapa->tombes[i].costat[0] = true;
this->mapa->tombes[i].costat[1] = true;
this->mapa->tombes[i].costat[2] = true;
this->mapa->tombes[i].costat[3] = true;
this->mapa->comprovaCaixa(i);
}
}
if( JI_KeyPressed( SDL_SCANCODE_ESCAPE ) ) {
JG_QuitSignal();
}
}
if (JI_KeyPressed(SDL_SCANCODE_ESCAPE)) {
JG_QuitSignal();
}
}
}
void ModuleGame::iniciarMomies() {
if (info::num_habitacio == 1) {
info::momies = 1;
} else {
info::momies++;
}
if (info::num_piramide == 6) info::momies = 8;
if( info::num_habitacio == 1 ) { info::momies = 1; } else { info::momies++; }
if (info::num_piramide == 6) info::momies = 8;
int x = 20;
int y = 170;
bool dimonis = info::num_piramide == 6;
for( int i = 0; i < info::momies; i++ ) {
if( this->momies == NULL) {
this->momies = new Momia( this->gfx, dimonis, x, y, this->sam );
} else {
this->momies->insertar( new Momia( this->gfx, dimonis, x, y, this->sam ) );
}
x += 65;
if( x == 345 ) { x = 20; y -= 35; }
}
int x = 20;
int y = 170;
bool dimonis = info::num_piramide == 6;
for (int i = 0; i < info::momies; i++) {
if (this->momies == NULL) {
this->momies = new Momia(this->gfx, dimonis, x, y, this->sam);
} else {
this->momies->insertar(new Momia(this->gfx, dimonis, x, y, this->sam));
}
x += 65;
if (x == 345) {
x = 20;
y -= 35;
}
}
}

View File

@@ -1,35 +1,31 @@
#pragma once
#include "game/bola.hpp"
#include "game/info.hpp"
#include "game/mapa.hpp"
#include "game/prota.hpp"
#include "game/marcador.hpp"
#include "game/momia.hpp"
#include "game/bola.hpp"
#include "game/prota.hpp"
class ModuleGame {
public:
ModuleGame();
~ModuleGame(void);
public:
int Go();
ModuleGame();
~ModuleGame(void);
private:
void Draw();
void Update();
int Go();
void iniciarMomies();
private:
void Draw();
void Update();
void iniciarMomies();
Uint8 final;
JD8_Surface gfx;
Mapa* mapa;
Prota* sam;
Marcador* marcador;
Momia* momies;
Bola* bola;
Uint8 final;
JD8_Surface gfx;
Mapa* mapa;
Prota* sam;
Marcador* marcador;
Momia* momies;
Bola* bola;
};

File diff suppressed because it is too large Load Diff

View File

@@ -3,23 +3,20 @@
#include "game/info.hpp"
class ModuleSequence {
public:
ModuleSequence();
~ModuleSequence(void);
public:
int Go();
ModuleSequence();
~ModuleSequence(void);
int Go();
private:
void doIntro();
void doMenu();
void doSlides();
void doBanner();
void doSecreta();
void doCredits();
private:
void doIntro();
void doMenu();
void doSlides();
void doBanner();
void doSecreta();
void doCredits();
void doMort();
int contador;
int contador;
};

View File

@@ -1,177 +1,183 @@
#include "game/momia.hpp"
#include "core/jgame.hpp"
#include <stdlib.h>
Momia::Momia( JD8_Surface gfx, bool dimoni, Uint16 x, Uint16 y, Prota* sam ) : Sprite( gfx ) {
this->dimoni = dimoni;
this->sam = sam;
#include "core/jgame.hpp"
this->entitat = (Entitat*)malloc( sizeof( Entitat ) );
// Frames
this->entitat->num_frames = 20;
this->entitat->frames = (Frame*)malloc( this->entitat->num_frames * sizeof( Frame ) );
Uint16 frame = 0;
for( int y = 0; y < 4; y++ ) {
for( int x = 0; x < 5; x++ ) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
if( info::num_piramide == 4 ) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = (x*15)+75;
if( this->dimoni ) this->entitat->frames[frame].x += 75;
this->entitat->frames[frame].y = 20+(y*15);
frame++;
Momia::Momia(JD8_Surface gfx, bool dimoni, Uint16 x, Uint16 y, Prota* sam)
: Sprite(gfx) {
this->dimoni = dimoni;
this->sam = sam;
}
}
// Animacions
this->entitat->num_animacions = 4;
this->entitat->animacions = (Animacio*)malloc( this->entitat->num_animacions * sizeof( Animacio ) );
for( int i = 0; i < 4; i++ ) {
this->entitat->animacions[i].num_frames = 8;
this->entitat->animacions[i].frames = (Uint8*)malloc( 8 );
this->entitat->animacions[i].frames[0] = 0 + (i*5);
this->entitat->animacions[i].frames[1] = 1 + (i*5);
this->entitat->animacions[i].frames[2] = 2 + (i*5);
this->entitat->animacions[i].frames[3] = 1 + (i*5);
this->entitat->animacions[i].frames[4] = 0 + (i*5);
this->entitat->animacions[i].frames[5] = 3 + (i*5);
this->entitat->animacions[i].frames[6] = 4 + (i*5);
this->entitat->animacions[i].frames[7] = 3 + (i*5);
}
this->entitat = (Entitat*)malloc(sizeof(Entitat));
// Frames
this->entitat->num_frames = 20;
this->entitat->frames = (Frame*)malloc(this->entitat->num_frames * sizeof(Frame));
Uint16 frame = 0;
for (int y = 0; y < 4; y++) {
for (int x = 0; x < 5; x++) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
if (info::num_piramide == 4) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = (x * 15) + 75;
if (this->dimoni) this->entitat->frames[frame].x += 75;
this->entitat->frames[frame].y = 20 + (y * 15);
frame++;
}
}
// Animacions
this->entitat->num_animacions = 4;
this->entitat->animacions = (Animacio*)malloc(this->entitat->num_animacions * sizeof(Animacio));
for (int i = 0; i < 4; i++) {
this->entitat->animacions[i].num_frames = 8;
this->entitat->animacions[i].frames = (Uint8*)malloc(8);
this->entitat->animacions[i].frames[0] = 0 + (i * 5);
this->entitat->animacions[i].frames[1] = 1 + (i * 5);
this->entitat->animacions[i].frames[2] = 2 + (i * 5);
this->entitat->animacions[i].frames[3] = 1 + (i * 5);
this->entitat->animacions[i].frames[4] = 0 + (i * 5);
this->entitat->animacions[i].frames[5] = 3 + (i * 5);
this->entitat->animacions[i].frames[6] = 4 + (i * 5);
this->entitat->animacions[i].frames[7] = 3 + (i * 5);
}
this->cur_frame = 0;
this->o = rand()%4;
this->cycles_per_frame = 4;
this->next = NULL;
if( this->dimoni ) {
if( x == 0 ) {
this->x = 150;
} else {
this->x = x;
}
if( y == 0 ) {
if( this->sam->y > 100 ) {
this->y = 30;
} else {
this->y = 170;
}
} else {
this->y = y;
}
this->engendro = new Engendro( gfx, this->x, this->y );
} else {
this->engendro = NULL;
this->x = x;
this->y = y;
}
this->cur_frame = 0;
this->o = rand() % 4;
this->cycles_per_frame = 4;
this->next = NULL;
if (this->dimoni) {
if (x == 0) {
this->x = 150;
} else {
this->x = x;
}
if (y == 0) {
if (this->sam->y > 100) {
this->y = 30;
} else {
this->y = 170;
}
} else {
this->y = y;
}
this->engendro = new Engendro(gfx, this->x, this->y);
} else {
this->engendro = NULL;
this->x = x;
this->y = y;
}
}
void Momia::clear() {
if( this->next != NULL ) this->next->clear();
if( this->engendro != NULL) delete this->engendro;
delete this->next;
if (this->next != NULL) this->next->clear();
if (this->engendro != NULL) delete this->engendro;
delete this->next;
}
void Momia::draw() {
if (this->engendro != NULL) {
this->engendro->draw();
} else {
Sprite::draw();
if( this->engendro != NULL ) {
this->engendro->draw();
} else {
Sprite::draw();
if( info::num_piramide == 4 ) {
if( ( JG_GetCycleCounter() % 40 ) < 20 ) {
JD8_BlitCK(this->x, this->y, this->gfx, 220, 80, 15, 15, 255 );
} else {
JD8_BlitCK(this->x, this->y, this->gfx, 235, 80, 15, 15, 255 );
}
}
}
if( this->next != NULL ) this->next->draw();
if (info::num_piramide == 4) {
if ((JG_GetCycleCounter() % 40) < 20) {
JD8_BlitCK(this->x, this->y, this->gfx, 220, 80, 15, 15, 255);
} else {
JD8_BlitCK(this->x, this->y, this->gfx, 235, 80, 15, 15, 255);
}
}
}
if (this->next != NULL) this->next->draw();
}
bool Momia::update() {
bool morta = false;
bool morta = false;
if (this->engendro != NULL) {
if (this->engendro->update()) {
delete this->engendro;
this->engendro = NULL;
}
} else {
if (this->sam->o < 4 && (this->dimoni || info::num_piramide == 5 || JG_GetCycleCounter() % 2 == 0)) {
if ((this->x - 20) % 65 == 0 && (this->y - 30) % 35 == 0) {
if (this->dimoni) {
if (rand() % 2 == 0) {
if (this->x > this->sam->x) {
this->o = 3;
} else if (this->x < this->sam->x) {
this->o = 2;
} else if (this->y < this->sam->y) {
this->o = 0;
} else if (this->y > this->sam->y) {
this->o = 1;
}
} else {
if (this->y < this->sam->y) {
this->o = 0;
} else if (this->y > this->sam->y) {
this->o = 1;
} else if (this->x > this->sam->x) {
this->o = 3;
} else if (this->x < this->sam->x) {
this->o = 2;
}
}
} else {
this->o = rand() % 4;
}
}
if( this->engendro != NULL ) {
if( this->engendro->update() ) {
delete this->engendro;
this->engendro = NULL;
}
} else {
if( this->sam->o < 4 && ( this->dimoni || info::num_piramide == 5 || JG_GetCycleCounter()%2 == 0 ) ) {
if( ( this->x - 20 ) % 65 == 0 && ( this->y - 30 ) % 35 == 0 ) {
if( this->dimoni ) {
if( rand()%2 == 0 ) {
if( this->x > this->sam->x ) { this->o = 3; }
else if( this->x < this->sam->x ) { this->o = 2; }
else if( this->y < this->sam->y ) { this->o = 0; }
else if( this->y > this->sam->y ) { this->o = 1; }
} else {
if( this->y < this->sam->y ) { this->o = 0; }
else if( this->y > this->sam->y ) { this->o = 1; }
else if( this->x > this->sam->x ) { this->o = 3; }
else if( this->x < this->sam->x ) { this->o = 2; }
}
} else {
this->o = rand()%4;
}
}
switch (this->o) {
case 0:
if (y < 170) this->y++;
break;
case 1:
if (y > 30) this->y--;
break;
case 2:
if (x < 280) this->x++;
break;
case 3:
if (x > 20) this->x--;
break;
}
switch( this->o ) {
case 0:
if( y < 170 ) this->y++;
break;
case 1:
if( y > 30 ) this->y--;
break;
case 2:
if( x < 280 ) this->x++;
break;
case 3:
if( x > 20 ) this->x--;
break;
}
if (JG_GetCycleCounter() % this->cycles_per_frame == 0) {
this->cur_frame++;
if (this->cur_frame == this->entitat->animacions[this->o].num_frames) this->cur_frame = 0;
}
if( JG_GetCycleCounter() % this->cycles_per_frame == 0 ) {
this->cur_frame++;
if( this->cur_frame == this->entitat->animacions[this->o].num_frames ) this->cur_frame = 0;
}
if (this->x > (this->sam->x - 7) && this->x < (this->sam->x + 7) && this->y > (this->sam->y - 7) && this->y < (this->sam->y + 7)) {
morta = true;
if (this->sam->pergami) {
this->sam->pergami = false;
} else {
info::vida--;
if (info::vida == 0) this->sam->o = 5;
}
}
}
}
if( this->x > ( this->sam->x - 7 ) && this->x < ( this->sam->x + 7 ) && this->y > ( this->sam->y - 7 ) && this->y < ( this->sam->y + 7 ) ) {
morta = true;
if( this->sam->pergami ) {
this->sam->pergami = false;
} else {
info::vida--;
if( info::vida == 0 ) this->sam->o = 5;
}
}
}
}
if (this->next != NULL) {
if (this->next->update()) {
Momia* seguent = this->next->next;
delete this->next;
this->next = seguent;
info::momies--;
}
}
if( this->next != NULL ) {
if( this->next->update() ) {
Momia* seguent = this->next->next;
delete this->next;
this->next = seguent;
info::momies--;
}
}
return morta;
return morta;
}
void Momia::insertar( Momia* momia ) {
if( this->next != NULL ) {
this->next->insertar( momia );
} else {
this->next = momia;
}
void Momia::insertar(Momia* momia) {
if (this->next != NULL) {
this->next->insertar(momia);
} else {
this->next = momia;
}
}

View File

@@ -1,27 +1,23 @@
#pragma once
#include "game/sprite.hpp"
#include "game/prota.hpp"
#include "game/engendro.hpp"
#include "game/info.hpp"
#include "game/prota.hpp"
#include "game/sprite.hpp"
class Momia : public Sprite {
public:
Momia(JD8_Surface gfx, bool dimoni, Uint16 x, Uint16 y, Prota* sam);
public:
void clear();
void draw();
bool update();
void insertar(Momia* momia);
Momia( JD8_Surface gfx, bool dimoni, Uint16 x, Uint16 y, Prota* sam );
void clear();
void draw();
bool update();
void insertar( Momia* momia );
bool dimoni;
Momia* next;
protected:
Prota* sam;
Engendro* engendro;
bool dimoni;
Momia* next;
protected:
Prota* sam;
Engendro* engendro;
};

View File

@@ -1,150 +1,152 @@
#include "game/prota.hpp"
#include "core/jgame.hpp"
#include "core/jinput.hpp"
#include <stdlib.h>
Prota::Prota( JD8_Surface gfx ) : Sprite( gfx ) {
#include "core/jgame.hpp"
#include "core/jinput.hpp"
this->entitat = (Entitat*)malloc( sizeof( Entitat ) );
this->entitat->num_frames = 82;
this->entitat->frames = (Frame*)malloc( this->entitat->num_frames * sizeof( Frame ) );
Uint16 frame = 0;
for( int y = 0; y < 4; y++ ) {
for( int x = 0; x < 5; x++ ) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
if( info::num_piramide == 4 ) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = x*15;
this->entitat->frames[frame].y = 20+(y*15);
frame++;
Prota::Prota(JD8_Surface gfx)
: Sprite(gfx) {
this->entitat = (Entitat*)malloc(sizeof(Entitat));
this->entitat->num_frames = 82;
this->entitat->frames = (Frame*)malloc(this->entitat->num_frames * sizeof(Frame));
Uint16 frame = 0;
for (int y = 0; y < 4; y++) {
for (int x = 0; x < 5; x++) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
if (info::num_piramide == 4) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = x * 15;
this->entitat->frames[frame].y = 20 + (y * 15);
frame++;
}
}
for (int y = 95; y < 185; y += 30) {
for (int x = 60; x < 315; x += 15) {
if (x != 300 || y != 155) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 30;
if (info::num_piramide == 4) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = x;
this->entitat->frames[frame].y = y;
frame++;
}
}
}
for (int y = 20; y < 50; y += 15) {
for (int x = 225; x < 315; x += 15) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
if (info::num_piramide == 4) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = x;
this->entitat->frames[frame].y = y;
frame++;
}
}
}
}
for( int y = 95; y < 185; y+=30 ) {
for( int x = 60; x < 315; x+=15 ) {
if( x != 300 || y != 155 ) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 30;
if( info::num_piramide == 4 ) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = x;
this->entitat->frames[frame].y = y;
frame++;
}
}
}
for( int y = 20; y < 50; y+=15 ) {
for( int x = 225; x < 315; x+=15 ) {
this->entitat->frames[frame].w = 15;
this->entitat->frames[frame].h = 15;
if( info::num_piramide == 4 ) this->entitat->frames[frame].h -= 5;
this->entitat->frames[frame].x = x;
this->entitat->frames[frame].y = y;
frame++;
}
}
this->entitat->num_animacions = 6;
this->entitat->animacions = (Animacio*)malloc(this->entitat->num_animacions * sizeof(Animacio));
for (int i = 0; i < 4; i++) {
this->entitat->animacions[i].num_frames = 8;
this->entitat->animacions[i].frames = (Uint8*)malloc(8);
this->entitat->animacions[i].frames[0] = 0 + (i * 5);
this->entitat->animacions[i].frames[1] = 1 + (i * 5);
this->entitat->animacions[i].frames[2] = 2 + (i * 5);
this->entitat->animacions[i].frames[3] = 1 + (i * 5);
this->entitat->animacions[i].frames[4] = 0 + (i * 5);
this->entitat->animacions[i].frames[5] = 3 + (i * 5);
this->entitat->animacions[i].frames[6] = 4 + (i * 5);
this->entitat->animacions[i].frames[7] = 3 + (i * 5);
}
this->entitat->animacions[4].num_frames = 50;
this->entitat->animacions[4].frames = (Uint8*)malloc(50);
for (int i = 0; i < 50; i++) this->entitat->animacions[4].frames[i] = i + 20;
this->entitat->num_animacions = 6;
this->entitat->animacions = (Animacio*)malloc( this->entitat->num_animacions * sizeof( Animacio ) );
for( int i = 0; i < 4; i++ ) {
this->entitat->animacions[i].num_frames = 8;
this->entitat->animacions[i].frames = (Uint8*)malloc( 8 );
this->entitat->animacions[i].frames[0] = 0 + (i*5);
this->entitat->animacions[i].frames[1] = 1 + (i*5);
this->entitat->animacions[i].frames[2] = 2 + (i*5);
this->entitat->animacions[i].frames[3] = 1 + (i*5);
this->entitat->animacions[i].frames[4] = 0 + (i*5);
this->entitat->animacions[i].frames[5] = 3 + (i*5);
this->entitat->animacions[i].frames[6] = 4 + (i*5);
this->entitat->animacions[i].frames[7] = 3 + (i*5);
}
this->entitat->animacions[4].num_frames = 50;
this->entitat->animacions[4].frames = (Uint8*)malloc( 50 );
for( int i = 0; i < 50; i++ ) this->entitat->animacions[4].frames[i] = i + 20;
this->entitat->animacions[5].num_frames = 48;
this->entitat->animacions[5].frames = (Uint8*)malloc(48);
for (int i = 0; i < 12; i++) this->entitat->animacions[5].frames[i] = i + 70;
for (int i = 12; i < 48; i++) this->entitat->animacions[5].frames[i] = 81;
this->entitat->animacions[5].num_frames = 48;
this->entitat->animacions[5].frames = (Uint8*)malloc( 48 );
for( int i = 0; i < 12; i++ ) this->entitat->animacions[5].frames[i] = i + 70;
for (int i = 12; i < 48; i++) this->entitat->animacions[5].frames[i] = 81;
this->cur_frame = 0;
this->x = 150;
this->y = 30;
this->o = 0;
this->cycles_per_frame = 4;
this->pergami = false;
this->frame_pejades = 0;
this->cur_frame = 0;
this->x = 150;
this->y = 30;
this->o = 0;
this->cycles_per_frame = 4;
this->pergami = false;
this->frame_pejades = 0;
}
void Prota::draw() {
Sprite::draw();
Sprite::draw();
if( info::num_piramide == 4 && this->o != 4) {
if( ( JG_GetCycleCounter() % 40 ) < 20 ) {
JD8_BlitCK(this->x, this->y, this->gfx, 220, 80, 15, 15, 255 );
} else {
JD8_BlitCK(this->x, this->y, this->gfx, 235, 80, 15, 15, 255 );
}
}
if (info::num_piramide == 4 && this->o != 4) {
if ((JG_GetCycleCounter() % 40) < 20) {
JD8_BlitCK(this->x, this->y, this->gfx, 220, 80, 15, 15, 255);
} else {
JD8_BlitCK(this->x, this->y, this->gfx, 235, 80, 15, 15, 255);
}
}
}
Uint8 Prota::update() {
Uint8 eixir = 0;
Uint8 eixir = 0;
if (this->o < 4) {
Uint8 dir = 4;
if (JI_KeyPressed(SDL_SCANCODE_DOWN)) {
if ((this->x - 20) % 65 == 0) this->o = 0;
dir = this->o;
}
if (JI_KeyPressed(SDL_SCANCODE_UP)) {
if ((this->x - 20) % 65 == 0) this->o = 1;
dir = this->o;
}
if (JI_KeyPressed(SDL_SCANCODE_RIGHT)) {
if ((this->y - 30) % 35 == 0) this->o = 2;
dir = this->o;
}
if (JI_KeyPressed(SDL_SCANCODE_LEFT)) {
if ((this->y - 30) % 35 == 0) this->o = 3;
dir = this->o;
}
if( this->o < 4 ) {
Uint8 dir = 4;
if ( JI_KeyPressed(SDL_SCANCODE_DOWN) ) {
if( (this->x-20)%65 == 0 ) this->o = 0;
dir = this->o;
}
if ( JI_KeyPressed(SDL_SCANCODE_UP) ) {
if( (this->x-20)%65 == 0 ) this->o = 1;
dir = this->o;
}
if( JI_KeyPressed( SDL_SCANCODE_RIGHT ) ) {
if( (this->y-30)%35 == 0 ) this->o = 2;
dir = this->o;
}
if( JI_KeyPressed( SDL_SCANCODE_LEFT ) ) {
if( (this->y-30)%35 == 0 ) this->o = 3;
dir = this->o;
}
switch (dir) {
case 0:
if (this->y < 170) this->y++;
break;
case 1:
if (this->y > 30) this->y--;
break;
case 2:
if (this->x < 280) this->x++;
break;
case 3:
if (this->x > 20) this->x--;
break;
}
switch( dir ) {
case 0:
if( this->y < 170 ) this->y++;
break;
case 1:
if( this->y > 30 ) this->y--;
break;
case 2:
if( this->x < 280 ) this->x++;
break;
case 3:
if( this->x > 20 ) this->x--;
break;
}
if( dir == 4 ) {
this->cur_frame = 0;
} else {
this->frame_pejades++;
if( this->frame_pejades == 15 ) this->frame_pejades = 0;
if( JG_GetCycleCounter() % this->cycles_per_frame == 0 ) {
this->cur_frame++;
if( this->cur_frame == this->entitat->animacions[this->o].num_frames ) this->cur_frame = 0;
}
}
eixir = false;
} else {
if( JG_GetCycleCounter() % this->cycles_per_frame == 0 ) {
this->cur_frame++;
if( this->cur_frame == this->entitat->animacions[this->o].num_frames ) {
if( this->o == 4 ) { eixir = 1; } else { eixir = 2; }
}
}
}
return eixir;
if (dir == 4) {
this->cur_frame = 0;
} else {
this->frame_pejades++;
if (this->frame_pejades == 15) this->frame_pejades = 0;
if (JG_GetCycleCounter() % this->cycles_per_frame == 0) {
this->cur_frame++;
if (this->cur_frame == this->entitat->animacions[this->o].num_frames) this->cur_frame = 0;
}
}
eixir = false;
} else {
if (JG_GetCycleCounter() % this->cycles_per_frame == 0) {
this->cur_frame++;
if (this->cur_frame == this->entitat->animacions[this->o].num_frames) {
if (this->o == 4) {
eixir = 1;
} else {
eixir = 2;
}
}
}
}
return eixir;
}

View File

@@ -1,21 +1,17 @@
#pragma once
#include "game/sprite.hpp"
#include "game/info.hpp"
#include "game/sprite.hpp"
class Prota : public Sprite {
public:
Prota(JD8_Surface gfx);
public:
Prota( JD8_Surface gfx );
void draw();
Uint8 update();
Uint8 frame_pejades;
bool pergami;
protected:
void draw();
Uint8 update();
Uint8 frame_pejades;
bool pergami;
protected:
};

View File

@@ -1,38 +1,26 @@
#include "game/sprite.hpp"
#include <stdlib.h>
Sprite::Sprite( JD8_Surface gfx ) {
this->gfx = gfx;
this->entitat = NULL;
Sprite::Sprite(JD8_Surface gfx) {
this->gfx = gfx;
this->entitat = NULL;
}
Sprite::~Sprite(void) {
if (this->entitat != NULL) {
if (this->entitat->num_frames > 0) free(this->entitat->frames);
if( this->entitat != NULL ) {
if( this->entitat->num_frames > 0 ) free( this->entitat->frames );
if( this->entitat->num_animacions > 0 ) {
for( int i = 0; i < this->entitat->num_animacions; i++ ) {
if( this->entitat->animacions[i].num_frames > 0 ) free( this->entitat->animacions[i].frames );
}
}
free( this->entitat );
}
if (this->entitat->num_animacions > 0) {
for (int i = 0; i < this->entitat->num_animacions; i++) {
if (this->entitat->animacions[i].num_frames > 0) free(this->entitat->animacions[i].frames);
}
}
free(this->entitat);
}
}
void Sprite::draw() {
JD8_BlitCK( this->x, this->y, this->gfx, this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].x,
this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].y,
this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].w,
this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].h,
255);
JD8_BlitCK(this->x, this->y, this->gfx, this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].x, this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].y, this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].w, this->entitat->frames[this->entitat->animacions[this->o].frames[this->cur_frame]].h, 255);
}

View File

@@ -3,42 +3,38 @@
#include "core/jdraw8.hpp"
struct Frame {
Uint16 x;
Uint16 y;
Uint16 w;
Uint16 h;
Uint16 x;
Uint16 y;
Uint16 w;
Uint16 h;
};
struct Animacio {
Uint8 num_frames;
Uint8* frames;
Uint8 num_frames;
Uint8* frames;
};
struct Entitat {
Uint8 num_frames;
Frame* frames;
Uint8 num_animacions;
Animacio* animacions;
Uint8 num_frames;
Frame* frames;
Uint8 num_animacions;
Animacio* animacions;
};
class Sprite {
public:
Sprite(JD8_Surface gfx);
~Sprite(void);
public:
void draw();
Sprite( JD8_Surface gfx );
~Sprite(void);
void draw();
Entitat* entitat;
Uint8 cur_frame;
Uint16 x;
Uint16 y;
Uint16 o;
protected:
JD8_Surface gfx;
Uint8 cycles_per_frame;
Entitat* entitat;
Uint8 cur_frame;
Uint16 x;
Uint16 y;
Uint16 o;
protected:
JD8_Surface gfx;
Uint8 cycles_per_frame;
};