puzzles: fix building
- disables help on c200v2 - renames conflicting function Change-Id: I0c4ff1bb40e7e3cafd0170090f22b80bf0656741
This commit is contained in:
parent
001860ce78
commit
7b6f34a456
3 changed files with 22 additions and 2 deletions
|
@ -1,8 +1,11 @@
|
|||
rockbox.c
|
||||
rbwrappers.c
|
||||
rbmalloc.c
|
||||
|
||||
#ifndef SANSA_C200V2
|
||||
help.c
|
||||
helpcontent.c
|
||||
#endif
|
||||
|
||||
src/combi.c
|
||||
src/divvy.c
|
||||
|
|
|
@ -1099,6 +1099,15 @@ static void quick_help(void)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef SANSA_C200V2
|
||||
/* no full help available due to memory constraints, so we provide a
|
||||
* dummy function here */
|
||||
void full_help(const char *str)
|
||||
{
|
||||
(void) str;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void init_default_settings(void)
|
||||
{
|
||||
settings.slowmo_factor = 1;
|
||||
|
@ -1214,7 +1223,11 @@ static int pausemenu_cb(int action, const struct menu_item_ex *this_item)
|
|||
return ACTION_EXIT_MENUITEM;
|
||||
break;
|
||||
case 7:
|
||||
#ifdef SANSA_C200V2
|
||||
return ACTION_EXIT_MENUITEM;
|
||||
#else
|
||||
break;
|
||||
#endif
|
||||
case 8:
|
||||
#ifdef COMBINED
|
||||
/* audio buf is used, so no playback */
|
||||
|
@ -1806,7 +1819,11 @@ static int mainmenu_cb(int action, const struct menu_item_ex *this_item)
|
|||
return ACTION_EXIT_MENUITEM;
|
||||
break;
|
||||
case 3:
|
||||
#ifdef SANSA_C200V2
|
||||
return ACTION_EXIT_MENUITEM;
|
||||
#else
|
||||
break;
|
||||
#endif
|
||||
case 4:
|
||||
#ifdef COMBINED
|
||||
/* audio buf is used, so no playback */
|
||||
|
|
|
@ -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 swap_regions(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);
|
||||
swap_regions(carray + eltsize * i, carray + eltsize * j, eltsize);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue