- [NEW] Habitació de prova de parts
- [NEW] Templates de les parts - [NEW] Mòdul de debug - [NEW] Debug info de la posicio dels actors - [FIX] Al reiniciar partida el heroi estava en posició incorrecta - [NEW] Mòdul de config - [NEW] El joc ja permet canviar zoom i ficar fullscreen - [NEW] F1, F2 i F3 per a zoom i fullscreen - [NEW] Ja es guarda en arxiu de config el zoom, fullscreen, musica i só. - [FIX] Al eixir prematurament del logo de vegades la paleta estava loca - [NEW] Menú de configuració del àudio - [NEW] Menú de pausa dins del joc (es veu peces que falten per arreplegar) - [ONGOING] Comença l'implementació de tecles redefinides
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include "jgame.h"
|
||||
#include "jinput.h"
|
||||
#include "jdraw.h"
|
||||
#include "config.h"
|
||||
#include <SDL2/SDL.h>
|
||||
|
||||
namespace modules
|
||||
@@ -16,9 +17,11 @@ namespace modules
|
||||
|
||||
void init()
|
||||
{
|
||||
selected_option = OPTION_JUGAR;
|
||||
::game::setUpdateTicks(64);
|
||||
draw::loadPalette("test.gif");
|
||||
surf = draw::getSurface("test.gif");
|
||||
draw::restorecol(2);
|
||||
}
|
||||
|
||||
int loop()
|
||||
@@ -26,10 +29,15 @@ namespace modules
|
||||
if (input::keyPressed(SDL_SCANCODE_ESCAPE)) {
|
||||
return OPTION_EIXIR;
|
||||
}
|
||||
if (input::keyPressed(SDL_SCANCODE_DOWN)) selected_option = (selected_option+1)&3;
|
||||
if (input::keyPressed(SDL_SCANCODE_UP)) selected_option = (selected_option-1)&3;
|
||||
if (input::keyPressed(SDL_SCANCODE_SPACE) || input::keyPressed(SDL_SCANCODE_RETURN)) {
|
||||
if (selected_option == OPTION_EIXIR || selected_option == OPTION_JUGAR) return selected_option;
|
||||
if (input::keyPressed(SDL_SCANCODE_DOWN) || input::keyPressed(config::getKey(KEY_DOWN)))
|
||||
selected_option = (selected_option+1)&3;
|
||||
|
||||
if (input::keyPressed(SDL_SCANCODE_UP) || input::keyPressed(config::getKey(KEY_UP)))
|
||||
selected_option = (selected_option-1)&3;
|
||||
|
||||
if (input::keyPressed(SDL_SCANCODE_SPACE) || input::keyPressed(SDL_SCANCODE_RETURN) ||
|
||||
input::keyPressed(config::getKey(KEY_JUMP)) || input::keyPressed(config::getKey(KEY_PICK))) {
|
||||
return selected_option;
|
||||
}
|
||||
|
||||
draw::cls(2);
|
||||
@@ -37,7 +45,7 @@ namespace modules
|
||||
|
||||
draw::swapcol(1, WHITE);
|
||||
draw::setSource(surf);
|
||||
draw::draw(142,48,20,32,64+anim_pos*20,32);
|
||||
draw::draw(150,56,20,32,64+anim_pos*20,32);
|
||||
retras--;
|
||||
if (retras==0) {retras=4; anim_pos=(anim_pos+1)&1; }
|
||||
|
||||
@@ -46,28 +54,28 @@ namespace modules
|
||||
switch (selected_option)
|
||||
{
|
||||
case OPTION_JUGAR:
|
||||
draw::print2("fg JUGAR AL JOC", 11, 12, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de REDEFINIR TECLES", 11, 15, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de CONFIGURAR SO", 11, 17, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 19, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("fg JUGAR AL JOC", 11, 14, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de REDEFINIR TECLES", 11, 17, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de CONFIGURAR AUDIO", 11, 19, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 21, TEAL, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_TECLES:
|
||||
draw::print2("de JUGAR AL JOC", 11, 12, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("fg REDEFINIR TECLES", 11, 14, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de CONFIGURAR SO", 11, 17, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 19, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de JUGAR AL JOC", 11, 14, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("fg REDEFINIR TECLES", 11, 16, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de CONFIGURAR AUDIO", 11, 19, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de EIXIR", 11, 21, TEAL, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_SO:
|
||||
draw::print2("de JUGAR AL JOC", 11, 12, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de REDEFINIR TECLES", 11, 14, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("fg CONFIGURAR SO", 11, 16, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de EIXIR", 11, 19, TEAL, FONT_ZOOM_NONE);
|
||||
case OPTION_AUDIO:
|
||||
draw::print2("de JUGAR AL JOC", 11, 14, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de REDEFINIR TECLES", 11, 16, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("fg CONFIGURAR AUDIO", 11, 18, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de EIXIR", 11, 21, TEAL, FONT_ZOOM_NONE);
|
||||
break;
|
||||
case OPTION_EIXIR:
|
||||
draw::print2("de JUGAR AL JOC", 11, 12, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de REDEFINIR TECLES", 11, 14, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de CONFIGURAR SO", 11, 16, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("fg EIXIR", 11, 18, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
draw::print2("de JUGAR AL JOC", 11, 14, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de REDEFINIR TECLES", 11, 16, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("de CONFIGURAR AUDIO", 11, 18, TEAL, FONT_ZOOM_NONE);
|
||||
draw::print2("fg EIXIR", 11, 21, YELLOW, FONT_ZOOM_VERTICAL);
|
||||
break;
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user