Merge branch 'master' of github.com:r0ket/r0ket

This commit is contained in:
Stefan `Sec` Zehl 2011-08-03 22:34:44 +02:00
commit 996287e0ce
1 changed files with 14 additions and 4 deletions

View File

@ -105,6 +105,8 @@ void ram(void) {
} }
void screen_intro() { void screen_intro() {
uint32_t highscore;
char[20] highnick;
char key=0; char key=0;
while(key==0) { while(key==0) {
lcdFill(0); lcdFill(0);
@ -113,9 +115,10 @@ void screen_intro() {
font = &Font_7x8; font = &Font_7x8;
DoString (28,40,"SPACE"); DoString (28,40,"SPACE");
DoString (18,50,"INVADERS"); DoString (18,50,"INVADERS");
//DoString (20,RESY-24, "Highscore");
DoString (0, 0, "12345"); highscore = highscore_get(highnick);
DoString (0, 9, "iggy"); DoInt(0, 0, highscore);
DoString (0, 9, highnick);
lcdDisplay(); lcdDisplay();
delayms_queue(50); delayms_queue(50);
@ -130,7 +133,8 @@ void screen_gameover() {
font = &Font_7x8; font = &Font_7x8;
DoString (12,32, "GAME OVER"); DoString (12,32, "GAME OVER");
DoInt (0,0, game.score); DoInt (0,0, game.score);
DoString (0,9,"HIGHSCORE!"); if (highscore_set(game.score, GLOBAL(nickname)))
DoString (0,9,"HIGHSCORE!");
lcdDisplay(); lcdDisplay();
delayms_queue(50); delayms_queue(50);
key=getInput(); key=getInput();
@ -147,6 +151,12 @@ void screen_level() {
delayms(500); delayms(500);
} }
bool highscore_set(uint32_t score, char nick[]) {
}
uint32_t highscore_get(char nick[]){
}
void init_game(void) { void init_game(void) {
game.player = POS_PLAYER_X; game.player = POS_PLAYER_X;
game.shot_x = DISABLED; game.shot_x = DISABLED;