sound (with problems) + stuff

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@265 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-09-28 22:10:19 +00:00
parent 8ede36b95e
commit 65345ecc32

View file

@ -105,7 +105,7 @@ static void find_combos(void)
for (act = 0; act < 32; act++) for (act = 0; act < 32; act++)
{ {
int keyc = 0; int keyc = 0;
if (act == 16) continue; // player2 flag if (act == 16 || act == 17) continue; // player2 flag
for (u = 0; u < 32; u++) for (u = 0; u < 32; u++)
{ {
if (currentConfig.KeyBinds[u] & (1 << act)) keyc++; if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
@ -629,7 +629,7 @@ static void simpleWait(int thissec, int lim_time)
void emu_Loop(void) void emu_Loop(void)
{ {
static int gp2x_old_clock = 200; static int gp2x_old_clock = 200;
static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, PsndLen_real = 0, pal_old = 0; static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0;
char fpsbuff[24]; // fps count c string char fpsbuff[24]; // fps count c string
struct timeval tval; // timing struct timeval tval; // timing
int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0; int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0;
@ -693,7 +693,6 @@ void emu_Loop(void)
memset(sndBuffer, 0, sizeof(sndBuffer)); memset(sndBuffer, 0, sizeof(sndBuffer));
PsndOut = sndBuffer; PsndOut = sndBuffer;
PsndRate_old = PsndRate; PsndRate_old = PsndRate;
PsndLen_real = PsndLen;
PicoOpt_old = PicoOpt; PicoOpt_old = PicoOpt;
pal_old = Pico.m.pal; pal_old = Pico.m.pal;
} else { } else {