treballant en el overlay, el text i les notificacions

This commit is contained in:
2026-04-04 18:11:04 +02:00
parent abb23071b5
commit fe8e5d661e
38 changed files with 738 additions and 105 deletions

View File

@@ -2,7 +2,7 @@
#include <stdlib.h>
#include "core/jgame.hpp"
#include "core/jail/jgame.hpp"
Bola::Bola(JD8_Surface gfx, Prota* sam)
: Sprite(gfx) {

View File

@@ -1,5 +1,23 @@
#pragma once
#include <SDL3/SDL.h>
// Tecles GUI (capa de presentació — finestra, zoom, etc.)
namespace Defaults::KeysGUI {
constexpr SDL_Scancode DEC_ZOOM = SDL_SCANCODE_F1;
constexpr SDL_Scancode INC_ZOOM = SDL_SCANCODE_F2;
constexpr SDL_Scancode FULLSCREEN = SDL_SCANCODE_F3;
} // namespace Defaults::KeysGUI
// Tecles de joc (moviment del personatge, accions)
namespace Defaults::KeysGame {
constexpr SDL_Scancode UP = SDL_SCANCODE_UP;
constexpr SDL_Scancode DOWN = SDL_SCANCODE_DOWN;
constexpr SDL_Scancode LEFT = SDL_SCANCODE_LEFT;
constexpr SDL_Scancode RIGHT = SDL_SCANCODE_RIGHT;
constexpr SDL_Scancode EXIT = SDL_SCANCODE_ESCAPE;
} // namespace Defaults::KeysGame
namespace Defaults::Audio {
constexpr float VOLUME = 1.0F;
constexpr bool MUSIC_ENABLED = true;

View File

@@ -2,7 +2,7 @@
#include <stdlib.h>
#include "core/jgame.hpp"
#include "core/jail/jgame.hpp"
Engendro::Engendro(JD8_Surface gfx, Uint16 x, Uint16 y)
: Sprite(gfx) {

View File

@@ -2,8 +2,8 @@
#include <stdlib.h>
#include "core/jgame.hpp"
#include "core/jinput.hpp"
#include "core/jail/jgame.hpp"
#include "core/jail/jinput.hpp"
Mapa::Mapa(JD8_Surface gfx, Prota* sam) {
this->gfx = gfx;

View File

@@ -1,6 +1,6 @@
#pragma once
#include "core/jdraw8.hpp"
#include "core/jail/jdraw8.hpp"
#include "game/info.hpp"
#include "game/prota.hpp"

View File

@@ -1,6 +1,6 @@
#pragma once
#include "core/jdraw8.hpp"
#include "core/jail/jdraw8.hpp"
#include "game/info.hpp"
#include "game/prota.hpp"

View File

@@ -1,10 +1,10 @@
#include "game/modulegame.hpp"
#include "core/jail_audio.hpp"
#include "core/jdraw8.hpp"
#include "core/jfile.hpp"
#include "core/jgame.hpp"
#include "core/jinput.hpp"
#include "core/jail/jail_audio.hpp"
#include "core/jail/jdraw8.hpp"
#include "core/jail/jfile.hpp"
#include "core/jail/jgame.hpp"
#include "core/jail/jinput.hpp"
ModuleGame::ModuleGame() {
this->gfx = JD8_LoadSurface(info::pepe_activat ? "frames2.gif" : "frames.gif");

View File

@@ -4,11 +4,11 @@
#include <string>
#include "core/jail_audio.hpp"
#include "core/jdraw8.hpp"
#include "core/jfile.hpp"
#include "core/jgame.hpp"
#include "core/jinput.hpp"
#include "core/jail/jail_audio.hpp"
#include "core/jail/jdraw8.hpp"
#include "core/jail/jfile.hpp"
#include "core/jail/jgame.hpp"
#include "core/jail/jinput.hpp"
ModuleSequence::ModuleSequence() {
}

View File

@@ -2,7 +2,7 @@
#include <stdlib.h>
#include "core/jgame.hpp"
#include "core/jail/jgame.hpp"
Momia::Momia(JD8_Surface gfx, bool dimoni, Uint16 x, Uint16 y, Prota* sam)
: Sprite(gfx) {

View File

@@ -7,6 +7,22 @@
namespace Options {
// Tecles GUI (finestra, zoom)
struct KeysGUI {
SDL_Scancode dec_zoom{Defaults::KeysGUI::DEC_ZOOM};
SDL_Scancode inc_zoom{Defaults::KeysGUI::INC_ZOOM};
SDL_Scancode fullscreen{Defaults::KeysGUI::FULLSCREEN};
};
// Tecles de joc (moviment, accions)
struct KeysGame {
SDL_Scancode up{Defaults::KeysGame::UP};
SDL_Scancode down{Defaults::KeysGame::DOWN};
SDL_Scancode left{Defaults::KeysGame::LEFT};
SDL_Scancode right{Defaults::KeysGame::RIGHT};
SDL_Scancode exit{Defaults::KeysGame::EXIT};
};
// Opcions d'àudio
struct Audio {
bool music_enabled{Defaults::Audio::MUSIC_ENABLED};
@@ -31,6 +47,8 @@ namespace Options {
// --- Variables globals ---
inline std::string version{};
inline KeysGUI keys_gui{};
inline KeysGame keys_game{};
inline Audio audio{};
inline Window window{};
inline Game game{};

View File

@@ -2,8 +2,8 @@
#include <stdlib.h>
#include "core/jgame.hpp"
#include "core/jinput.hpp"
#include "core/jail/jgame.hpp"
#include "core/jail/jinput.hpp"
Prota::Prota(JD8_Surface gfx)
: Sprite(gfx) {

View File

@@ -1,6 +1,6 @@
#pragma once
#include "core/jdraw8.hpp"
#include "core/jail/jdraw8.hpp"
struct Frame {
Uint16 x;