Archive/engine-psx
0
0
Fork 0
mirror of https://github.com/luksamuk/engine-psx.git synced 2025-04-28 13:28:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change level select options counting and redirect from slides

Browse source
This commit is contained in:
Lucas S. Vieira 2025-01-01 01:14:10 -03:00
parent e782b5beb2
commit 9adffe3da5
2 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/screen_levelselect.c
View file

@ -25,6 +25,8 @@
#define MAX_COLUMN_CHOICES 15
extern uint32_t level_score_count;
extern int debug_mode;
extern ScreenIndex slide_screen_override;
typedef struct {
uint8_t menu_choice;
@ -41,8 +43,6 @@ typedef struct {
uint8_t slidetest_selection;
} screen_levelselect_data;
extern int debug_mode;
static const char *menutext[] = {
"PLAYGROUND 1",
" 2",
@ -162,30 +162,30 @@ screen_levelselect_update(void *d)
if(data->menu_choice == CHOICE_SOUNDTEST) {
if(pad_pressed(PAD_LEFT)) {
if(data->soundtest_selection == 0)
data->soundtest_selection = BGM_NUM_SONGS - 1;
data->soundtest_selection = BGM_NUM_SONGS;
else data->soundtest_selection--;
} else if(pad_pressed(PAD_RIGHT)) {
if(data->soundtest_selection == BGM_NUM_SONGS - 1)
if(data->soundtest_selection == BGM_NUM_SONGS)
data->soundtest_selection = 0;
else data->soundtest_selection++;
}
} else if(data->menu_choice == CHOICE_MDEC) {
if(pad_pressed(PAD_LEFT)) {
if(data->mdectest_selection == 0)
data->mdectest_selection = FMV_NUM_VIDEOS - 1;
data->mdectest_selection = FMV_NUM_VIDEOS;
else data->mdectest_selection--;
} else if(pad_pressed(PAD_RIGHT)) {
if(data->mdectest_selection == FMV_NUM_VIDEOS - 1)
if(data->mdectest_selection == FMV_NUM_VIDEOS)
data->mdectest_selection = 0;
else data->mdectest_selection++;
}
} else if(data->menu_choice == CHOICE_SLIDE) {
if(pad_pressed(PAD_LEFT)) {
if(data->slidetest_selection == 0)
data->slidetest_selection = SLIDE_NUM_SLIDES - 1;
data->slidetest_selection = SLIDE_NUM_SLIDES;
else data->slidetest_selection--;
} else if(pad_pressed(PAD_RIGHT)) {
if(data->slidetest_selection == SLIDE_NUM_SLIDES - 1)
if(data->slidetest_selection == SLIDE_NUM_SLIDES)
data->slidetest_selection = 0;
else data->slidetest_selection++;
}
@ -214,19 +214,26 @@ screen_levelselect_update(void *d)
if(data->menu_choice == CHOICE_TITLE) {
scene_change(SCREEN_TITLE);
} else if(data->menu_choice == CHOICE_MDEC) {
screen_fmv_set_next(SCREEN_LEVELSELECT);
screen_fmv_enqueue(data->mdectest_selection);
scene_change(SCREEN_FMV);
if(data->mdectest_selection > 0) {
screen_fmv_set_next(SCREEN_LEVELSELECT);
screen_fmv_enqueue(data->mdectest_selection - 1);
scene_change(SCREEN_FMV);
}
} else if(data->menu_choice == CHOICE_MODELTEST) {
scene_change(SCREEN_MODELTEST);
} else if(data->menu_choice == CHOICE_SLIDE) {
screen_slide_set_next(data->slidetest_selection);
scene_change(SCREEN_SLIDE);
if(data->slidetest_selection > 0) {
screen_slide_set_next(data->slidetest_selection - 1);
slide_screen_override = SCREEN_LEVELSELECT;
scene_change(SCREEN_SLIDE);
}
} else if(data->menu_choice == CHOICE_CREDITS) {
scene_change(SCREEN_CREDITS);
} else if(data->menu_choice == CHOICE_SOUNDTEST) {
sound_bgm_play(data->soundtest_selection);
data->music_selected = data->soundtest_selection;
if(data->soundtest_selection > 0) {
sound_bgm_play(data->soundtest_selection - 1);
data->music_selected = data->soundtest_selection;
}
} else {
screen_level_setlevel(data->menu_choice);
screen_level_setmode(LEVEL_MODE_NORMAL);

9
src/screen_slide.c
View file

@ -8,7 +8,9 @@
#include "input.h"
#include "sound.h"
static SlideOption next_slide = -1;
static SlideOption next_slide = 0xff;
ScreenIndex slide_screen_override = 0xff;
static volatile const struct {
const char *image;
@ -67,6 +69,11 @@ screen_slide_load()
data->bgm = slide_table[data->current].bgm;
data->counter = slide_table[data->current].duration;
if(slide_screen_override != 0xff) {
data->next = slide_screen_override;
slide_screen_override = 0xff;
}
// Load image data
uint32_t length;
TIM_IMAGE img;