WebSVN – Games.Rick Dangerous – Diff – //src/game.c

    game_state = INIT_GAME;
    /* main loop */
    while (game_state != EXIT)
+   {
+      // Pierre-Marie Baty -- intro runs faster
       if (game_state != INTRO_MAP)
-         game_period = sysarg_args_period ? sysarg_args_period : GAME_PERIOD;
+         game_period = (sysarg_args_period ? sysarg_args_period : GAME_PERIOD);
       else
          game_period = (sysarg_args_period ? sysarg_args_period : GAME_PERIOD) / 2;
       /* timer */
       tmx = tm; tm = sys_gettime (); tmx = tm - tmx;
       /* frame */
       frame ();
+   }
    freedata (); /* free cached data */
+}
+// Pierre-Marie Baty -- addition: sort high scores
+int sort_hscores (const void *q1, const void *q2)
+{
+   return (((hscore_t *) q1)->score < ((hscore_t *) q2)->score);
+}
 /*
  * Prepare frame
             if (game_map >= 0x04)
+            {
                /* reached end of game */
                sysarg_args_map = 0;
                sysarg_args_submap = 0;
+               sysarg_args_score = 0;
                game_state = GAMEOVER;
+            }
             else
+            {
                /* initialize game */
       while (i < MAP_NBR_CONNECT && (map_connect[i].submap != game_submap || map_connect[i].dir != RIGHT))
          i++;
       map_frow = map_connect[i].rowin - 0x10;
       ent_ents[1].y = 0x10 << 3;
+   }
+   // Pierre-Marie Baty -- addition: start score
+   if (sysarg_args_score != 0)
+      game_score = sysarg_args_score + 1;
    ent_ents[1].x = map_maps[game_map].x;
    ent_ents[1].y = map_maps[game_map].y;
    ent_ents[1].w = 0x18;
    ent_ents[1].h = 0x15;
    game_rects = r; /* take care to cleanup draw_STATUSRECT->next later! */
    if (!E_RICK_STTST (E_RICK_STZOMBIE))
+   {
       /* need to scroll ? */
-      if (ent_ents[1].y >= 0xCC)
+      if (ent_ents[1].y >= 200 + 4)
+      {
          game_state = SCROLL_UP;
          return;
+      }
-      if (ent_ents[1].y <= 0x60)
+      if (ent_ents[1].y <= 100 - 4)
+      {
          game_state = SCROLL_DOWN;
          return;
+      }
+   }
  * restart
+ *
  */
 static void restart (void)
+{
-   E_RICK_STRST (E_RICK_STDEAD | E_RICK_STZOMBIE);
+   E_RICK_STRST (/*E_RICK_STDEAD | E_RICK_STZOMBIE*/ 0xff); // Pierre-Marie Baty -- correct sprite position on restart
    game_bullets = 6;
    game_bombs = 6;
    ent_ents[1].n = 1;
    WAV_ENTITY[4] = syssnd_load ("sounds/ent4.wav");
    WAV_ENTITY[5] = syssnd_load ("sounds/ent5.wav");
    WAV_ENTITY[6] = syssnd_load ("sounds/ent6.wav");
    WAV_ENTITY[7] = syssnd_load ("sounds/ent7.wav");
    WAV_ENTITY[8] = syssnd_load ("sounds/ent8.wav");
+   // Pierre-Marie Baty -- addition: load high scores
+   {
+      char hiscorefile_fullpathname[1024];
+      char linebuf[256];
+      hscore_t *hscore;
+      U32 score;
+      char *ptr;
+      size_t i, j;
+      FILE *fp;
+      sprintf_s (hiscorefile_fullpathname, 1024, "%s/%s", sys_getbasepath (), "hiscores.txt");
+      fopen_s (&fp, hiscorefile_fullpathname, "rb");
+      if (fp != NULL)
+      {
+         for (i = 0; (fgets (linebuf, sizeof (linebuf), fp) != NULL) && (i < 8);)
+         {
+            score = strtol (linebuf, &ptr, 10);
+            if (ptr <= linebuf)
+               continue;
+            while ((*ptr == '\t') || (*ptr == ' '))
+               ptr++;
+            hscore = &game_hscores[i++];
+            hscore->score = score;
+            for (j = 0; j < sizeof (hscore->name); j++)
+               hscore->name[j] = '@';
+            for (j = 0; j < sizeof (hscore->name); j++, ptr++)
+               hscore->name[j] = (((*ptr >= 'A') && (*ptr <= 'Z')) || (*ptr == '.') ? *ptr : '@');
+         }
+         qsort (game_hscores, 8, sizeof (hscore_t), sort_hscores);
+         fclose (fp);
+      }
+   }
+}
 /*
+ *
    syssnd_free (WAV_ENTITY[4]);
    syssnd_free (WAV_ENTITY[5]);
    syssnd_free (WAV_ENTITY[6]);
    syssnd_free (WAV_ENTITY[7]);
    syssnd_free (WAV_ENTITY[8]);
+   // Pierre-Marie Baty -- addition: save high scores
+   {
+      char hiscorefile_fullpathname[1024];
+      size_t i, j;
+      FILE *fp;
+      sprintf_s (hiscorefile_fullpathname, 1024, "%s/%s", sys_getbasepath (), "hiscores.txt");
+      fopen_s (&fp, hiscorefile_fullpathname, "wb");
+      if (fp != NULL)
+      {
+         for (i = 0; i < sizeof (game_hscores) / sizeof (game_hscores[0]); i++)
+         {
+            fprintf (fp, "%d\t", game_hscores[i].score);
+            for (j = 0; j < sizeof (game_hscores[i].name); j++)
+               fputc ((game_hscores[i].name[j] != '@' ? game_hscores[i].name[j] : ' '), fp);
+            fputc ('\n', fp);
+         }
+         fclose (fp);
+      }
+   }
+}

Subversion Repositories Games.Rick Dangerous

Games.Rick Dangerous//src/game.c – Rev 7 → 9