Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Declaration of 'pause' from robotfindskitten has conflicting types for 'pause' from android-ndk-r5

Browse source 
Flyspray: FS#11901
Author: Benjamin Brown

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29114 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-01-22 18:27:05 +00:00
parent 98246b82b9
commit 921ffe7111
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/plugins/robotfindskitten.c
View file

@ -567,7 +567,7 @@ static void play_game(void);
static void process_input(int);
/*Helper functions*/
static void pause(void);
static void rfkpause(void);
static int validchar(char);
static void play_animation(int);
@ -715,7 +715,7 @@ static void process_input(int input)
case KITTEN: /*Found it!*/
play_animation(input);
/* Wait for the user to click something */
pause();
rfkpause();
break;
default: /*We hit a bogus object; print its message.*/
message(messages[bogus_messages[screen[check_x][check_y]-2]]);
@ -743,7 +743,7 @@ static void finish(int sig)
*
*****************************************************************************/
static void pause()
static void rfkpause()
{
int button;
rb->lcd_update();
@ -831,7 +831,7 @@ static void instructions()
"Press", "any", "key", "to", "start",
};
display_text(ARRAYLEN(help_text), help_text, NULL, NULL, false);
pause();
rfkpause();
}
static void initialize_arrays()