#include "menu.h"
#include "emu.h"
#include "mp3.h"
+#include "asm_utils.h"
#include "../common/emu.h"
#include "../common/lprintf.h"
#include "../../Pico/PicoInt.h"
-#define OSD_FPS_X 424
+#define OSD_FPS_X 432
// additional pspaudio imports, credits to crazyc
int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown); // play with conversion?
char romFileName[PATH_MAX];
unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
-int engineState;
+int engineState = PGS_Menu;
-static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos
static unsigned int noticeMsgTime = 0;
int reset_timing = 0; // do we need this?
SRam.changed = 0;
}
- if (!(currentConfig.EmuOpt & 0x20)) {
- FILE *f = fopen(PicoConfigFile, "r+b");
- if (!f) emu_WriteConfig(0);
- else {
- // if we already have config, reload it, except last ROM
- fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET);
- fread(¤tConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f);
- fseek(f, 0, SEEK_SET);
- fwrite(¤tConfig, 1, sizeof(currentConfig), f);
- fflush(f);
- fclose(f);
- }
- }
+ if (!(currentConfig.EmuOpt & 0x20))
+ config_writelrom(PicoConfigFile);
PicoExit();
sound_deinit();
static void do_pal_update(int allow_sh)
{
- unsigned int *spal=(void *)Pico.cram;
unsigned int *dpal=(void *)localPal;
int i;
- for (i = 0x3f/2; i >= 0; i--)
- dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
+ //for (i = 0x3f/2; i >= 0; i--)
+ // dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
+ do_pal_convert(localPal, Pico.cram, currentConfig.gamma);
if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?
{
// shadowed pixels
for (i = 0x3f/2; i >= 0; i--)
- dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x738e738e;
+ dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x7bcf7bcf;
// hilighted pixels
for (i = 0x3f; i >= 0; i--) {
- int t=localPal[i]&0xe71c;t+=0x4208;
- if (t&0x20) t|=0x1c;
- if (t&0x800) t|=0x700;
- if (t&0x10000) t|=0xe000;
- t&=0xe71c;
+ int t=localPal[i]&0xf79e;t+=0x4208;
+ if (t&0x20) t|=0x1e;
+ if (t&0x800) t|=0x780;
+ if (t&0x10000) t|=0xf000;
+ t&=0xf79e;
localPal[0x80|i]=(unsigned short)t;
}
localPal[0xe0] = 0;
// shouln't happen, but just in case
if (samples_made - samples_done >= samples_block*3) {
- lprintf("sthr: block skip (%i)\n", samples_made - samples_done);
+ //lprintf("sthr: block skip (%i)\n", samples_made - samples_done);
samples_done += samples_block; // skip
snd_playptr += samples_block;
}
int pl, acts = currentConfig.KeyBinds[i];
if (!acts) continue;
pl = (acts >> 16) & 1;
- if (combo_keys & (1 << i))
+ if (kb_combo_keys & (1 << i))
{
- int u = i+1, acts_c = acts & combo_acts;
+ int u = i+1, acts_c = acts & kb_combo_acts;
// let's try to find the other one
- if (acts_c)
+ if (acts_c) {
for (; u < 32; u++)
- if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) {
- allActions[pl] |= acts_c;
+ if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
+ allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
keys &= ~((1 << i) | (1 << u));
break;
}
+ }
// add non-combo actions if combo ones were not found
if (!acts_c || u == 32)
- allActions[pl] |= acts & ~combo_acts;
+ allActions[pl] |= acts & ~kb_combo_acts;
} else {
allActions[pl] |= acts;
}
prevEvents = (allActions[0] | allActions[1]) >> 16;
}
-static void find_combos(void)
-{
- int act, u;
-
- // find out which keys and actions are combos
- combo_keys = combo_acts = 0;
- for (act = 0; act < 32; act++)
- {
- int keyc = 0, keyc2 = 0;
- if (act == 16 || act == 17) continue; // player2 flag
- if (act > 17)
- {
- for (u = 0; u < 28; u++) // 28 because nub can't produce combos
- if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
- }
- else
- {
- for (u = 0; u < 28; u++)
- if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
- (currentConfig.KeyBinds[u] & (1 << act))) keyc++;
- for (u = 0; u < 28; u++)
- if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
- (currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
- }
- if (keyc > 1 || keyc2 > 1)
- {
- // loop again and mark those keys and actions as combo
- for (u = 0; u < 28; u++)
- {
- if (currentConfig.KeyBinds[u] & (1 << act)) {
- combo_keys |= 1 << u;
- combo_acts |= 1 << act;
- }
- }
- }
- }
-}
-
static void simpleWait(unsigned int until)
{
clearArea(1);
Pico.m.dirtyPal = 1;
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
- find_combos();
+ emu_findKeyBindCombos();
// pal/ntsc might have changed, reset related stuff
target_fps = Pico.m.pal ? 50 : 60;
void emu_ResetGame(void)
{
- PicoReset(0);
+ PicoReset();
reset_timing = 1;
}
+void emu_HandleResume(void)
+{
+ if (!(PicoMCD & 1)) return;
+
+ // reopen files..
+ if (Pico_mcd->TOC.Tracks[0].F != NULL)
+ {
+ lprintf("emu_HandleResume: reopen %s\n", romFileName);
+ pm_close(Pico_mcd->TOC.Tracks[0].F);
+ Pico_mcd->TOC.Tracks[0].F = pm_open(romFileName);
+ lprintf("reopen %s\n", Pico_mcd->TOC.Tracks[0].F != NULL ? "ok" : "failed");
+ }
+
+ mp3_reopen_file();
+}
+