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

Comment out ALL mdec callbacks and playback routines

Browse source
This commit is contained in:
Lucas S. Vieira 2025-01-02 01:53:42 -03:00
parent aa21d61f19
commit eaccc0747f
10 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

0
include/mdec.h → include/mdec.h.old
View file

2
include/screen.h
View file

@ -7,7 +7,7 @@ typedef enum {
SCREEN_DISCLAIMER,
SCREEN_LEVELSELECT,
SCREEN_LEVEL,
SCREEN_FMV,
/* SCREEN_FMV, */
SCREEN_TITLE,
SCREEN_MODELTEST,
SCREEN_SLIDE,

0
include/screens/fmv.h → include/screens/fmv.h.old
View file

16
iso.xml
View file

@ -350,14 +350,14 @@
source="${PROJECT_SOURCE_DIR}/assets/bgm/EVENT001.XA" />
</dir>
<dir name="FMV">
<file name="SONICT.STR"
type="mixed"
source="${PROJECT_SOURCE_DIR}/assets/fmv/SONICT.STR" />
<file name="PS30YRS.STR"
type="mixed"
source="${PROJECT_SOURCE_DIR}/assets/fmv/PS30YRS.STR" />
</dir>
<!-- <dir name="FMV"> -->
<!-- <file name="SONICT.STR" -->
<!-- type="mixed" -->
<!-- source="${PROJECT_SOURCE_DIR}/assets/fmv/SONICT.STR" /> -->
<!-- <file name="PS30YRS.STR" -->
<!-- type="mixed" -->
<!-- source="${PROJECT_SOURCE_DIR}/assets/fmv/PS30YRS.STR" /> -->
<!-- </dir> -->
<dummy sectors="1024"/>
</directory_tree>

8
src/cd_callback.c
View file

@ -4,8 +4,8 @@
#include <psxetc.h>
extern void _xa_cd_event_callback(CdlIntrResult, uint8_t *);
extern void _mdec_cd_event_callback(CdlIntrResult, uint8_t *);
extern void _mdec_dma_callback(void);
/* extern void _mdec_cd_event_callback(CdlIntrResult, uint8_t *); */
/* extern void _mdec_dma_callback(void); */
void
cd_set_callbacks(PlaybackType type)
@ -16,8 +16,8 @@ cd_set_callbacks(PlaybackType type)
CdReadyCallback(_xa_cd_event_callback);
break;
case PLAYBACK_STR:
DMACallback(1, &_mdec_dma_callback);
CdReadyCallback(_mdec_cd_event_callback);
/* DMACallback(1, &_mdec_dma_callback); */
/* CdReadyCallback(_mdec_cd_event_callback); */
break;
default: break; // ???????????
}

4
src/main.c
View file

@ -21,7 +21,7 @@
#include "memalloc.h"
#include "screen.h"
#include "basic_font.h"
#include "mdec.h"
/* #include "mdec.h" */
/*
Locations of common textures on frame buffer:
@ -69,7 +69,7 @@ main(void)
// Initial loads from disc
render_loading_logo();
sound_bgm_init();
mdec_fmv_init();
/* mdec_fmv_init(); */
// Set first scene
scene_change(SCREEN_DISCLAIMER);

0
src/mdec.c → src/mdec.c.old
View file

10
src/screen.c
View file

@ -12,7 +12,7 @@
#include "screens/disclaimer.h"
#include "screens/levelselect.h"
#include "screens/level.h"
#include "screens/fmv.h"
/* #include "screens/fmv.h" */
#include "screens/title.h"
#include "screens/modeltest.h"
#include "screens/slide.h"
@ -75,7 +75,7 @@ scene_load()
case SCREEN_DISCLAIMER: screen_disclaimer_load(); break;
case SCREEN_LEVELSELECT: screen_levelselect_load(); break;
case SCREEN_LEVEL: screen_level_load(); break;
case SCREEN_FMV: screen_fmv_load(); break;
/* case SCREEN_FMV: screen_fmv_load(); break; */
case SCREEN_TITLE: screen_title_load(); break;
case SCREEN_MODELTEST: screen_modeltest_load(); break;
case SCREEN_SLIDE: screen_slide_load(); break;
@ -91,7 +91,7 @@ scene_unload()
case SCREEN_DISCLAIMER: screen_disclaimer_unload(scene_data); break;
case SCREEN_LEVELSELECT: screen_levelselect_unload(scene_data); break;
case SCREEN_LEVEL: screen_level_unload(scene_data); break;
case SCREEN_FMV: screen_fmv_unload(scene_data); break;
/* case SCREEN_FMV: screen_fmv_unload(scene_data); break; */
case SCREEN_TITLE: screen_title_unload(scene_data); break;
case SCREEN_MODELTEST: screen_modeltest_unload(scene_data); break;
case SCREEN_SLIDE: screen_slide_unload(scene_data); break;
@ -107,7 +107,7 @@ scene_update()
case SCREEN_DISCLAIMER: screen_disclaimer_update(scene_data); break;
case SCREEN_LEVELSELECT: screen_levelselect_update(scene_data); break;
case SCREEN_LEVEL: screen_level_update(scene_data); break;
case SCREEN_FMV: screen_fmv_update(scene_data); break;
/* case SCREEN_FMV: screen_fmv_update(scene_data); break; */
case SCREEN_TITLE: screen_title_update(scene_data); break;
case SCREEN_MODELTEST: screen_modeltest_update(scene_data); break;
case SCREEN_SLIDE: screen_slide_update(scene_data); break;
@ -124,7 +124,7 @@ scene_draw()
case SCREEN_DISCLAIMER: screen_disclaimer_draw(scene_data); break;
case SCREEN_LEVELSELECT: screen_levelselect_draw(scene_data); break;
case SCREEN_LEVEL: screen_level_draw(scene_data); break;
case SCREEN_FMV: screen_fmv_draw(scene_data); break;
/* case SCREEN_FMV: screen_fmv_draw(scene_data); break; */
case SCREEN_TITLE: screen_title_draw(scene_data); break;
case SCREEN_MODELTEST: screen_modeltest_draw(scene_data); break;
case SCREEN_SLIDE: screen_slide_draw(scene_data); break;

0
src/screen_fmv.c → src/screen_fmv.c.old
View file

62
src/screen_levelselect.c
View file

@ -8,7 +8,7 @@
#include "screen.h"
#include "render.h"
#include "screens/level.h"
#include "screens/fmv.h"
/* #include "screens/fmv.h" */
#include "screens/slide.h"
#include "sound.h"
#include "util.h"
@ -16,11 +16,11 @@
#include "basic_font.h"
#define CHOICE_SOUNDTEST 19
#define CHOICE_MDEC 20
#define CHOICE_SLIDE 21
#define CHOICE_MODELTEST 22
#define CHOICE_TITLE 23
#define CHOICE_CREDITS 24
/* #define CHOICE_MDEC 20 */
#define CHOICE_SLIDE 20
#define CHOICE_MODELTEST 21
#define CHOICE_TITLE 22
#define CHOICE_CREDITS 23
#define MAX_LEVELS (CHOICE_CREDITS + 1)
#define MAX_COLUMN_CHOICES 17
@ -39,7 +39,7 @@ typedef struct {
uint16_t bg_timer;
uint8_t music_selected;
uint8_t soundtest_selection;
uint8_t mdectest_selection;
/* uint8_t mdectest_selection; */
uint8_t slidetest_selection;
} screen_levelselect_data;
@ -65,7 +65,7 @@ static const char *menutext[] = {
" 3",
"\n",
"SOUND TEST *??*",
"MDEC TEST *??*",
/* "MDEC TEST *??*", */
"SLIDE TEST *??*",
"\n",
"\n",
@ -104,7 +104,7 @@ screen_levelselect_load()
data->music_selected = 0;
data->soundtest_selection = 0x00;
data->mdectest_selection = 0x00;
/* data->mdectest_selection = 0x00; */
data->slidetest_selection = 0x00;
// Regardless of the level, reset score.
@ -172,16 +172,16 @@ screen_levelselect_update(void *d)
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;
else data->mdectest_selection--;
} else if(pad_pressed(PAD_RIGHT)) {
if(data->mdectest_selection == FMV_NUM_VIDEOS)
data->mdectest_selection = 0;
else data->mdectest_selection++;
}
/* } else if(data->menu_choice == CHOICE_MDEC) { */
/* if(pad_pressed(PAD_LEFT)) { */
/* if(data->mdectest_selection == 0) */
/* data->mdectest_selection = FMV_NUM_VIDEOS; */
/* else data->mdectest_selection--; */
/* } else if(pad_pressed(PAD_RIGHT)) { */
/* 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)
@ -201,7 +201,7 @@ screen_levelselect_update(void *d)
else data->menu_choice--;
} else if(
(data->menu_choice != CHOICE_SOUNDTEST)
&& (data->menu_choice != CHOICE_MDEC)
/* && (data->menu_choice != CHOICE_MDEC) */
&& (data->menu_choice != CHOICE_SLIDE)
&& (pad_pressed(PAD_LEFT) || pad_pressed(PAD_RIGHT))) {
if(data->menu_choice < MAX_COLUMN_CHOICES - 1) {
@ -216,12 +216,12 @@ screen_levelselect_update(void *d)
if(pad_pressed(PAD_START) || pad_pressed(PAD_CROSS)) {
if(data->menu_choice == CHOICE_TITLE) {
scene_change(SCREEN_TITLE);
} else if(data->menu_choice == CHOICE_MDEC) {
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_MDEC) { */
/* 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) {
@ -309,11 +309,11 @@ screen_levelselect_draw(void *d)
snprintf(buffer, 80, "SOUND TEST *%02X*",
data->soundtest_selection);
font_draw_sm(buffer, vx, vy);
} else if(cursel == CHOICE_MDEC) {
char buffer[80];
snprintf(buffer, 80, "MDEC TEST *%02X*",
data->mdectest_selection);
font_draw_sm(buffer, vx, vy);
/* } else if(cursel == CHOICE_MDEC) { */
/* char buffer[80]; */
/* snprintf(buffer, 80, "MDEC TEST *%02X*", */
/* data->mdectest_selection); */
/* font_draw_sm(buffer, vx, vy); */
} else if(cursel == CHOICE_SLIDE) {
char buffer[80];
snprintf(buffer, 80, "SLIDE TEST *%02X*",