sprite limit

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@406 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 4901938..edb4a02 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -1110,7 +1110,7 @@ static void DrawAllSprites(int *hcache, int maxwidth, int prio, int sh)
 \r
     // sprite limit\r
     ntiles += pack>>28;\r
-    if(ntiles > 40) break;\r
+    if(!(PicoOpt&0x40000) && ntiles > 40) break;\r
 \r
     if(pack & 0x00800000) continue;\r
 \r

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 946d98e..71edbd8 100644 (file)
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -34,7 +34,7 @@ void mp3_update(int *buffer, int length, int stereo);
 // 00 00x0 alt_renderer, 6button_gamepad, accurate_timing, accurate_sprites,\r
 // 00 0x00 draw_no_32col_border, external_ym2612, enable_cd_pcm, enable_cd_cdda\r
 // 00 x000 enable_cd_gfx, cd_perfect_sync, soft_32col_scaling, enable_cd_ramcart\r
-// 0x 0000 disable_vdp_fifo, no_svp_dynarec\r
+// 0x 0000 disable_vdp_fifo, no_svp_dynarec, no_sprite_limit\r
 extern int PicoOpt;\r
 extern int PicoVer;\r
 extern int PicoSkipFrame; // skip rendering frame, but still do sound (if enabled) and emulation stuff\r

diff --git a/platform/common/menu.h b/platform/common/menu.h
index 1a4ded2..432a31e 100644 (file)
--- a/platform/common/menu.h
+++ b/platform/common/menu.h
@@ -65,6 +65,7 @@ typedef enum
        MA_OPT2_STATUS_LINE,    /* psp */
        MA_OPT2_NO_FRAME_LIMIT, /* psp */
        MA_OPT2_SVP_DYNAREC,
+       MA_OPT2_NO_SPRITE_LIM,
        MA_OPT2_DONE,
        MA_OPT3_SCALE,          /* psp (all OPT3) */
        MA_OPT3_HSCALE32,

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 55995b9..06c0afb 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -1062,6 +1062,7 @@ menu_entry opt2_entries[] =
        { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &PicoOpt, 0x00004, 0, 0, 1, 1 },\r
        { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },\r
        { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },\r
+       { "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
        { "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,   &currentConfig.EmuOpt, 0x0008, 0, 0, 1, 1 },\r
        { "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,   &currentConfig.EmuOpt, 0x0020, 0, 0, 1, 1 },\r
        { "needs restart:",            MB_NONE,  MA_NONE,               NULL, 0, 0, 0, 1, 0 },\r

diff --git a/platform/gp2x/version.h b/platform/gp2x/version.h
index 405cb9c..9b9d909 100644 (file)
--- a/platform/gp2x/version.h
+++ b/platform/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.40a"\r
+#define VERSION "1.40b"\r
 \r

diff --git a/platform/psp/version.h b/platform/psp/version.h
index 5469221..95717b1 100644 (file)
--- a/platform/psp/version.h
+++ b/platform/psp/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.35b"\r
+#define VERSION "1.40"\r
 \r