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

clang-format

Browse Source
This commit is contained in:
Sergio
2026-04-04 13:03:20 +02:00
parent 6a09d7219d
commit baee62b375
36 changed files with 2576 additions and 2408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.clang-format Normal file
View File

@@ -0,0 +1,22 @@
BasedOnStyle: Google
IndentWidth: 4
NamespaceIndentation: All
IndentAccessModifiers: false
ColumnLimit: 0 # Sin límite de longitud de línea
BreakBeforeBraces: Attach # Llaves en la misma línea
AllowShortIfStatementsOnASingleLine: true
AllowShortBlocksOnASingleLine: true
AllowShortFunctionsOnASingleLine: All
AlignOperands: DontAlign
AlignAfterOpenBracket: DontAlign
BinPackArguments: false
BinPackParameters: false
ContinuationIndentWidth: 4
ConstructorInitializerIndentWidth: 4
IndentWrappedFunctionNames: false
Cpp11BracedListStyle: true
BreakConstructorInitializers: BeforeColon
AllowAllConstructorInitializersOnNextLine: false
PackConstructorInitializers: Never
AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false

32
CMakeLists.txt
View File

@@ -66,3 +66,35 @@ endif()
# Ejecutable en la raíz del proyecto # Ejecutable en la raíz del proyecto
set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}) set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
# --- CLANG-FORMAT TARGETS ---
find_program(CLANG_FORMAT_EXE NAMES clang-format)
# Recopilar todos los archivos fuente para formateo (excluir external/)
file(GLOB_RECURSE ALL_SOURCE_FILES
"${CMAKE_SOURCE_DIR}/source/*.cpp"
"${CMAKE_SOURCE_DIR}/source/*.hpp"
"${CMAKE_SOURCE_DIR}/source/*.h"
)
list(FILTER ALL_SOURCE_FILES EXCLUDE REGEX ".*/external/.*")
if(CLANG_FORMAT_EXE)
add_custom_target(format
COMMAND ${CLANG_FORMAT_EXE}
-i
${ALL_SOURCE_FILES}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "Running clang-format..."
)
add_custom_target(format-check
COMMAND ${CLANG_FORMAT_EXE}
--dry-run
--Werror
${ALL_SOURCE_FILES}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "Checking clang-format..."
)
else()
message(STATUS "clang-format no encontrado - targets 'format' y 'format-check' no disponibles")
endif()

281
source/core/jail_audio.cpp
View File

@@ -1,50 +1,49 @@
#ifndef JA_USESDLMIXER #ifndef JA_USESDLMIXER
#include "core/jail_audio.hpp" #include "core/jail_audio.hpp"
#include "external/stb_vorbis.h"
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
#include <stdio.h> #include <stdio.h>
#include "external/stb_vorbis.h"
#define JA_MAX_SIMULTANEOUS_CHANNELS 5 #define JA_MAX_SIMULTANEOUS_CHANNELS 5
struct JA_Sound_t struct JA_Sound_t {
{ SDL_AudioSpec spec{SDL_AUDIO_S16, 2, 48000};
SDL_AudioSpec spec { SDL_AUDIO_S16, 2, 48000 }; Uint32 length{0};
Uint32 length { 0 }; Uint8 *buffer{NULL};
Uint8 *buffer { NULL };
}; };
struct JA_Channel_t struct JA_Channel_t {
{ JA_Sound_t *sound{nullptr};
JA_Sound_t *sound { nullptr }; int pos{0};
int pos { 0 }; int times{0};
int times { 0 }; SDL_AudioStream *stream{nullptr};
SDL_AudioStream *stream { nullptr }; JA_Channel_state state{JA_CHANNEL_FREE};
JA_Channel_state state { JA_CHANNEL_FREE };
}; };
struct JA_Music_t struct JA_Music_t {
{ SDL_AudioSpec spec{SDL_AUDIO_S16, 2, 48000};
SDL_AudioSpec spec { SDL_AUDIO_S16, 2, 48000 }; Uint32 length{0};
Uint32 length { 0 }; Uint8 *buffer{nullptr};
Uint8 *buffer { nullptr }; char *filename{nullptr};
char *filename { nullptr };
int pos { 0 }; int pos{0};
int times { 0 }; int times{0};
SDL_AudioStream *stream { nullptr }; SDL_AudioStream *stream{nullptr};
JA_Music_state state { JA_MUSIC_INVALID }; JA_Music_state state{JA_MUSIC_INVALID};
}; };
JA_Music_t *current_music { nullptr }; JA_Music_t *current_music{nullptr};
JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS]; JA_Channel_t channels[JA_MAX_SIMULTANEOUS_CHANNELS];
SDL_AudioSpec JA_audioSpec { SDL_AUDIO_S16, 2, 48000 }; SDL_AudioSpec JA_audioSpec{SDL_AUDIO_S16, 2, 48000};
float JA_musicVolume { 1.0f }; float JA_musicVolume{1.0f};
float JA_soundVolume { 0.5f }; float JA_soundVolume{0.5f};
bool JA_musicEnabled { true }; bool JA_musicEnabled{true};
bool JA_soundEnabled { true }; bool JA_soundEnabled{true};
SDL_AudioDeviceID sdlAudioDevice { 0 }; SDL_AudioDeviceID sdlAudioDevice{0};
SDL_TimerID JA_timerID { 0 }; SDL_TimerID JA_timerID{0};
bool fading = false; bool fading = false;
int fade_start_time; int fade_start_time;
@@ -89,85 +88,71 @@ void audioCallback(void * userdata, uint8_t * stream, int len) {
} }
*/ */
Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) Uint32 JA_UpdateCallback(void *userdata, SDL_TimerID timerID, Uint32 interval) {
{ if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING) {
if (JA_musicEnabled && current_music && current_music->state == JA_MUSIC_PLAYING)
{
if (fading) { if (fading) {
int time = SDL_GetTicks(); int time = SDL_GetTicks();
if (time > (fade_start_time+fade_duration)) { if (time > (fade_start_time + fade_duration)) {
fading = false; fading = false;
JA_StopMusic(); JA_StopMusic();
return 30; return 30;
} else { } else {
const int time_passed = time - fade_start_time; const int time_passed = time - fade_start_time;
const float percent = (float)time_passed / (float)fade_duration; const float percent = (float)time_passed / (float)fade_duration;
SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume*(1.0 - percent)); SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume * (1.0 - percent));
} }
} }
if (current_music->times != 0) if (current_music->times != 0) {
{ if (SDL_GetAudioStreamAvailable(current_music->stream) < int(current_music->length / 2)) {
if (SDL_GetAudioStreamAvailable(current_music->stream) < int(current_music->length/2)) {
SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length); SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length);
} }
if (current_music->times>0) current_music->times--; if (current_music->times > 0) current_music->times--;
} } else {
else
{
if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) JA_StopMusic(); if (SDL_GetAudioStreamAvailable(current_music->stream) == 0) JA_StopMusic();
} }
} }
if (JA_soundEnabled) if (JA_soundEnabled) {
{ for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i)
for (int i=0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i) if (channels[i].state == JA_CHANNEL_PLAYING) {
if (channels[i].state == JA_CHANNEL_PLAYING) if (channels[i].times != 0) {
{ if (SDL_GetAudioStreamAvailable(channels[i].stream) < int(channels[i].sound->length / 2)) {
if (channels[i].times != 0)
{
if (SDL_GetAudioStreamAvailable(channels[i].stream) < int(channels[i].sound->length/2)) {
SDL_PutAudioStreamData(channels[i].stream, channels[i].sound->buffer, channels[i].sound->length); SDL_PutAudioStreamData(channels[i].stream, channels[i].sound->buffer, channels[i].sound->length);
if (channels[i].times>0) channels[i].times--; if (channels[i].times > 0) channels[i].times--;
} }
} } else {
else
{
if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) JA_StopChannel(i); if (SDL_GetAudioStreamAvailable(channels[i].stream) == 0) JA_StopChannel(i);
} }
} }
} }
return 30; return 30;
} }
void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels) void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels) {
{ #ifdef DEBUG
#ifdef DEBUG
SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG); SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG);
#endif #endif
SDL_Log("Iniciant JailAudio..."); SDL_Log("Iniciant JailAudio...");
JA_audioSpec = {format, num_channels, freq }; JA_audioSpec = {format, num_channels, freq};
if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice);
sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec); sdlAudioDevice = SDL_OpenAudioDevice(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &JA_audioSpec);
SDL_Log( (sdlAudioDevice==0) ? "Failed to initialize SDL audio!\n" : "OK!\n"); SDL_Log((sdlAudioDevice == 0) ? "Failed to initialize SDL audio!\n" : "OK!\n");
for (int i=0;i<JA_MAX_SIMULTANEOUS_CHANNELS;++i) channels[i].state = JA_CHANNEL_FREE; for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; ++i) channels[i].state = JA_CHANNEL_FREE;
//SDL_PauseAudioDevice(sdlAudioDevice); // SDL_PauseAudioDevice(sdlAudioDevice);
JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr); JA_timerID = SDL_AddTimer(30, JA_UpdateCallback, nullptr);
} }
void JA_Quit() void JA_Quit() {
{
if (JA_timerID) SDL_RemoveTimer(JA_timerID); if (JA_timerID) SDL_RemoveTimer(JA_timerID);
if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice); if (!sdlAudioDevice) SDL_CloseAudioDevice(sdlAudioDevice);
sdlAudioDevice = 0; sdlAudioDevice = 0;
} }
JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length, const char* filename) JA_Music_t *JA_LoadMusic(Uint8 *buffer, Uint32 length, const char *filename) {
{
JA_Music_t *music = new JA_Music_t(); JA_Music_t *music = new JA_Music_t();
int chan, samplerate; int chan, samplerate;
@@ -177,28 +162,27 @@ JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length, const char* filename)
music->spec.channels = chan; music->spec.channels = chan;
music->spec.freq = samplerate; music->spec.freq = samplerate;
music->spec.format = SDL_AUDIO_S16; music->spec.format = SDL_AUDIO_S16;
music->buffer = (Uint8*)SDL_malloc(music->length); music->buffer = (Uint8 *)SDL_malloc(music->length);
SDL_memcpy(music->buffer, output, music->length); SDL_memcpy(music->buffer, output, music->length);
free(output); free(output);
music->pos = 0; music->pos = 0;
music->state = JA_MUSIC_STOPPED; music->state = JA_MUSIC_STOPPED;
if (filename) { if (filename) {
music->filename = (char*)malloc(strlen(filename)+1); music->filename = (char *)malloc(strlen(filename) + 1);
strcpy(music->filename, filename); strcpy(music->filename, filename);
} }
return music; return music;
} }
JA_Music_t *JA_LoadMusic(const char* filename) JA_Music_t *JA_LoadMusic(const char *filename) {
{
// [RZC 28/08/22] Carreguem primer el arxiu en memòria i després el descomprimim. Es algo més rapid. // [RZC 28/08/22] Carreguem primer el arxiu en memòria i després el descomprimim. Es algo més rapid.
FILE *f = fopen(filename, "rb"); FILE *f = fopen(filename, "rb");
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
long fsize = ftell(f); long fsize = ftell(f);
fseek(f, 0, SEEK_SET); fseek(f, 0, SEEK_SET);
Uint8 *buffer = (Uint8*)malloc(fsize + 1); Uint8 *buffer = (Uint8 *)malloc(fsize + 1);
if (fread(buffer, fsize, 1, f)!=1) return NULL; if (fread(buffer, fsize, 1, f) != 1) return NULL;
fclose(f); fclose(f);
JA_Music_t *music = JA_LoadMusic(buffer, fsize, filename); JA_Music_t *music = JA_LoadMusic(buffer, fsize, filename);
@@ -208,8 +192,7 @@ JA_Music_t *JA_LoadMusic(const char* filename)
return music; return music;
} }
void JA_PlayMusic(JA_Music_t *music, const int loop) void JA_PlayMusic(JA_Music_t *music, const int loop) {
{
if (!JA_musicEnabled) return; if (!JA_musicEnabled) return;
JA_StopMusic(); JA_StopMusic();
@@ -223,51 +206,46 @@ void JA_PlayMusic(JA_Music_t *music, const int loop)
if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) printf("[ERROR] SDL_PutAudioStreamData failed!\n"); if (!SDL_PutAudioStreamData(current_music->stream, current_music->buffer, current_music->length)) printf("[ERROR] SDL_PutAudioStreamData failed!\n");
SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume);
if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) printf("[ERROR] SDL_BindAudioStream failed!\n"); if (!SDL_BindAudioStream(sdlAudioDevice, current_music->stream)) printf("[ERROR] SDL_BindAudioStream failed!\n");
//SDL_ResumeAudioStreamDevice(current_music->stream); // SDL_ResumeAudioStreamDevice(current_music->stream);
} }
char *JA_GetMusicFilename(JA_Music_t *music) char *JA_GetMusicFilename(JA_Music_t *music) {
{
if (!music) music = current_music; if (!music) music = current_music;
return music->filename; return music->filename;
} }
void JA_PauseMusic() void JA_PauseMusic() {
{
if (!JA_musicEnabled) return; if (!JA_musicEnabled) return;
if (!current_music || current_music->state == JA_MUSIC_INVALID) return; if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
current_music->state = JA_MUSIC_PAUSED; current_music->state = JA_MUSIC_PAUSED;
//SDL_PauseAudioStreamDevice(current_music->stream); // SDL_PauseAudioStreamDevice(current_music->stream);
SDL_UnbindAudioStream(current_music->stream); SDL_UnbindAudioStream(current_music->stream);
} }
void JA_ResumeMusic() void JA_ResumeMusic() {
{
if (!JA_musicEnabled) return; if (!JA_musicEnabled) return;
if (!current_music || current_music->state == JA_MUSIC_INVALID) return; if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
current_music->state = JA_MUSIC_PLAYING; current_music->state = JA_MUSIC_PLAYING;
//SDL_ResumeAudioStreamDevice(current_music->stream); // SDL_ResumeAudioStreamDevice(current_music->stream);
SDL_BindAudioStream(sdlAudioDevice, current_music->stream); SDL_BindAudioStream(sdlAudioDevice, current_music->stream);
} }
void JA_StopMusic() void JA_StopMusic() {
{
if (!JA_musicEnabled) return; if (!JA_musicEnabled) return;
if (!current_music || current_music->state == JA_MUSIC_INVALID) return; if (!current_music || current_music->state == JA_MUSIC_INVALID) return;
current_music->pos = 0; current_music->pos = 0;
current_music->state = JA_MUSIC_STOPPED; current_music->state = JA_MUSIC_STOPPED;
//SDL_PauseAudioStreamDevice(current_music->stream); // SDL_PauseAudioStreamDevice(current_music->stream);
SDL_DestroyAudioStream(current_music->stream); SDL_DestroyAudioStream(current_music->stream);
current_music->stream = nullptr; current_music->stream = nullptr;
free(current_music->filename); free(current_music->filename);
current_music->filename = nullptr; current_music->filename = nullptr;
} }
void JA_FadeOutMusic(const int milliseconds) void JA_FadeOutMusic(const int milliseconds) {
{
if (!JA_musicEnabled) return; if (!JA_musicEnabled) return;
if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return; if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return;
@@ -277,78 +255,64 @@ void JA_FadeOutMusic(const int milliseconds)
fade_initial_volume = JA_musicVolume; fade_initial_volume = JA_musicVolume;
} }
JA_Music_state JA_GetMusicState() JA_Music_state JA_GetMusicState() {
{
if (!JA_musicEnabled) return JA_MUSIC_DISABLED; if (!JA_musicEnabled) return JA_MUSIC_DISABLED;
if (!current_music) return JA_MUSIC_INVALID; if (!current_music) return JA_MUSIC_INVALID;
return current_music->state; return current_music->state;
} }
void JA_DeleteMusic(JA_Music_t *music) void JA_DeleteMusic(JA_Music_t *music) {
{
if (current_music == music) current_music = nullptr; if (current_music == music) current_music = nullptr;
SDL_free(music->buffer); SDL_free(music->buffer);
if (music->stream) SDL_DestroyAudioStream(music->stream); if (music->stream) SDL_DestroyAudioStream(music->stream);
delete music; delete music;
} }
float JA_SetMusicVolume(float volume) float JA_SetMusicVolume(float volume) {
{ JA_musicVolume = SDL_clamp(volume, 0.0f, 1.0f);
JA_musicVolume = SDL_clamp( volume, 0.0f, 1.0f );
if (current_music) SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume); if (current_music) SDL_SetAudioStreamGain(current_music->stream, JA_musicVolume);
return JA_musicVolume; return JA_musicVolume;
} }
void JA_SetMusicPosition(float value) void JA_SetMusicPosition(float value) {
{
if (!current_music) return; if (!current_music) return;
current_music->pos = value * current_music->spec.freq; current_music->pos = value * current_music->spec.freq;
} }
float JA_GetMusicPosition() float JA_GetMusicPosition() {
{
if (!current_music) return 0; if (!current_music) return 0;
return float(current_music->pos)/float(current_music->spec.freq); return float(current_music->pos) / float(current_music->spec.freq);
} }
void JA_EnableMusic(const bool value) void JA_EnableMusic(const bool value) {
{ if (!value && current_music && (current_music->state == JA_MUSIC_PLAYING)) JA_StopMusic();
if ( !value && current_music && (current_music->state==JA_MUSIC_PLAYING) ) JA_StopMusic();
JA_musicEnabled = value; JA_musicEnabled = value;
} }
JA_Sound_t *JA_NewSound(Uint8 *buffer, Uint32 length) {
JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length)
{
JA_Sound_t *sound = new JA_Sound_t(); JA_Sound_t *sound = new JA_Sound_t();
sound->buffer = buffer; sound->buffer = buffer;
sound->length = length; sound->length = length;
return sound; return sound;
} }
JA_Sound_t *JA_LoadSound(uint8_t* buffer, uint32_t size) JA_Sound_t *JA_LoadSound(uint8_t *buffer, uint32_t size) {
{
JA_Sound_t *sound = new JA_Sound_t(); JA_Sound_t *sound = new JA_Sound_t();
SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size),1, &sound->spec, &sound->buffer, &sound->length); SDL_LoadWAV_IO(SDL_IOFromMem(buffer, size), 1, &sound->spec, &sound->buffer, &sound->length);
return sound; return sound;
} }
JA_Sound_t *JA_LoadSound(const char* filename) JA_Sound_t *JA_LoadSound(const char *filename) {
{
JA_Sound_t *sound = new JA_Sound_t(); JA_Sound_t *sound = new JA_Sound_t();
SDL_LoadWAV(filename, &sound->spec, &sound->buffer, &sound->length); SDL_LoadWAV(filename, &sound->spec, &sound->buffer, &sound->length);
return sound; return sound;
} }
int JA_PlaySound(JA_Sound_t *sound, const int loop) int JA_PlaySound(JA_Sound_t *sound, const int loop) {
{
if (!JA_soundEnabled) return -1; if (!JA_soundEnabled) return -1;
int channel = 0; int channel = 0;
@@ -368,8 +332,7 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop)
return channel; return channel;
} }
int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop) int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop) {
{
if (!JA_soundEnabled) return -1; if (!JA_soundEnabled) return -1;
if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1; if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1;
@@ -387,8 +350,7 @@ int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop)
return channel; return channel;
} }
void JA_DeleteSound(JA_Sound_t *sound) void JA_DeleteSound(JA_Sound_t *sound) {
{
for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
if (channels[i].sound == sound) JA_StopChannel(i); if (channels[i].sound == sound) JA_StopChannel(i);
} }
@@ -396,62 +358,48 @@ void JA_DeleteSound(JA_Sound_t *sound)
delete sound; delete sound;
} }
void JA_PauseChannel(const int channel) void JA_PauseChannel(const int channel) {
{
if (!JA_soundEnabled) return; if (!JA_soundEnabled) return;
if (channel == -1) if (channel == -1) {
{
for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
if (channels[i].state == JA_CHANNEL_PLAYING) if (channels[i].state == JA_CHANNEL_PLAYING) {
{
channels[i].state = JA_CHANNEL_PAUSED; channels[i].state = JA_CHANNEL_PAUSED;
//SDL_PauseAudioStreamDevice(channels[i].stream); // SDL_PauseAudioStreamDevice(channels[i].stream);
SDL_UnbindAudioStream(channels[i].stream); SDL_UnbindAudioStream(channels[i].stream);
} }
} } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) {
else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) if (channels[channel].state == JA_CHANNEL_PLAYING) {
{
if (channels[channel].state == JA_CHANNEL_PLAYING)
{
channels[channel].state = JA_CHANNEL_PAUSED; channels[channel].state = JA_CHANNEL_PAUSED;
//SDL_PauseAudioStreamDevice(channels[channel].stream); // SDL_PauseAudioStreamDevice(channels[channel].stream);
SDL_UnbindAudioStream(channels[channel].stream); SDL_UnbindAudioStream(channels[channel].stream);
} }
} }
} }
void JA_ResumeChannel(const int channel) void JA_ResumeChannel(const int channel) {
{
if (!JA_soundEnabled) return; if (!JA_soundEnabled) return;
if (channel == -1) if (channel == -1) {
{
for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
if (channels[i].state == JA_CHANNEL_PAUSED) if (channels[i].state == JA_CHANNEL_PAUSED) {
{
channels[i].state = JA_CHANNEL_PLAYING; channels[i].state = JA_CHANNEL_PLAYING;
//SDL_ResumeAudioStreamDevice(channels[i].stream); // SDL_ResumeAudioStreamDevice(channels[i].stream);
SDL_BindAudioStream(sdlAudioDevice, channels[i].stream); SDL_BindAudioStream(sdlAudioDevice, channels[i].stream);
} }
} } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) {
else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) if (channels[channel].state == JA_CHANNEL_PAUSED) {
{
if (channels[channel].state == JA_CHANNEL_PAUSED)
{
channels[channel].state = JA_CHANNEL_PLAYING; channels[channel].state = JA_CHANNEL_PLAYING;
//SDL_ResumeAudioStreamDevice(channels[channel].stream); // SDL_ResumeAudioStreamDevice(channels[channel].stream);
SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream); SDL_BindAudioStream(sdlAudioDevice, channels[channel].stream);
} }
} }
} }
void JA_StopChannel(const int channel) void JA_StopChannel(const int channel) {
{
if (!JA_soundEnabled) return; if (!JA_soundEnabled) return;
if (channel == -1) if (channel == -1) {
{
for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) { for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream); if (channels[i].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[i].stream);
channels[i].stream = nullptr; channels[i].stream = nullptr;
@@ -459,9 +407,7 @@ void JA_StopChannel(const int channel)
channels[i].pos = 0; channels[i].pos = 0;
channels[i].sound = NULL; channels[i].sound = NULL;
} }
} } else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS) {
else if (channel >= 0 && channel < JA_MAX_SIMULTANEOUS_CHANNELS)
{
if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream); if (channels[channel].state != JA_CHANNEL_FREE) SDL_DestroyAudioStream(channels[channel].stream);
channels[channel].stream = nullptr; channels[channel].stream = nullptr;
channels[channel].state = JA_CHANNEL_FREE; channels[channel].state = JA_CHANNEL_FREE;
@@ -470,8 +416,7 @@ void JA_StopChannel(const int channel)
} }
} }
JA_Channel_state JA_GetChannelState(const int channel) JA_Channel_state JA_GetChannelState(const int channel) {
{
if (!JA_soundEnabled) return JA_SOUND_DISABLED; if (!JA_soundEnabled) return JA_SOUND_DISABLED;
if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID; if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID;
@@ -479,28 +424,24 @@ JA_Channel_state JA_GetChannelState(const int channel)
return channels[channel].state; return channels[channel].state;
} }
float JA_SetSoundVolume(float volume) float JA_SetSoundVolume(float volume) {
{ JA_soundVolume = SDL_clamp(volume, 0.0f, 1.0f);
JA_soundVolume = SDL_clamp( volume, 0.0f, 1.0f );
for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
if ( (channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED) ) if ((channels[i].state == JA_CHANNEL_PLAYING) || (channels[i].state == JA_CHANNEL_PAUSED))
SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume); SDL_SetAudioStreamGain(channels[i].stream, JA_soundVolume);
return JA_soundVolume; return JA_soundVolume;
} }
void JA_EnableSound(const bool value) void JA_EnableSound(const bool value) {
{ for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
{
if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i); if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i);
} }
JA_soundEnabled = value; JA_soundEnabled = value;
} }
float JA_SetVolume(float volume) float JA_SetVolume(float volume) {
{
JA_SetSoundVolume(JA_SetMusicVolume(volume) / 2.0f); JA_SetSoundVolume(JA_SetMusicVolume(volume) / 2.0f);
return JA_musicVolume; return JA_musicVolume;

22
source/core/jail_audio.hpp
View File

@@ -1,8 +1,16 @@
#pragma once #pragma once
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED, JA_SOUND_DISABLED }; enum JA_Channel_state { JA_CHANNEL_INVALID,
enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED, JA_MUSIC_DISABLED }; JA_CHANNEL_FREE,
JA_CHANNEL_PLAYING,
JA_CHANNEL_PAUSED,
JA_SOUND_DISABLED };
enum JA_Music_state { JA_MUSIC_INVALID,
JA_MUSIC_PLAYING,
JA_MUSIC_PAUSED,
JA_MUSIC_STOPPED,
JA_MUSIC_DISABLED };
struct JA_Sound_t; struct JA_Sound_t;
struct JA_Music_t; struct JA_Music_t;
@@ -10,8 +18,8 @@ struct JA_Music_t;
void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels); void JA_Init(const int freq, const SDL_AudioFormat format, const int num_channels);
void JA_Quit(); void JA_Quit();
JA_Music_t *JA_LoadMusic(const char* filename); JA_Music_t *JA_LoadMusic(const char *filename);
JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length, const char* filename=nullptr); JA_Music_t *JA_LoadMusic(Uint8 *buffer, Uint32 length, const char *filename = nullptr);
void JA_PlayMusic(JA_Music_t *music, const int loop = -1); void JA_PlayMusic(JA_Music_t *music, const int loop = -1);
char *JA_GetMusicFilename(JA_Music_t *music = nullptr); char *JA_GetMusicFilename(JA_Music_t *music = nullptr);
void JA_PauseMusic(); void JA_PauseMusic();
@@ -25,9 +33,9 @@ void JA_SetMusicPosition(float value);
float JA_GetMusicPosition(); float JA_GetMusicPosition();
void JA_EnableMusic(const bool value); void JA_EnableMusic(const bool value);
JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length); JA_Sound_t *JA_NewSound(Uint8 *buffer, Uint32 length);
JA_Sound_t *JA_LoadSound(Uint8* buffer, Uint32 length); JA_Sound_t *JA_LoadSound(Uint8 *buffer, Uint32 length);
JA_Sound_t *JA_LoadSound(const char* filename); JA_Sound_t *JA_LoadSound(const char *filename);
int JA_PlaySound(JA_Sound_t *sound, const int loop = 0); int JA_PlaySound(JA_Sound_t *sound, const int loop = 0);
int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0); int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0);
void JA_PauseChannel(const int channel); void JA_PauseChannel(const int channel);

306
source/core/jdraw8.cpp
View File

@@ -1,15 +1,17 @@
#include "core/jdraw8.hpp" #include "core/jdraw8.hpp"
#include "core/jfile.hpp"
#include <fstream> #include <fstream>
#include "external/gif.h"
#include "core/jfile.hpp"
#include "core/jshader.hpp" #include "core/jshader.hpp"
#include "external/gif.h"
#define SCREEN_WIDTH 960 #define SCREEN_WIDTH 960
#define SCREEN_HEIGHT 720 #define SCREEN_HEIGHT 720
JD8_Surface screen = NULL; JD8_Surface screen = NULL;
JD8_Palette main_palette = NULL; JD8_Palette main_palette = NULL;
Uint32* pixel_data = NULL; Uint32 *pixel_data = NULL;
int screenWidth = 320; int screenWidth = 320;
int screenHeight = 200; int screenHeight = 200;
@@ -18,217 +20,235 @@ Uint32 contadorFPS = 0;
Uint32 tempsFPS = SDL_GetTicks(); Uint32 tempsFPS = SDL_GetTicks();
char *fps = (char *)malloc(10); char *fps = (char *)malloc(10);
SDL_Window* sdlWindow = NULL; SDL_Window *sdlWindow = NULL;
SDL_Renderer* sdlRenderer = NULL; SDL_Renderer *sdlRenderer = NULL;
SDL_Texture* sdlTexture = NULL; SDL_Texture *sdlTexture = NULL;
SDL_Texture* backBuffer = NULL; SDL_Texture *backBuffer = NULL;
void JD8_Init(const char *title) { void JD8_Init(const char *title) {
screen = (JD8_Surface)calloc( 1, 64000 ); screen = (JD8_Surface)calloc(1, 64000);
main_palette = (JD8_Palette)calloc( 1, 768 ); main_palette = (JD8_Palette)calloc(1, 768);
pixel_data = (Uint32*)calloc(1, 320 * 200 * 4); // 1048576 ); pixel_data = (Uint32 *)calloc(1, 320 * 200 * 4); // 1048576 );
sdlWindow = SDL_CreateWindow( title, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_OPENGL ); sdlWindow = SDL_CreateWindow(title, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_OPENGL);
SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl"); SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl");
//SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "nearest"); // SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "nearest");
sdlRenderer = SDL_CreateRenderer(sdlWindow, NULL); sdlRenderer = SDL_CreateRenderer(sdlWindow, NULL);
sdlTexture = SDL_CreateTexture(sdlRenderer, SDL_PIXELFORMAT_ABGR8888, SDL_TEXTUREACCESS_STREAMING, 320, 200); sdlTexture = SDL_CreateTexture(sdlRenderer, SDL_PIXELFORMAT_ABGR8888, SDL_TEXTUREACCESS_STREAMING, 320, 200);
backBuffer = SDL_CreateTexture(sdlRenderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_TARGET, 320, 200); backBuffer = SDL_CreateTexture(sdlRenderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_TARGET, 320, 200);
int filesize = 0; int filesize = 0;
char *buffer = file_getfilebuffer("crtpi.glsl", filesize, true); char *buffer = file_getfilebuffer("crtpi.glsl", filesize, true);
shader::init(sdlWindow, backBuffer, buffer); shader::init(sdlWindow, backBuffer, buffer);
free(buffer); free(buffer);
} }
void JD8_Quit() { void JD8_Quit() {
if( screen != NULL ) free( screen ); if (screen != NULL) free(screen);
if( main_palette != NULL ) free( main_palette ); if (main_palette != NULL) free(main_palette);
if( pixel_data != NULL ) free( pixel_data ); if (pixel_data != NULL) free(pixel_data);
SDL_DestroyRenderer(sdlRenderer); SDL_DestroyRenderer(sdlRenderer);
SDL_DestroyWindow( sdlWindow ); SDL_DestroyWindow(sdlWindow);
} }
void JD8_ClearScreen(Uint8 color) { void JD8_ClearScreen(Uint8 color) {
memset( screen, color, 64000 ); memset(screen, color, 64000);
} }
JD8_Surface JD8_NewSurface() { JD8_Surface JD8_NewSurface() {
JD8_Surface surface = (JD8_Surface)malloc( 64000 ); JD8_Surface surface = (JD8_Surface)malloc(64000);
memset( surface, 0, 64000 ); memset(surface, 0, 64000);
return surface; return surface;
} }
JD8_Surface JD8_LoadSurface(const char *file) { JD8_Surface JD8_LoadSurface(const char *file) {
int filesize = 0; int filesize = 0;
char *buffer = file_getfilebuffer(file, filesize); char *buffer = file_getfilebuffer(file, filesize);
unsigned short w, h;
Uint8* pixels = LoadGif((unsigned char*)buffer, &w, &h);
free(buffer);
if (pixels == NULL) {
printf("Unable to load bitmap: %s\n", SDL_GetError());
exit(1);
}
JD8_Surface image = JD8_NewSurface();
memcpy(image, pixels, 64000);
free(pixels); unsigned short w, h;
return image; Uint8 *pixels = LoadGif((unsigned char *)buffer, &w, &h);
free(buffer);
if (pixels == NULL) {
printf("Unable to load bitmap: %s\n", SDL_GetError());
exit(1);
}
JD8_Surface image = JD8_NewSurface();
memcpy(image, pixels, 64000);
free(pixels);
return image;
} }
JD8_Palette JD8_LoadPalette(const char *file) { JD8_Palette JD8_LoadPalette(const char *file) {
int filesize = 0; int filesize = 0;
char *buffer = NULL; char *buffer = NULL;
buffer = file_getfilebuffer(file, filesize); buffer = file_getfilebuffer(file, filesize);
JD8_Palette palette = (JD8_Palette)LoadPalette((unsigned char*)buffer); JD8_Palette palette = (JD8_Palette)LoadPalette((unsigned char *)buffer);
return palette; return palette;
} }
void JD8_SetScreenPalette(JD8_Palette palette) { void JD8_SetScreenPalette(JD8_Palette palette) {
if (main_palette == palette) return; if (main_palette == palette) return;
if( main_palette != NULL) free( main_palette ); if (main_palette != NULL) free(main_palette);
main_palette = palette; main_palette = palette;
} }
void JD8_FillSquare(int ini, int height, Uint8 color) { void JD8_FillSquare(int ini, int height, Uint8 color) {
const int offset = ini * 320; const int offset = ini * 320;
const int size = height * 320; const int size = height * 320;
memset(&screen[offset], color, size); memset(&screen[offset], color, size);
} }
void JD8_Blit(JD8_Surface surface) { void JD8_Blit(JD8_Surface surface) {
memcpy( screen, surface, 64000 ); memcpy(screen, surface, 64000);
} }
void JD8_Blit(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh) { void JD8_Blit(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh) {
int src_pointer = sx + (sy*320); int src_pointer = sx + (sy * 320);
int dst_pointer = x + (y*320); int dst_pointer = x + (y * 320);
for( int i = 0; i < sh; i++ ) { for (int i = 0; i < sh; i++) {
memcpy( &screen[dst_pointer], &surface[src_pointer], sw ); memcpy(&screen[dst_pointer], &surface[src_pointer], sw);
src_pointer += 320; src_pointer += 320;
dst_pointer += 320; dst_pointer += 320;
} }
} }
void JD8_BlitToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest) { void JD8_BlitToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest) {
int src_pointer = sx + (sy*320); int src_pointer = sx + (sy * 320);
int dst_pointer = x + (y*320); int dst_pointer = x + (y * 320);
for( int i = 0; i < sh; i++ ) { for (int i = 0; i < sh; i++) {
memcpy( &dest[dst_pointer], &surface[src_pointer], sw ); memcpy(&dest[dst_pointer], &surface[src_pointer], sw);
src_pointer += 320; src_pointer += 320;
dst_pointer += 320; dst_pointer += 320;
} }
} }
void JD8_BlitCK(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey ) { void JD8_BlitCK(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey) {
int src_pointer = sx + (sy*320); int src_pointer = sx + (sy * 320);
int dst_pointer = x + (y*320); int dst_pointer = x + (y * 320);
for( int j = 0; j < sh; j++ ) { for (int j = 0; j < sh; j++) {
for( int i = 0; i < sw; i++ ) { for (int i = 0; i < sw; i++) {
if( surface[src_pointer+i] != colorkey ) screen[dst_pointer+i] = surface[src_pointer+i]; if (surface[src_pointer + i] != colorkey) screen[dst_pointer + i] = surface[src_pointer + i];
} }
src_pointer += 320; src_pointer += 320;
dst_pointer += 320; dst_pointer += 320;
} }
} }
void JD8_BlitCKCut(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey) { void JD8_BlitCKCut(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey) {
int src_pointer = sx + (sy * 320); int src_pointer = sx + (sy * 320);
int dst_pointer = x + (y * 320); int dst_pointer = x + (y * 320);
for (int j = 0; j < sh; j++) { for (int j = 0; j < sh; j++) {
for (int i = 0; i < sw; i++) { for (int i = 0; i < sw; i++) {
if (surface[src_pointer + i] != colorkey && (x+i >= 0) && (y+j >= 0) && (x+i < 320) && (y+j < 200)) screen[dst_pointer + i] = surface[src_pointer + i]; if (surface[src_pointer + i] != colorkey && (x + i >= 0) && (y + j >= 0) && (x + i < 320) && (y + j < 200)) screen[dst_pointer + i] = surface[src_pointer + i];
} }
src_pointer += 320; src_pointer += 320;
dst_pointer += 320; dst_pointer += 320;
} }
} }
void JD8_BlitCKScroll(int y, JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey) { void JD8_BlitCKScroll(int y, JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey) {
int dst_pointer = y * 320; int dst_pointer = y * 320;
for (int j = sy; j < sy+sh; j++) { for (int j = sy; j < sy + sh; j++) {
for (int i = 0; i < 320; i++) { for (int i = 0; i < 320; i++) {
int x = (i+sx) % 320; int x = (i + sx) % 320;
if (surface[x + j*320] != colorkey) screen[dst_pointer] = surface[x + j * 320]; if (surface[x + j * 320] != colorkey) screen[dst_pointer] = surface[x + j * 320];
dst_pointer++; dst_pointer++;
} }
} }
} }
void JD8_BlitCKToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey) { void JD8_BlitCKToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey) {
int src_pointer = sx + (sy*320); int src_pointer = sx + (sy * 320);
int dst_pointer = x + (y*320); int dst_pointer = x + (y * 320);
for( int j = 0; j < sh; j++ ) { for (int j = 0; j < sh; j++) {
for( int i = 0; i < sw; i++ ) { for (int i = 0; i < sw; i++) {
if( surface[src_pointer+i] != colorkey ) dest[dst_pointer+i] = surface[src_pointer+i]; if (surface[src_pointer + i] != colorkey) dest[dst_pointer + i] = surface[src_pointer + i];
} }
src_pointer += 320; src_pointer += 320;
dst_pointer += 320; dst_pointer += 320;
} }
} }
SDL_Rect rect{0, 0, SCREEN_WIDTH, SCREEN_HEIGHT}; SDL_Rect rect{0, 0, SCREEN_WIDTH, SCREEN_HEIGHT};
void JD8_Flip() { void JD8_Flip() {
for( int x = 0; x < 320; x++ ) { for (int x = 0; x < 320; x++) {
for( int y = 0; y < 200; y++ ) { for (int y = 0; y < 200; y++) {
Uint32 color = 0xFF000000 + main_palette[screen[x + ( y * 320 )]].r + ( main_palette[screen[x + ( y * 320 )]].g << 8 ) + ( main_palette[screen[x + ( y * 320 )]].b << 16 ); Uint32 color = 0xFF000000 + main_palette[screen[x + (y * 320)]].r + (main_palette[screen[x + (y * 320)]].g << 8) + (main_palette[screen[x + (y * 320)]].b << 16);
pixel_data[x + ( y * 320 )] = color; pixel_data[x + (y * 320)] = color;
} }
} }
SDL_UpdateTexture(sdlTexture, NULL, pixel_data, 320 * sizeof(Uint32)); SDL_UpdateTexture(sdlTexture, NULL, pixel_data, 320 * sizeof(Uint32));
SDL_SetRenderTarget(sdlRenderer, backBuffer); SDL_SetRenderTarget(sdlRenderer, backBuffer);
SDL_RenderTexture(sdlRenderer, sdlTexture, NULL, NULL); SDL_RenderTexture(sdlRenderer, sdlTexture, NULL, NULL);
shader::render(); shader::render();
//SDL_RenderPresent(sdlRenderer); // SDL_RenderPresent(sdlRenderer);
} }
void JD8_FreeSurface(JD8_Surface surface) { void JD8_FreeSurface(JD8_Surface surface) {
free( surface ); free(surface);
} }
Uint8 JD8_GetPixel( JD8_Surface surface, int x, int y ) { Uint8 JD8_GetPixel(JD8_Surface surface, int x, int y) {
return surface[x + (y*320)]; return surface[x + (y * 320)];
} }
void JD8_PutPixel( JD8_Surface surface, int x, int y, Uint8 pixel ) { void JD8_PutPixel(JD8_Surface surface, int x, int y, Uint8 pixel) {
surface[x + (y*320)] = pixel; surface[x + (y * 320)] = pixel;
} }
void JD8_SetPaletteColor(Uint8 index, Uint8 r, Uint8 g, Uint8 b) { void JD8_SetPaletteColor(Uint8 index, Uint8 r, Uint8 g, Uint8 b) {
main_palette[index].r = r << 2; main_palette[index].r = r << 2;
main_palette[index].g = g << 2; main_palette[index].g = g << 2;
main_palette[index].b = b << 2; main_palette[index].b = b << 2;
} }
void JD8_FadeOut() { void JD8_FadeOut() {
for( int j = 0; j < 32; j++ ) { for (int j = 0; j < 32; j++) {
for( int i = 0; i < 256; i++ ) { for (int i = 0; i < 256; i++) {
if( main_palette[i].r >= 8 ) main_palette[i].r-=8; else main_palette[i].r=0; if (main_palette[i].r >= 8)
if( main_palette[i].g >= 8 ) main_palette[i].g-=8; else main_palette[i].g=0; main_palette[i].r -= 8;
if( main_palette[i].b >= 8 ) main_palette[i].b-=8; else main_palette[i].b=0; else
} main_palette[i].r = 0;
JD8_Flip(); if (main_palette[i].g >= 8)
} main_palette[i].g -= 8;
else
main_palette[i].g = 0;
if (main_palette[i].b >= 8)
main_palette[i].b -= 8;
else
main_palette[i].b = 0;
}
JD8_Flip();
}
} }
#define MAX(a, b) (a) > (b) ? (a) : (b) #define MAX(a, b) (a) > (b) ? (a) : (b)
void JD8_FadeToPal( JD8_Palette pal ) { void JD8_FadeToPal(JD8_Palette pal) {
for( int j = 0; j < 32; j++ ) { for (int j = 0; j < 32; j++) {
for( int i = 0; i < 256; i++ ) { for (int i = 0; i < 256; i++) {
if( main_palette[i].r <= int(pal[i].r)-8 ) main_palette[i].r+=8; else main_palette[i].r=pal[i].r; if (main_palette[i].r <= int(pal[i].r) - 8)
if( main_palette[i].g <= int(pal[i].g)-8 ) main_palette[i].g+=8; else main_palette[i].g=pal[i].g; main_palette[i].r += 8;
if( main_palette[i].b <= int(pal[i].b)-8 ) main_palette[i].b+=8; else main_palette[i].b=pal[i].b; else
} main_palette[i].r = pal[i].r;
JD8_Flip(); if (main_palette[i].g <= int(pal[i].g) - 8)
} main_palette[i].g += 8;
else
main_palette[i].g = pal[i].g;
if (main_palette[i].b <= int(pal[i].b) - 8)
main_palette[i].b += 8;
else
main_palette[i].b = pal[i].b;
}
JD8_Flip();
}
} }

26
source/core/jdraw8.hpp
View File

@@ -2,13 +2,13 @@
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
struct Color { struct Color {
Uint8 r; Uint8 r;
Uint8 g; Uint8 g;
Uint8 b; Uint8 b;
}; };
typedef Uint8* JD8_Surface; typedef Uint8 *JD8_Surface;
typedef Color* JD8_Palette; typedef Color *JD8_Palette;
void JD8_Init(const char *title); void JD8_Init(const char *title);
@@ -32,30 +32,30 @@ void JD8_Blit(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh)
void JD8_BlitToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest); void JD8_BlitToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest);
void JD8_BlitCK(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey ); void JD8_BlitCK(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey);
void JD8_BlitCKCut(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey); void JD8_BlitCKCut(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey);
void JD8_BlitCKScroll(int y, JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey); void JD8_BlitCKScroll(int y, JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey);
void JD8_BlitCKToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey ); void JD8_BlitCKToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey);
void JD8_Flip(); void JD8_Flip();
void JD8_FreeSurface(JD8_Surface surface); void JD8_FreeSurface(JD8_Surface surface);
Uint8 JD8_GetPixel( JD8_Surface surface, int x, int y ); Uint8 JD8_GetPixel(JD8_Surface surface, int x, int y);
void JD8_PutPixel( JD8_Surface surface, int x, int y, Uint8 pixel ); void JD8_PutPixel(JD8_Surface surface, int x, int y, Uint8 pixel);
void JD8_SetPaletteColor(Uint8 index, Uint8 r, Uint8 g, Uint8 b); void JD8_SetPaletteColor(Uint8 index, Uint8 r, Uint8 g, Uint8 b);
void JD8_FadeOut(); void JD8_FadeOut();
void JD8_FadeToPal( JD8_Palette pal ); void JD8_FadeToPal(JD8_Palette pal);
//JD_Font JD_LoadFont( char *file, int width, int height); // JD_Font JD_LoadFont( char *file, int width, int height);
//void JD_DrawText( int x, int y, JD_Font *source, char *text); // void JD_DrawText( int x, int y, JD_Font *source, char *text);
//char *JD_GetFPS(); // char *JD_GetFPS();

227
source/core/jfile.cpp
View File

@@ -1,13 +1,15 @@
#include "core/jfile.hpp"
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include <stdint.h>
#include "core/jfile.hpp"
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <iostream>
#include <fstream>
#include <filesystem> #include <filesystem>
#include <fstream>
#include <iostream>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -15,22 +17,21 @@
#include <pwd.h> #include <pwd.h>
#endif #endif
#define DEFAULT_FILENAME "data.jf2" #define DEFAULT_FILENAME "data.jf2"
#define DEFAULT_FOLDER "data/" #define DEFAULT_FOLDER "data/"
#define CONFIG_FILENAME "config.txt" #define CONFIG_FILENAME "config.txt"
struct file_t struct file_t {
{ std::string path;
std::string path; uint32_t size;
uint32_t size; uint32_t offset;
uint32_t offset;
}; };
std::vector<file_t> toc; std::vector<file_t> toc;
/* El std::map me fa coses rares, vaig a usar un good old std::vector amb una estructura key,value propia i au, que sempre funciona */ /* El std::map me fa coses rares, vaig a usar un good old std::vector amb una estructura key,value propia i au, que sempre funciona */
struct keyvalue_t { struct keyvalue_t {
std::string key, value; std::string key, value;
}; };
char *resource_filename = NULL; char *resource_filename = NULL;
@@ -42,42 +43,41 @@ std::vector<keyvalue_t> config;
void file_setresourcefilename(const char *str) { void file_setresourcefilename(const char *str) {
if (resource_filename != NULL) free(resource_filename); if (resource_filename != NULL) free(resource_filename);
resource_filename = (char*)malloc(strlen(str)+1); resource_filename = (char *)malloc(strlen(str) + 1);
strcpy(resource_filename, str); strcpy(resource_filename, str);
} }
void file_setresourcefolder(const char *str) { void file_setresourcefolder(const char *str) {
if (resource_folder != NULL) free(resource_folder); if (resource_folder != NULL) free(resource_folder);
resource_folder = (char*)malloc(strlen(str)+1); resource_folder = (char *)malloc(strlen(str) + 1);
strcpy(resource_folder, str); strcpy(resource_folder, str);
} }
void file_setsource(const int src) { void file_setsource(const int src) {
file_source = src%2; // mod 2 so it always is a valid value, 0 (file) or 1 (folder) file_source = src % 2; // mod 2 so it always is a valid value, 0 (file) or 1 (folder)
if (src==SOURCE_FOLDER && resource_folder==NULL) file_setresourcefolder(DEFAULT_FOLDER); if (src == SOURCE_FOLDER && resource_folder == NULL) file_setresourcefolder(DEFAULT_FOLDER);
} }
bool file_getdictionary() { bool file_getdictionary() {
if (resource_filename == NULL) file_setresourcefilename(DEFAULT_FILENAME); if (resource_filename == NULL) file_setresourcefilename(DEFAULT_FILENAME);
std::ifstream fi (resource_filename, std::ios::binary); std::ifstream fi(resource_filename, std::ios::binary);
if (!fi.is_open()) return false; if (!fi.is_open()) return false;
char header[4]; char header[4];
fi.read(header, 4); fi.read(header, 4);
uint32_t num_files, toc_offset; uint32_t num_files, toc_offset;
fi.read((char*)&num_files, 4); fi.read((char *)&num_files, 4);
fi.read((char*)&toc_offset, 4); fi.read((char *)&toc_offset, 4);
fi.seekg(toc_offset); fi.seekg(toc_offset);
for (uint32_t i=0; i<num_files; ++i) for (uint32_t i = 0; i < num_files; ++i) {
{
uint32_t file_offset, file_size; uint32_t file_offset, file_size;
fi.read( (char*)&file_offset, 4 ); fi.read((char *)&file_offset, 4);
fi.read( (char*)&file_size, 4 ); fi.read((char *)&file_size, 4);
uint8_t path_size; uint8_t path_size;
fi.read( (char*)&path_size, 1 ); fi.read((char *)&path_size, 1);
char file_name[path_size+1]; char file_name[path_size + 1];
fi.read( file_name, path_size ); fi.read(file_name, path_size);
file_name[path_size] = 0; file_name[path_size] = 0;
std::string filename = file_name; std::string filename = file_name;
toc.push_back({filename, file_size, file_offset}); toc.push_back({filename, file_size, file_offset});
@@ -86,134 +86,133 @@ bool file_getdictionary() {
return true; return true;
} }
char *file_getfilenamewithfolder(const char* filename) { char *file_getfilenamewithfolder(const char *filename) {
strcpy(scratch, resource_folder); strcpy(scratch, resource_folder);
strcat(scratch, filename); strcat(scratch, filename);
return scratch; return scratch;
} }
FILE *file_getfilepointer(const char *resourcename, int& filesize, const bool binary) { FILE *file_getfilepointer(const char *resourcename, int &filesize, const bool binary) {
if (file_source == SOURCE_FILE and toc.size() == 0) {
if (file_source==SOURCE_FILE and toc.size()==0) {
if (not file_getdictionary()) file_setsource(SOURCE_FOLDER); if (not file_getdictionary()) file_setsource(SOURCE_FOLDER);
} }
FILE *f; FILE *f;
if (file_source==SOURCE_FILE) { if (file_source == SOURCE_FILE) {
bool found = false; bool found = false;
uint32_t count = 0; uint32_t count = 0;
while( !found && count < toc.size() ) { while (!found && count < toc.size()) {
found = ( std::string(resourcename) == toc[count].path ); found = (std::string(resourcename) == toc[count].path);
if( !found ) count++; if (!found) count++;
} }
if( !found ) { if (!found) {
perror("El recurs no s'ha trobat en l'arxiu de recursos"); perror("El recurs no s'ha trobat en l'arxiu de recursos");
exit(1); exit(1);
} }
filesize = toc[count].size; filesize = toc[count].size;
f = fopen(resource_filename, binary?"rb":"r"); f = fopen(resource_filename, binary ? "rb" : "r");
if (not f) { if (not f) {
perror("No s'ha pogut obrir l'arxiu de recursos"); perror("No s'ha pogut obrir l'arxiu de recursos");
exit(1); exit(1);
} }
fseek(f, toc[count].offset, SEEK_SET); fseek(f, toc[count].offset, SEEK_SET);
} else { } else {
f = fopen(file_getfilenamewithfolder(resourcename), binary?"rb":"r"); f = fopen(file_getfilenamewithfolder(resourcename), binary ? "rb" : "r");
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
filesize = ftell(f); filesize = ftell(f);
fseek(f, 0, SEEK_SET); fseek(f, 0, SEEK_SET);
} }
return f; return f;
} }
char *file_getfilebuffer(const char *resourcename, int& filesize, const bool zero_terminate) { char *file_getfilebuffer(const char *resourcename, int &filesize, const bool zero_terminate) {
FILE *f = file_getfilepointer(resourcename, filesize, true); FILE *f = file_getfilepointer(resourcename, filesize, true);
char* buffer = (char*)malloc(zero_terminate?filesize:filesize+1); char *buffer = (char *)malloc(zero_terminate ? filesize : filesize + 1);
fread(buffer, filesize, 1, f); fread(buffer, filesize, 1, f);
if (zero_terminate) buffer[filesize]=0; if (zero_terminate) buffer[filesize] = 0;
fclose(f); fclose(f);
return buffer; return buffer;
} }
// Crea la carpeta del sistema donde guardar datos. // Crea la carpeta del sistema donde guardar datos.
// Acepta rutas con subdirectorios (ej: "jailgames/aee") y crea toda la jerarquía. // Acepta rutas con subdirectorios (ej: "jailgames/aee") y crea toda la jerarquía.
void file_setconfigfolder(const char *foldername) void file_setconfigfolder(const char *foldername) {
{
#ifdef _WIN32 #ifdef _WIN32
config_folder = std::string(getenv("APPDATA")) + "/" + foldername; config_folder = std::string(getenv("APPDATA")) + "/" + foldername;
#elif __APPLE__ #elif __APPLE__
struct passwd *pw = getpwuid(getuid()); struct passwd *pw = getpwuid(getuid());
const char *homedir = pw->pw_dir; const char *homedir = pw->pw_dir;
config_folder = std::string(homedir) + "/Library/Application Support/" + foldername; config_folder = std::string(homedir) + "/Library/Application Support/" + foldername;
#elif __linux__ #elif __linux__
struct passwd *pw = getpwuid(getuid()); struct passwd *pw = getpwuid(getuid());
const char *homedir = pw->pw_dir; const char *homedir = pw->pw_dir;
config_folder = std::string(homedir) + "/.config/" + foldername; config_folder = std::string(homedir) + "/.config/" + foldername;
#endif #endif
std::filesystem::create_directories(config_folder); std::filesystem::create_directories(config_folder);
} }
const char *file_getconfigfolder() { const char *file_getconfigfolder() {
static std::string folder; static std::string folder;
folder = config_folder + "/"; folder = config_folder + "/";
return folder.c_str(); return folder.c_str();
} }
void file_loadconfigvalues() { void file_loadconfigvalues() {
config.clear(); config.clear();
std::string config_file = config_folder + "/config.txt"; std::string config_file = config_folder + "/config.txt";
FILE *f = fopen(config_file.c_str(), "r"); FILE *f = fopen(config_file.c_str(), "r");
if (!f) return; if (!f) return;
char line[1024]; char line[1024];
while (fgets(line, sizeof(line), f)) { while (fgets(line, sizeof(line), f)) {
char *value = strchr(line, '='); char *value = strchr(line, '=');
if (value) { if (value) {
*value='\0'; value++; *value = '\0';
value[strlen(value)-1] = '\0'; value++;
config.push_back({line, value}); value[strlen(value) - 1] = '\0';
config.push_back({line, value});
} }
} }
fclose(f); fclose(f);
} }
void file_saveconfigvalues() { void file_saveconfigvalues() {
std::string config_file = config_folder + "/config.txt"; std::string config_file = config_folder + "/config.txt";
FILE *f = fopen(config_file.c_str(), "w"); FILE *f = fopen(config_file.c_str(), "w");
if (f) { if (f) {
for (auto pair : config) { for (auto pair : config) {
fprintf(f, "%s=%s\n", pair.key.c_str(), pair.value.c_str()); fprintf(f, "%s=%s\n", pair.key.c_str(), pair.value.c_str());
} }
fclose(f); fclose(f);
} }
} }
const char* file_getconfigvalue(const char *key) { const char *file_getconfigvalue(const char *key) {
if (config.empty()) file_loadconfigvalues(); if (config.empty()) file_loadconfigvalues();
for (auto pair : config) { for (auto pair : config) {
if (pair.key == std::string(key)) { if (pair.key == std::string(key)) {
strcpy(scratch, pair.value.c_str()); strcpy(scratch, pair.value.c_str());
return scratch; return scratch;
} }
} }
return NULL; return NULL;
} }
void file_setconfigvalue(const char* key, const char* value) { void file_setconfigvalue(const char *key, const char *value) {
if (config.empty()) file_loadconfigvalues(); if (config.empty()) file_loadconfigvalues();
for (auto &pair : config) { for (auto &pair : config) {
if (pair.key == std::string(key)) { if (pair.key == std::string(key)) {
pair.value = value; pair.value = value;
file_saveconfigvalues(); file_saveconfigvalues();
return; return;
} }
} }
config.push_back({key, value}); config.push_back({key, value});
file_saveconfigvalues(); file_saveconfigvalues();
return; return;
} }

12
source/core/jfile.hpp
View File

@@ -1,8 +1,8 @@
#pragma once #pragma once
#include <stdio.h> #include <stdio.h>
#define SOURCE_FILE 0 #define SOURCE_FILE 0
#define SOURCE_FOLDER 1 #define SOURCE_FOLDER 1
void file_setconfigfolder(const char *foldername); void file_setconfigfolder(const char *foldername);
const char *file_getconfigfolder(); const char *file_getconfigfolder();
@@ -11,8 +11,8 @@ void file_setresourcefilename(const char *str);
void file_setresourcefolder(const char *str); void file_setresourcefolder(const char *str);
void file_setsource(const int src); void file_setsource(const int src);
FILE *file_getfilepointer(const char *resourcename, int& filesize, const bool binary=false); FILE *file_getfilepointer(const char *resourcename, int &filesize, const bool binary = false);
char *file_getfilebuffer(const char *resourcename, int& filesize, const bool zero_terminate=false); char *file_getfilebuffer(const char *resourcename, int &filesize, const bool zero_terminate = false);
const char* file_getconfigvalue(const char *key); const char *file_getconfigvalue(const char *key);
void file_setconfigvalue(const char* key, const char* value); void file_setconfigvalue(const char *key, const char *value);

31
source/core/jgame.cpp
View File

@@ -6,38 +6,37 @@ Uint32 updateTime = 0;
Uint32 cycle_counter = 0; Uint32 cycle_counter = 0;
void JG_Init() { void JG_Init() {
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO ); // SDL_WM_SetCaption( title, NULL );
//SDL_WM_SetCaption( title, NULL ); updateTime = SDL_GetTicks();
updateTime = SDL_GetTicks();
} }
void JG_Finalize() { void JG_Finalize() {
SDL_Quit(); SDL_Quit();
} }
void JG_QuitSignal() { void JG_QuitSignal() {
eixir = true; eixir = true;
} }
bool JG_Quitting() { bool JG_Quitting() {
return eixir; return eixir;
} }
void JG_SetUpdateTicks(Uint32 milliseconds) { void JG_SetUpdateTicks(Uint32 milliseconds) {
updateTicks = milliseconds; updateTicks = milliseconds;
} }
bool JG_ShouldUpdate() { bool JG_ShouldUpdate() {
if (SDL_GetTicks() - updateTime > updateTicks) { if (SDL_GetTicks() - updateTime > updateTicks) {
updateTime = SDL_GetTicks(); updateTime = SDL_GetTicks();
cycle_counter++; cycle_counter++;
return true; return true;
} else { } else {
return false; return false;
} }
} }
Uint32 JG_GetCycleCounter() { Uint32 JG_GetCycleCounter() {
return cycle_counter; return cycle_counter;
} }

2
source/core/jgame.hpp
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
void JG_Init(); void JG_Init();
void JG_Finalize(); void JG_Finalize();

56
source/core/jinput.cpp
View File

@@ -1,52 +1,54 @@
#include "core/jinput.hpp" #include "core/jinput.hpp"
#include "core/jgame.hpp"
#include <string> #include <string>
const bool *keystates;// = SDL_GetKeyboardState( NULL ); #include "core/jgame.hpp"
const bool* keystates; // = SDL_GetKeyboardState( NULL );
SDL_Event event; SDL_Event event;
Uint8 cheat[5]; Uint8 cheat[5];
bool key_pressed = false; bool key_pressed = false;
int waitTime = 0; int waitTime = 0;
void JI_DisableKeyboard(Uint32 time) { void JI_DisableKeyboard(Uint32 time) {
waitTime = time; waitTime = time;
} }
void JI_moveCheats( Uint8 new_key ) { void JI_moveCheats(Uint8 new_key) {
cheat[0] = cheat[1]; cheat[0] = cheat[1];
cheat[1] = cheat[2]; cheat[1] = cheat[2];
cheat[2] = cheat[3]; cheat[2] = cheat[3];
cheat[3] = cheat[4]; cheat[3] = cheat[4];
cheat[4] = new_key; cheat[4] = new_key;
} }
void JI_Update() { void JI_Update() {
key_pressed = false; key_pressed = false;
keystates = SDL_GetKeyboardState( NULL ); keystates = SDL_GetKeyboardState(NULL);
if (waitTime > 0) waitTime--; if (waitTime > 0) waitTime--;
while ( SDL_PollEvent( &event ) ) { while (SDL_PollEvent(&event)) {
if ( event.type == SDL_EVENT_QUIT ) JG_QuitSignal(); if (event.type == SDL_EVENT_QUIT) JG_QuitSignal();
if( event.type == SDL_EVENT_KEY_UP ) { if (event.type == SDL_EVENT_KEY_UP) {
key_pressed = true; key_pressed = true;
JI_moveCheats( event.key.scancode ); JI_moveCheats(event.key.scancode);
} }
} }
} }
bool JI_KeyPressed(int key) { bool JI_KeyPressed(int key) {
return waitTime > 0 ? false : (keystates[key] != 0); return waitTime > 0 ? false : (keystates[key] != 0);
} }
bool JI_CheatActivated( const char* cheat_code ) { bool JI_CheatActivated(const char* cheat_code) {
bool found = true; bool found = true;
for( size_t i = 0; i < strlen( cheat_code ); i++ ) { for (size_t i = 0; i < strlen(cheat_code); i++) {
if( cheat[i] != cheat_code[i] ) found = false; if (cheat[i] != cheat_code[i]) found = false;
} }
return found; return found;
} }
bool JI_AnyKey() { bool JI_AnyKey() {
return waitTime > 0 ? false : key_pressed; return waitTime > 0 ? false : key_pressed;
} }

10
source/core/jinput.hpp
View File

@@ -1,12 +1,12 @@
#pragma once #pragma once
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
void JI_DisableKeyboard(Uint32 time); void JI_DisableKeyboard(Uint32 time);
void JI_Update(); void JI_Update();
bool JI_KeyPressed(int key); bool JI_KeyPressed(int key);
bool JI_CheatActivated( const char* cheat_code ); bool JI_CheatActivated(const char* cheat_code);
bool JI_AnyKey(); bool JI_AnyKey();

104
source/core/jshader.cpp
View File

@@ -3,23 +3,23 @@
#include <iostream> #include <iostream>
#ifdef __APPLE__ #ifdef __APPLE__
#include "CoreFoundation/CoreFoundation.h"
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
#include "CoreFoundation/CoreFoundation.h"
#if ESSENTIAL_GL_PRACTICES_SUPPORT_GL3 #if ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#else #else
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#endif //!ESSENTIAL_GL_PRACTICES_SUPPORT_GL3 #endif //! ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
#else #else
#include <SDL3/SDL_opengl.h> #include <SDL3/SDL_opengl.h>
#include <SDL3/SDL_opengl_glext.h> #include <SDL3/SDL_opengl_glext.h>
#endif #endif
namespace shader namespace shader {
{ SDL_Window* win = nullptr;
SDL_Window *win = nullptr; SDL_Renderer* renderer = nullptr;
SDL_Renderer *renderer = nullptr;
GLuint programId = 0; GLuint programId = 0;
SDL_Texture* backBuffer = nullptr; SDL_Texture* backBuffer = nullptr;
SDL_Point win_size = {640, 480}; SDL_Point win_size = {640, 480};
@@ -28,9 +28,9 @@ namespace shader
GLuint texture_number; GLuint texture_number;
GLuint nose; GLuint nose;
#ifndef __APPLE__ #ifndef __APPLE__
// I'm avoiding the use of GLEW or some extensions handler, but that // I'm avoiding the use of GLEW or some extensions handler, but that
// doesn't mean you should... // doesn't mean you should...
PFNGLCREATESHADERPROC glCreateShader; PFNGLCREATESHADERPROC glCreateShader;
PFNGLSHADERSOURCEPROC glShaderSource; PFNGLSHADERSOURCEPROC glShaderSource;
@@ -61,35 +61,33 @@ namespace shader
glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)SDL_GL_GetProcAddress("glGetProgramInfoLog"); glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)SDL_GL_GetProcAddress("glGetProgramInfoLog");
glUseProgram = (PFNGLUSEPROGRAMPROC)SDL_GL_GetProcAddress("glUseProgram"); glUseProgram = (PFNGLUSEPROGRAMPROC)SDL_GL_GetProcAddress("glUseProgram");
return glCreateShader && glShaderSource && glCompileShader && glGetShaderiv && return glCreateShader && glShaderSource && glCompileShader && glGetShaderiv &&
glGetShaderInfoLog && glDeleteShader && glAttachShader && glCreateProgram && glGetShaderInfoLog && glDeleteShader && glAttachShader && glCreateProgram &&
glLinkProgram && glValidateProgram && glGetProgramiv && glGetProgramInfoLog && glLinkProgram && glValidateProgram && glGetProgramiv && glGetProgramInfoLog &&
glUseProgram; glUseProgram;
} }
#endif #endif
GLuint compileShader(const char* source, GLuint shaderType) { GLuint compileShader(const char* source, GLuint shaderType) {
// Create ID for shader // Create ID for shader
GLuint result = glCreateShader(shaderType); GLuint result = glCreateShader(shaderType);
// Add define depending on shader type // Add define depending on shader type
const char *sources[2] = { shaderType==GL_VERTEX_SHADER?"#define VERTEX\n":"#define FRAGMENT\n", source }; const char* sources[2] = {shaderType == GL_VERTEX_SHADER ? "#define VERTEX\n" : "#define FRAGMENT\n", source};
// Define shader text // Define shader text
glShaderSource(result, 2, sources, NULL); glShaderSource(result, 2, sources, NULL);
// Compile shader // Compile shader
glCompileShader(result); glCompileShader(result);
//Check vertex shader for errors // Check vertex shader for errors
GLint shaderCompiled = GL_FALSE; GLint shaderCompiled = GL_FALSE;
glGetShaderiv( result, GL_COMPILE_STATUS, &shaderCompiled ); glGetShaderiv(result, GL_COMPILE_STATUS, &shaderCompiled);
if (shaderCompiled != GL_TRUE) if (shaderCompiled != GL_TRUE) {
{
std::cout << "Error en la compilación: " << result << "!" << std::endl; std::cout << "Error en la compilación: " << result << "!" << std::endl;
GLint logLength; GLint logLength;
glGetShaderiv(result, GL_INFO_LOG_LENGTH, &logLength); glGetShaderiv(result, GL_INFO_LOG_LENGTH, &logLength);
if (logLength > 0) if (logLength > 0) {
{ GLchar* log = (GLchar*)malloc(logLength);
GLchar *log = (GLchar*)malloc(logLength);
glGetShaderInfoLog(result, logLength, &logLength, log); glGetShaderInfoLog(result, logLength, &logLength, log);
std::cout << "Shader compile log:" << log << std::endl; std::cout << "Shader compile log:" << log << std::endl;
free(log); free(log);
@@ -100,18 +98,16 @@ namespace shader
return result; return result;
} }
GLuint compileProgram(const char* vertexShaderSource, const char* fragmentShaderSource) GLuint compileProgram(const char* vertexShaderSource, const char* fragmentShaderSource) {
{
GLuint programId = 0; GLuint programId = 0;
GLuint vtxShaderId, fragShaderId; GLuint vtxShaderId, fragShaderId;
programId = glCreateProgram(); programId = glCreateProgram();
vtxShaderId = compileShader(vertexShaderSource, GL_VERTEX_SHADER); vtxShaderId = compileShader(vertexShaderSource, GL_VERTEX_SHADER);
fragShaderId = compileShader(fragmentShaderSource?fragmentShaderSource:vertexShaderSource, GL_FRAGMENT_SHADER); fragShaderId = compileShader(fragmentShaderSource ? fragmentShaderSource : vertexShaderSource, GL_FRAGMENT_SHADER);
if(vtxShaderId && fragShaderId) if (vtxShaderId && fragShaderId) {
{
// Associate shader with program // Associate shader with program
glAttachShader(programId, vtxShaderId); glAttachShader(programId, vtxShaderId);
glAttachShader(programId, fragShaderId); glAttachShader(programId, fragShaderId);
@@ -121,12 +117,12 @@ namespace shader
// Check the status of the compile/link // Check the status of the compile/link
GLint logLen; GLint logLen;
glGetProgramiv(programId, GL_INFO_LOG_LENGTH, &logLen); glGetProgramiv(programId, GL_INFO_LOG_LENGTH, &logLen);
if (logLen > 0) if (logLen > 0) {
{ char* log = (char*)malloc(logLen * sizeof(char));
char* log = (char*) malloc(logLen * sizeof(char));
// Show any errors as appropriate // Show any errors as appropriate
glGetProgramInfoLog(programId, logLen, &logLen, log); glGetProgramInfoLog(programId, logLen, &logLen, log);
std::cout << "Prog Info Log: " << std::endl << log << std::endl; std::cout << "Prog Info Log: " << std::endl
<< log << std::endl;
free(log); free(log);
} }
} }
@@ -135,8 +131,7 @@ namespace shader
return programId; return programId;
} }
const bool init(SDL_Window* win, SDL_Texture* backBuffer, const char* vertexShader, const char* fragmentShader) const bool init(SDL_Window* win, SDL_Texture* backBuffer, const char* vertexShader, const char* fragmentShader) {
{
shader::win = win; shader::win = win;
shader::renderer = SDL_GetRenderer(win); shader::renderer = SDL_GetRenderer(win);
shader::backBuffer = backBuffer; shader::backBuffer = backBuffer;
@@ -150,16 +145,15 @@ namespace shader
nose = SDL_GetNumberProperty(props, SDL_PROP_TEXTURE_OPENGL_TEXTURE_TARGET_NUMBER, -1); nose = SDL_GetNumberProperty(props, SDL_PROP_TEXTURE_OPENGL_TEXTURE_TARGET_NUMBER, -1);
printf("texture target number: %i\n", nose); printf("texture target number: %i\n", nose);
if (access != SDL_TEXTUREACCESS_TARGET) if (access != SDL_TEXTUREACCESS_TARGET) {
{
std::cout << "ERROR FATAL: La textura per al render ha de tindre SDL_TEXTUREACCESS_TARGET definit." << std::endl; std::cout << "ERROR FATAL: La textura per al render ha de tindre SDL_TEXTUREACCESS_TARGET definit." << std::endl;
exit(1); exit(1);
} }
const char * renderer_name = SDL_GetRendererName(renderer); const char* renderer_name = SDL_GetRendererName(renderer);
printf("rendererInfo.name: %s\n", renderer_name); printf("rendererInfo.name: %s\n", renderer_name);
if(!strncmp(renderer_name, "opengl", 6)) { if (!strncmp(renderer_name, "opengl", 6)) {
#ifndef __APPLE__ #ifndef __APPLE__
if (!initGLExtensions()) { if (!initGLExtensions()) {
std::cout << "WARNING: No s'han pogut inicialitzar les extensions d'OpenGL!" << std::endl; std::cout << "WARNING: No s'han pogut inicialitzar les extensions d'OpenGL!" << std::endl;
@@ -178,21 +172,18 @@ namespace shader
return true; return true;
} }
unsigned char pixels[512*240*4]; unsigned char pixels[512 * 240 * 4];
void render() void render() {
{
SDL_FlushRenderer(renderer); SDL_FlushRenderer(renderer);
SDL_SetRenderTarget(renderer, NULL); SDL_SetRenderTarget(renderer, NULL);
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
SDL_RenderClear(renderer); SDL_RenderClear(renderer);
SDL_FlushRenderer(renderer); SDL_FlushRenderer(renderer);
if (usingOpenGL) if (usingOpenGL) {
{
GLint oldProgramId; GLint oldProgramId;
if (programId != 0) if (programId != 0) {
{
glGetIntegerv(GL_CURRENT_PROGRAM, &oldProgramId); glGetIntegerv(GL_CURRENT_PROGRAM, &oldProgramId);
glUseProgram(programId); glUseProgram(programId);
} }
@@ -200,22 +191,22 @@ namespace shader
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, 1); glBindTexture(GL_TEXTURE_2D, 1);
//glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, pixels); // glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, pixels);
//if (glGetError()) { printf("GLGETERROR!\n"); exit(1);} // if (glGetError()) { printf("GLGETERROR!\n"); exit(1);}
//GLint param; // GLint param;
//glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &param); // glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &param);
//printf("tex width: %i\n", param); // printf("tex width: %i\n", param);
glViewport(0, 0, win_size.x, win_size.y); glViewport(0, 0, win_size.x, win_size.y);
glBegin(GL_TRIANGLE_STRIP); glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0.0f, 0.0f); glTexCoord2f(0.0f, 0.0f);
glVertex2f(0.0f, 0.0f); glVertex2f(0.0f, 0.0f);
glTexCoord2f(1.0f, 0.0f); glTexCoord2f(1.0f, 0.0f);
glVertex2f(tex_size.x, 0.0f); glVertex2f(tex_size.x, 0.0f);
glTexCoord2f(0.0f, 1.0f); glTexCoord2f(0.0f, 1.0f);
glVertex2f(0.0f, tex_size.y); glVertex2f(0.0f, tex_size.y);
glTexCoord2f(1.0f, 1.0f); glTexCoord2f(1.0f, 1.0f);
glVertex2f(tex_size.x, tex_size.y); glVertex2f(tex_size.x, tex_size.y);
glEnd(); glEnd();
SDL_GL_SwapWindow(win); SDL_GL_SwapWindow(win);
@@ -226,6 +217,9 @@ namespace shader
SDL_RenderTexture(renderer, backBuffer, NULL, NULL); SDL_RenderTexture(renderer, backBuffer, NULL, NULL);
SDL_RenderPresent(renderer); SDL_RenderPresent(renderer);
} }
if (glGetError()) { printf("GLERROR!\n"); exit(1); } if (glGetError()) {
printf("GLERROR!\n");
exit(1);
}
} }
} } // namespace shader

10
source/core/jshader.hpp
View File

@@ -24,7 +24,7 @@
// Els shaders li'ls passem com una cadena, som nosaltres els que s'encarreguem // Els shaders li'ls passem com una cadena, som nosaltres els que s'encarreguem
// de carregarlos de disc, amb fopen, ifstream, jfile o el que vullgues. // de carregarlos de disc, amb fopen, ifstream, jfile o el que vullgues.
// Si els tens en un std::string, passa-li-la com "cadena.c_str()". // Si els tens en un std::string, passa-li-la com "cadena.c_str()".
// //
// Poden ser els dos el mateix arxiu, com fa libRetro, jo desde dins ja fique // Poden ser els dos el mateix arxiu, com fa libRetro, jo desde dins ja fique
// els defines necessaris. Si es el mateix arxiu, pots no ficar el quart paràmetre. // els defines necessaris. Si es el mateix arxiu, pots no ficar el quart paràmetre.
// //
@@ -35,10 +35,8 @@
// Ah! una cosa mes: al compilar, en Linux afegir "-lGL", en Windows afegir "-lopengl32". // Ah! una cosa mes: al compilar, en Linux afegir "-lGL", en Windows afegir "-lopengl32".
// En Mac ni idea // En Mac ni idea
namespace shader namespace shader {
{ const bool init(SDL_Window* win, SDL_Texture* backBuffer, const char* vertexShader, const char* fragmentShader = nullptr);
const bool init(SDL_Window* win, SDL_Texture* backBuffer,
const char* vertexShader, const char* fragmentShader=nullptr);
void render(); void render();
} } // namespace shader

2
source/external/.clang-format vendored Normal file
View File

@@ -0,0 +1,2 @@
DisableFormat: true
SortIncludes: Never

102
source/game/bola.cpp
View File

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

23
source/game/bola.hpp
View File

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

91
source/game/engendro.cpp
View File

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

16
source/game/engendro.hpp
View File

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

23
source/game/info.cpp
View File

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

23
source/game/info.hpp
View File

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

448
source/game/mapa.cpp
View File

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

63
source/game/mapa.hpp
View File

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

96
source/game/marcador.cpp
View File

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

20
source/game/marcador.hpp
View File

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

253
source/game/modulegame.cpp
View File

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

38
source/game/modulegame.hpp
View File

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

1808
source/game/modulesequence.cpp
View File

File diff suppressed because it is too large Load Diff

27
source/game/modulesequence.hpp
View File

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

308
source/game/momia.cpp
View File

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

30
source/game/momia.hpp
View File

@@ -1,27 +1,23 @@
#pragma once #pragma once
#include "game/sprite.hpp"
#include "game/prota.hpp"
#include "game/engendro.hpp" #include "game/engendro.hpp"
#include "game/info.hpp" #include "game/info.hpp"
#include "game/prota.hpp"
#include "game/sprite.hpp"
class Momia : public Sprite { 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 ); bool dimoni;
Momia* next;
void clear();
void draw();
bool update();
void insertar( Momia* momia );
bool dimoni;
Momia* next;
protected:
Prota* sam;
Engendro* engendro;
protected:
Prota* sam;
Engendro* engendro;
}; };

266
source/game/prota.cpp
View File

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

20
source/game/prota.hpp
View File

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

40
source/game/sprite.cpp
View File

@@ -1,38 +1,26 @@
#include "game/sprite.hpp" #include "game/sprite.hpp"
#include <stdlib.h> #include <stdlib.h>
Sprite::Sprite( JD8_Surface gfx ) { Sprite::Sprite(JD8_Surface gfx) {
this->gfx = gfx;
this->gfx = gfx; this->entitat = NULL;
this->entitat = NULL;
} }
Sprite::~Sprite(void) { 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_animacions > 0) {
for (int i = 0; i < this->entitat->num_animacions; i++) {
if( this->entitat->num_frames > 0 ) free( this->entitat->frames ); if (this->entitat->animacions[i].num_frames > 0) free(this->entitat->animacions[i].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 );
}
free(this->entitat);
}
} }
void Sprite::draw() { 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);
} }

48
source/game/sprite.hpp
View File

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

98
source/main.cpp
View File

@@ -1,67 +1,67 @@
#include "core/jgame.hpp" #include <ctime>
#include "core/jdraw8.hpp" #include <string>
#include "core/jail_audio.hpp" #include "core/jail_audio.hpp"
#include "core/jdraw8.hpp"
#include "core/jfile.hpp" #include "core/jfile.hpp"
#include "core/jgame.hpp"
#include "game/defines.hpp" #include "game/defines.hpp"
#include "game/info.hpp" #include "game/info.hpp"
#include "game/modulegame.hpp" #include "game/modulegame.hpp"
#include "game/modulesequence.hpp" #include "game/modulesequence.hpp"
#include "game/options.hpp" #include "game/options.hpp"
#include <ctime>
#include <string>
int main( int argc, char* args[] ) { int main(int argc, char* args[]) {
srand(unsigned(time(NULL)));
srand( unsigned(time(NULL)) ); // Crea la carpeta de configuració i carrega les opcions
file_setconfigfolder("jailgames/aee");
Options::setConfigFile(std::string(file_getconfigfolder()) + "config.yaml");
Options::loadFromFile();
// Crea la carpeta de configuració i carrega les opcions JG_Init();
file_setconfigfolder("jailgames/aee"); JD8_Init(Texts::WINDOW_TITLE);
Options::setConfigFile(std::string(file_getconfigfolder()) + "config.yaml"); JA_Init(48000, SDL_AUDIO_S16, 2);
Options::loadFromFile();
JG_Init(); info::num_habitacio = Options::game.habitacio_inicial;
JD8_Init(Texts::WINDOW_TITLE); info::num_piramide = Options::game.piramide_inicial;
JA_Init(48000, SDL_AUDIO_S16, 2); info::diners = 0;
info::diamants = 0;
info::vida = Options::game.vides;
info::momies = 0;
info::nou_personatge = false;
info::pepe_activat = false;
info::num_habitacio = Options::game.habitacio_inicial; FILE* ini = fopen("trick.ini", "rb");
info::num_piramide = Options::game.piramide_inicial; if (ini != NULL) {
info::diners = 0; info::nou_personatge = true;
info::diamants = 0; fclose(ini);
info::vida = Options::game.vides; }
info::momies = 0;
info::nou_personatge = false;
info::pepe_activat = false;
FILE* ini = fopen("trick.ini", "rb"); int gameState = 1;
if (ini != NULL) {
info::nou_personatge = true;
fclose(ini);
}
int gameState = 1; while (gameState != -1) {
switch (gameState) {
case 0:
ModuleGame* moduleGame;
moduleGame = new ModuleGame();
gameState = moduleGame->Go();
delete moduleGame;
break;
case 1:
ModuleSequence* moduleSequence;
moduleSequence = new ModuleSequence();
gameState = moduleSequence->Go();
delete moduleSequence;
break;
}
}
while (gameState != -1) { Options::saveToFile();
switch (gameState) {
case 0:
ModuleGame* moduleGame;
moduleGame = new ModuleGame();
gameState = moduleGame->Go();
delete moduleGame;
break;
case 1:
ModuleSequence* moduleSequence;
moduleSequence = new ModuleSequence();
gameState = moduleSequence->Go();
delete moduleSequence;
break;
}
}
Options::saveToFile(); JA_Quit();
JD8_Quit();
JG_Finalize();
JA_Quit(); return 0;
JD8_Quit();
JG_Finalize();
return 0;
} }