summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2016-12-18 12:51:10 -0500
committerFranklin Wei <git@fwei.tk>2016-12-18 12:51:40 -0500
commit575bd890e7abb21e24675f31e0e4090cf76bda3a (patch)
treecb26f435348f91ed33d63563f6d1f90fc6069434 /apps
parent90f1370bbf7c3a6a21cfb41b637758178da9d553 (diff)
downloadrockbox-575bd890e7abb21e24675f31e0e4090cf76bda3a.zip
rockbox-575bd890e7abb21e24675f31e0e4090cf76bda3a.tar.gz
rockbox-575bd890e7abb21e24675f31e0e4090cf76bda3a.tar.bz2
rockbox-575bd890e7abb21e24675f31e0e4090cf76bda3a.tar.xz
work around little bugs in puzzles
Change-Id: I80d72a6bb0189eb842385aa622506d5efe319053
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/puzzles/SOURCES.games2
-rw-r--r--apps/plugins/puzzles/misc.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/puzzles/SOURCES.games b/apps/plugins/puzzles/SOURCES.games
index 6ecfdc7..d228138 100644
--- a/apps/plugins/puzzles/SOURCES.games
+++ b/apps/plugins/puzzles/SOURCES.games
@@ -19,7 +19,9 @@ net.c
netslide.c
/*palisade.c*/
pattern.c
+#if PLUGIN_BUFFER_SIZE > 0x20000
pearl.c
+#endif
pegs.c
range.c
rect.c
diff --git a/apps/plugins/puzzles/misc.c b/apps/plugins/puzzles/misc.c
index caf52cd..cd5c393 100644
--- a/apps/plugins/puzzles/misc.c
+++ b/apps/plugins/puzzles/misc.c
@@ -201,7 +201,7 @@ void game_mkhighlight(frontend *fe, float *ret,
game_mkhighlight_specific(fe, ret, background, highlight, lowlight);
}
-static void memswap(void *av, void *bv, int size)
+static void memswap_puzzles(void *av, void *bv, int size)
{
char tmpbuf[512];
char *a = av, *b = bv;
@@ -225,7 +225,7 @@ void shuffle(void *array, int nelts, int eltsize, random_state *rs)
for (i = nelts; i-- > 1 ;) {
int j = random_upto(rs, i+1);
if (j != i)
- memswap(carray + eltsize * i, carray + eltsize * j, eltsize);
+ memswap_puzzles(carray + eltsize * i, carray + eltsize * j, eltsize);
}
}