fix email

[hackover2013-badge-firmware.git] / badge / jumpnrun / starter.c

diff --git a/badge/jumpnrun/starter.c b/badge/jumpnrun/starter.c
index ca98dc0..d35c5fa 100644 (file)
--- a/badge/jumpnrun/starter.c
+++ b/badge/jumpnrun/starter.c
@@ -9,12 +9,40 @@ enum {
   MENU_BUFLEN          = LEVELDESCRIPTION_MAX + 1 + LEVELFILE_MAX + 1
 };
 
   MENU_BUFLEN          = LEVELDESCRIPTION_MAX + 1 + LEVELFILE_MAX + 1
 };
 

-static uint8_t jumpnrun_pick_level_from_fd(char *buf, size_t *first_visible, size_t *selected, FIL *fd) {
+#define PROGRESS_FNAME "progress.dat"
+
+static uint8_t jumpnrun_load_progress(void) {
+  uint8_t progress = 0;
+  FIL fd;
+
+
+  if(FR_OK == f_chdir(JUMPNRUN_PATH) &&
+     FR_OK == f_open(&fd, PROGRESS_FNAME, FA_OPEN_EXISTING | FA_READ)) {
+    UINT bytes;
+    f_read(&fd, &progress, sizeof(progress), &bytes);
+    f_close(&fd);
+  }
+
+  return progress;
+}
+
+static void jumpnrun_save_progress(uint8_t progress) {
+  FIL fd;
+
+  if(FR_OK == f_chdir(JUMPNRUN_PATH) &&
+     FR_OK == f_open(&fd, PROGRESS_FNAME, FA_CREATE_ALWAYS | FA_WRITE)) {
+    UINT bytes;
+    f_write(&fd, &progress, sizeof(progress), &bytes);
+    f_close(&fd);
+  }
+}
+
+static uint8_t jumpnrun_pick_level_from_fd(char *buf, size_t *first_visible, size_t *selected, uint8_t progress, FIL *fd) {

   unsigned levelcount = 0;
 
   {
     char buf[MENU_BUFLEN];
   unsigned levelcount = 0;
 
   {
     char buf[MENU_BUFLEN];

-    while(f_gets(buf, MENU_BUFLEN, fd)) {
+    while(f_gets(buf, MENU_BUFLEN, fd) && levelcount <= progress) {

       ++levelcount;
     }
   }
       ++levelcount;
     }
   }


@@ -23,9 +51,9 @@ static uint8_t jumpnrun_pick_level_from_fd(char *buf, size_t *first_visible, siz
     return JUMPNRUN_ERROR;
   }
 
     return JUMPNRUN_ERROR;
   }
 

-  char menu_buf[levelcount][MENU_BUFLEN];
-  char const *menu_index[levelcount];
-  char const *fnames[levelcount];
+  char menu_buf[levelcount + 1][MENU_BUFLEN];
+  char const *menu_index[levelcount + 1];
+  char const *fnames[levelcount + 1];

   unsigned i;
 
   for(i = 0; i < levelcount && f_gets(menu_buf[i], MENU_BUFLEN, fd); ++i) {
   unsigned i;
 
   for(i = 0; i < levelcount && f_gets(menu_buf[i], MENU_BUFLEN, fd); ++i) {


@@ -39,20 +67,29 @@ static uint8_t jumpnrun_pick_level_from_fd(char *buf, size_t *first_visible, siz
     fnames[i] = p;
   }
 
     fnames[i] = p;
   }
 

-  *selected = badge_menu(menu_index, i, first_visible, *selected);
+  strcpy(menu_buf[i], "exit");
+  menu_index[i] = menu_buf[i];
+  size_t choice = badge_menu(menu_index, i + 1, first_visible, *selected);
+
+  if(choice == levelcount) {
+    return 1; // exit
+  }

 
 

-  strcpy(buf, fnames[*selected]);
+  *selected = choice;
+  strncpy(buf, fnames[*selected], LEVELFILE_MAX);
+  buf[LEVELFILE_MAX] = '\0';

   return 0;
 }
 
   return 0;
 }
 

-static uint8_t jumpnrun_pick_level(char *buf, size_t *first_visible, size_t *selected) {
+static uint8_t jumpnrun_pick_level(char *buf, size_t *first_visible, size_t *selected, uint8_t progress) {

   FIL fd;
 
   FIL fd;
 

-  if(FR_OK != f_open(&fd, "levels.lst", FA_OPEN_EXISTING | FA_READ)) {
+  if(FR_OK != f_chdir(JUMPNRUN_PATH) ||
+     FR_OK != f_open(&fd, "levels.lst", FA_OPEN_EXISTING | FA_READ)) {

     return JUMPNRUN_ERROR;
   }
 
     return JUMPNRUN_ERROR;
   }
 

-  uint8_t err = jumpnrun_pick_level_from_fd(buf, first_visible, selected, &fd);
+  uint8_t err = jumpnrun_pick_level_from_fd(buf, first_visible, selected, progress, &fd);

 
   f_close(&fd);
 
 
   f_close(&fd);
 


@@ -63,8 +100,12 @@ void jumpnrun_play(void) {
   char buf[LEVELFILE_MAX + 1];
   size_t first_visible = 0;
   size_t selected = 0;
   char buf[LEVELFILE_MAX + 1];
   size_t first_visible = 0;
   size_t selected = 0;

+  uint8_t progress = jumpnrun_load_progress();

 
 

-  while(0 == jumpnrun_pick_level(buf, &first_visible, &selected)) {
-    jumpnrun_play_level(buf);
+  while(0 == jumpnrun_pick_level(buf, &first_visible, &selected, progress)) {
+    if(JUMPNRUN_WON == jumpnrun_play_level(buf) && selected == progress) {
+      selected = ++progress;
+      jumpnrun_save_progress(progress);
+    }

   }
 }
   }
 }