mirror of
https://github.com/RaySollium99/libpicofe.git
synced 2025-09-05 14:57:46 -04:00
idle loop hack, psp bugfix, plat debug str
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@566 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
parent
8add01a3a4
commit
7443ecd958
7 changed files with 21 additions and 5 deletions
|
@ -61,3 +61,4 @@ void emu_DoTurbo(int *pad, int acts);
|
|||
|
||||
extern const char * const keyNames[];
|
||||
void emu_prepareDefaultConfig(void);
|
||||
void emu_platformDebugCat(char *str);
|
||||
|
|
|
@ -405,13 +405,16 @@ void debug_menu_loop(void)
|
|||
{
|
||||
int inp, mode = 0;
|
||||
int spr_offs = 0, dumped = 0;
|
||||
char *tmp;
|
||||
|
||||
while (1)
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
case 0: menu_draw_begin();
|
||||
draw_text_debug(PDebugMain(), 0, 0);
|
||||
tmp = PDebugMain();
|
||||
emu_platformDebugCat(tmp);
|
||||
draw_text_debug(tmp, 0, 0);
|
||||
if (dumped) {
|
||||
smalltext_out16(SCREEN_WIDTH-6*10, SCREEN_HEIGHT-8, "dumped", 0xffff);
|
||||
dumped = 0;
|
||||
|
|
|
@ -719,6 +719,11 @@ void emu_forcedFrame(int opts)
|
|||
currentConfig.EmuOpt = eo_old;
|
||||
}
|
||||
|
||||
void emu_platformDebugCat(char *str)
|
||||
{
|
||||
// nothing
|
||||
}
|
||||
|
||||
static void simpleWait(int thissec, int lim_time)
|
||||
{
|
||||
struct timeval tval;
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#define VERSION "1.51a"
|
||||
#define VERSION "1.51b"
|
||||
|
||||
|
|
10
psp/emu.c
10
psp/emu.c
|
@ -274,7 +274,7 @@ static void do_pal_update(int allow_sh, int allow_as)
|
|||
}
|
||||
else if (allow_as && (rendstatus & PDRAW_ACC_SPRITES))
|
||||
{
|
||||
memcpy32((int *)(void *)(localPal+0x80), (void *)localPal, 0x40/2);
|
||||
memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -296,6 +296,7 @@ static void EmuScanPrepare(void)
|
|||
|
||||
if (dynamic_palette > 0)
|
||||
dynamic_palette--;
|
||||
|
||||
if (Pico.m.dirtyPal)
|
||||
do_pal_update(1, 1);
|
||||
if ((rendstatus & PDRAW_ACC_SPRITES) && !(Pico.video.reg[0xC]&8))
|
||||
|
@ -322,7 +323,7 @@ static int EmuScanSlowEnd(unsigned int num)
|
|||
do_slowmode_lines(num);
|
||||
dynamic_palette = 3; // last for 2 more frames
|
||||
}
|
||||
do_pal_update(1, 0);
|
||||
do_pal_update(1, 1);
|
||||
}
|
||||
|
||||
if (dynamic_palette) {
|
||||
|
@ -534,6 +535,11 @@ static void vidResetMode(void)
|
|||
sceGuSync(0,0);
|
||||
}
|
||||
|
||||
void emu_platformDebugCat(char *str)
|
||||
{
|
||||
strcat(str, blit_16bit_mode ? "soft clut\n" : "hard clut\n");
|
||||
}
|
||||
|
||||
|
||||
/* sound stuff */
|
||||
#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
|
||||
|
|
|
@ -1161,6 +1161,7 @@ menu_entry opt2_entries[] =
|
|||
{ "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1, 1 },
|
||||
{ "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1, 1 },
|
||||
{ "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1, 1 },
|
||||
{ "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoOpt, 0x80000, 0, 0, 1, 1 },
|
||||
{ "Disable frame limiter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1, 1 },
|
||||
{ "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1, 0 },
|
||||
};
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#define VERSION "1.51a"
|
||||
#define VERSION "1.51b"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue