notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.35a psp bugfix release
[libpicofe.git]
/
psp
/
emu.c
diff --git
a/psp/emu.c
b/psp/emu.c
index
aaa5a0e
..
c63c00b
100644
(file)
--- a/
psp/emu.c
+++ b/
psp/emu.c
@@
-197,7
+197,6
@@
static void set_scaling_params(void)
if (fbimg_width >= 480) {
g_vertices[0].u = (fbimg_width-480)/2;
g_vertices[1].u = src_width - (fbimg_width-480)/2 - 1;
if (fbimg_width >= 480) {
g_vertices[0].u = (fbimg_width-480)/2;
g_vertices[1].u = src_width - (fbimg_width-480)/2 - 1;
- if (fbimg_width == 480) border_hack = 1;
fbimg_width = 480;
fbimg_xoffs = 0;
} else {
fbimg_width = 480;
fbimg_xoffs = 0;
} else {
@@
-205,6
+204,7
@@
static void set_scaling_params(void)
g_vertices[1].u = src_width;
fbimg_xoffs = 240 - fbimg_width/2;
}
g_vertices[1].u = src_width;
fbimg_xoffs = 240 - fbimg_width/2;
}
+ if (fbimg_width > 320 && fbimg_width <= 480) border_hack = 1;
if (fbimg_height >= 272) {
g_vertices[0].v = (fbimg_height-272)/2;
if (fbimg_height >= 272) {
g_vertices[0].v = (fbimg_height-272)/2;
@@
-990,7
+990,7
@@
void emu_Loop(void)
for (i = 0; i < currentConfig.Frameskip; i++) {
updateKeys();
SkipFrame(); frames_done++;
for (i = 0; i < currentConfig.Frameskip; i++) {
updateKeys();
SkipFrame(); frames_done++;
- if (
PsndOut) { // do framelimitting if sound is enabl
ed
+ if (
!(currentConfig.EmuOpt&0x40000)) { // do framelimitting if need
ed
int tval_diff;
tval = sceKernelGetSystemTimeLow();
tval_diff = (int)(tval - tval_thissec) << 8;
int tval_diff;
tval = sceKernelGetSystemTimeLow();
tval_diff = (int)(tval - tval_thissec) << 8;
@@
-1035,7
+1035,7
@@
void emu_Loop(void)
if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection
reset_timing = 1;
if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection
reset_timing = 1;
- else if (
PsndOut != NULL
|| currentConfig.Frameskip < 0)
+ else if (
!(currentConfig.EmuOpt&0x40000)
|| currentConfig.Frameskip < 0)
{
// sleep if we are still too fast
if (tval_diff < lim_time)
{
// sleep if we are still too fast
if (tval_diff < lim_time)