Ticket #552: score.diff

score.c

@@ -28 +28 @@
- *
- * Note that "string comparisons" are thus valid on "pts".
- */
-
-
-
-
+
-{
-        char what[8];           /* Version info (string) */
-
@@ -57 +54 @@
-        char max_dun[4];                /* Max Dungeon Level (number) */
-
-        char how[32];           /* Method of death (string) */
-
+ high_score
-
-
-
-/*
- * Hack - save index of player's high score
- */
-int score_idx = -1;
-
-
-
-/*
- * Hack -- Calculates the total number of points earned
- */
-static long total_points(void)
@@ -78 +68 @@
-
-
-/*
-Seek score 'i' in the highscore file
+Read in a highscore file.
- */
-bool highscore_seek(ang_file *f, int i
+size_t highscore_read(high_score scores[], size_t sz
-{
-/* Seek for the requested record */
-return (file_seek(f, i * sizeof(high_score)))
-
+char fname[1024];
+ang_file *scorefile
+
-
+        /* Wipe current scores */
+        C_WIPE(scores, sz, high_score);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
+
-/*
- * Just determine where a new score *would* be placed
- * Return the location (0 is best) or -1 on failure
- */
-int highscore_where(ang_file *f, const high_score *score
+size_t highscore_where(const high_score *entry, const high_score scores[], size_t sz
-{
-
-
+
-
-        /* Go to the start of the highscore file */
-        if (!highscore_seek(f, 0)) return (-1);
-
-        /* Read until we get to a higher score */
-MAX_HISCORES
+sz
-        {
-
-
+
+
+
+
+
+
+
+
-        }
-
-"last"
-(MAX_HISCORES - 1)
+last
+sz - 1
-}
-
+static size_t highscore_add(const high_score *entry, high_score scores[], size_t sz)
+{
+        size_t slot = highscore_where(entry, scores, sz);
+
+        memmove(&scores[slot+1], &scores[slot], sizeof(high_score) * (sz - 1 - slot));
+        memcpy(&scores[slot], entry, sizeof(high_score));
+
+        return slot;
+}
+
+static size_t highscore_count(const high_score scores[], size_t sz)
+{
+        size_t i;
+        for (i = 0; i < sz; i++)
+        {
+                if (scores[i].what[0] == '\0') break;
+        }
+
+        return i;
+}
+
+
-/*
- * Actually place an entry into the high score file
- * Return the location (0 is best) or -1 on "failure"
- */
-int highscore_add(const high_score *score
+void highscore_write(const high_score scores[], size_t sz
-{
-
-
+
-
-
+
+
-
-        ang_file *old, *new, *lok;
-        char cur_name[1024];
-        char old_name[1024];
+        char cur_name[1024];
-        char new_name[1024];
-        char lok_name[1024];
-
-        path_build(cur_name, sizeof(cur_name), ANGBAND_DIR_APEX, "scores.raw");
-        path_build(old_name, sizeof(old_name), ANGBAND_DIR_APEX, "scores.old");
+        path_build(cur_name, sizeof(cur_name), ANGBAND_DIR_APEX, "scores.raw");
-        path_build(new_name, sizeof(new_name), ANGBAND_DIR_APEX, "scores.new");
-        path_build(lok_name, sizeof(lok_name), ANGBAND_DIR_APEX, "scores.lok");
-
-
-
+
+
-
+
+        /*** Lock scores ***/
+
+        if (file_exists(lok_name))
+        {
+                msg_print("Lock file in place for scorefile; not writing.");
+                return;
+        }
+
-        safe_setuid_grab();
-        new = file_open(new_name, MODE_WRITE, FTYPE_RAW);
-        lok = file_open(lok_name, MODE_WRITE, FTYPE_RAW);
-
-
+
-        safe_setuid_drop();
-
-
-
-
-
+
-        {
-
+
+
+
-
-                /* Read entries from the old and write them to the new */
-                for (i = 0; (i < MAX_HISCORES) && !error; i++)
-                {
-                        if (!highscore_seek(old, i)) return (-1);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
+
-        {
-
-
-
-
-
-
+
+
+
+
+
-        }
-
-
+
+
-
-
+
+
-        safe_setuid_grab();
-
-
+
+
-
-
-
-
+
+
-
+        if (!file_move(new_name, cur_name))
+                msg_print("Couldn't rename new scorefile to scores.raw");
+
+        /* Remove the lock */
-        file_close(lok);
-safe_setuid_drop(
+file_delete(lok_name
-
-
-
+
-}
-
-
-
-/*
- * Display the scores in a given range.
- * Assumes the high score list is already open.
- * Only five entries per line, too much info.
- *
- * Mega-Hack -- allow "fake" entry at the given position.
- */
-int from, int to, int note, high_score *score
+const high_score scores[], int from, int to, int highlight
-{
-        char ch;
-
-        int j, k, n, place;
-        int count;
-
-        high_score the_score;
-
-        char out_val[160];
-        char tmp_val[160];
-
-        byte attr;
-
-        ang_file *f;
-        char buf[1024];
-
-
-        path_build(buf, sizeof(buf), ANGBAND_DIR_APEX, "scores.raw");
-        f = file_open(buf, MODE_READ, -1);
-        if (!f) return;
-
-        /* Assume we will show the first 10 */
-        if (from < 0) from = 0;
-        if (to < 0) to = 10;
@@ -254 +247 @@
-        /* Hack -- Count the high scores */
-        for (count = 0; count < MAX_HISCORES; count++)
-        {
-highscore_read(f, &the_score)
+scores[count].what[0]
-        }
-
-        /* Hack -- allow "fake" entry to be last */
-        if ((note == count) && score) count++;
-
-        /* Forget about the last entries */
-        if (count > to) count = to;
-
@@ -267 +257 @@
-        /* Show 5 per page, until "done" */
-        for (k = from, j = from, place = k+1; k < count; k += 5)
-        {
+                char out_val[160];
+                char tmp_val[160];
+
-                /* Clear screen */
-                Term_clear();
-
-                /* Title */
-                put_str(format("%s Hall of Fame", VERSION_NAME), 0, 26);
-
-
-                /* Indicate non-top scores */
-                if (k > 0)
-
-
-
-
+
-
+
-                /* Dump 5 entries */
-                for (n = 0; j < count && n < 5; place++, j++, n++)
-                {
-int pr, pc, clev, mlev, cdun, mdun
+const high_score *score = &scores[j]
-
+                        byte attr;
+
+                        int pr, pc, clev, mlev, cdun, mdun;
-                        cptr user, gold, when, aged;
-
-
-                        /* Hack -- indicate death in yellow */
-note) ? TERM_YELLOW
+highlight) ? TERM_L_GREEN
-
-
-                        /* Mega-Hack -- insert a "fake" record */
-                        if ((note == j) && score)
-                        {
-                                the_score = (*score);
-                                attr = TERM_L_GREEN;
-                                score = NULL;
-                                note = -1;
-                                j--;
-                        }
-
-                        /* Read a normal record */
-                        else
-                        {
-                                /* Read the proper record */
-                                if (!highscore_seek(f, j)) break;
-                                if (!highscore_read(f, &the_score)) break;
-                        }
-
-                        /* Extract the race/class */
-the_score.
-the_score.
+score->
+score->
-
-                        /* Extract the level info */
-the_score.
-the_score.
-the_score.
-the_score.
+score->
+score->
+score->
+score->
-
-                        /* Hack -- extract the gold and such */
-the_score.
-the_score.
-the_score.
-the_score.
+score->
+score->
+score->
+score->
-
-                        /* Clean up standard encoded form of "when" */
-                        if ((*when == '@') && strlen(when) == 9)
-                        {
-                                strnfmt(tmp_val, sizeof(tmp_val),
-                                        "%.4s-%.2s-%.2s",
-                                        when + 1, when + 5, when + 7);
-                                when = tmp_val;
-                        }
-
-                        /* Dump some info */
-                        strnfmt(out_val, sizeof(out_val),
-                                "%3d.%9s  %s the %s %s, Level %d",
-the_score.pts, the_score.
+score->pts, score->
-                                p_name + p_info[pr].name, c_name + c_info[pc].name,
-                                clev);
-
@@ -349 +314 @@
-                        /* Dump the first line */
-                        c_put_str(attr, out_val, n*4 + 2, 0);
-
-                        /* Another line of info */
-                        strnfmt(out_val, sizeof(out_val),
-                                "               Killed by %s on dungeon level %d",
-                                the_score.how, cdun);
-
-Hack -- some people die in the town
+Died where?
-                        if (!cdun)
-
-
-
-
-
+
+
+
-
-                        /* Append a "maximum level" */
-
+
+
-
-                        /* Dump the info */
-0
+15
-
+
+                        /* Clean up standard encoded form of "when" */
+                        if ((*when == '@') && strlen(when) == 9)
+                        {
+                                strnfmt(tmp_val, sizeof(tmp_val), "%.4s-%.2s-%.2s", when + 1, when + 5, when + 7);
+                                when = tmp_val;
+                        }
+
-                        /* And still another line of info */
-
-
-
-
+
+
-                }
-
-
@@ -385 +351 @@
-                if (ch == ESCAPE) break;
-        }
-
-        file_close(f);
-        return;
-}
-
-
-
-
-
-
-
-
-
+
-{
-display_scores_aux(from, to, -1, NULL
+WIPE(entry, high_score
-
-prt("[Press any key to exit.]", 23, 17);
-(void)inkey(
+/* Save the version */
+strnfmt(entry->what, sizeof(entry->what), "%s", VERSION_STRING
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
+
-/*
- * Enters a players name on a hi-score table, if "legal".
- *
- * Assumes "signals_ignore_tstp()" has been called.
- */
-errr
+void
-{
-        int j;
-        high_score the_score;
-
+        /* Cheaters are not scored */
+        for (j = OPT_SCORE; j < OPT_MAX; ++j)
+        {
+                if (!op_ptr->opt[j]) continue;
+
+                msg_print("Score not registered for cheaters.");
+                message_flush();
+                return;
+        }
+
-        /* Wizard-mode pre-empts scoring */
-        if (p_ptr->noscore & (NOSCORE_WIZARD | NOSCORE_DEBUG))
-        {
-                msg_print("Score not registered for wizards.");
-                message_flush();
-                score_idx = -1;
-                return (0);
-        }
-
-#ifndef SCORE_BORGS
-
-        /* Borg-mode pre-empts scoring */
-
+else 
-        {
-                msg_print("Score not registered for borgs.");
-                message_flush();
-                score_idx = -1;
-                return (0);
-        }
+
-#endif /* SCORE_BORGS */
-
-        /* Cheaters are not scored */
-        for (j = OPT_SCORE; j < OPT_MAX; ++j)
-        {
-                if (!op_ptr->opt[j]) continue;
-
-                msg_print("Score not registered for cheaters.");
-                message_flush();
-                score_idx = -1;
-                return (0);
-        }
-
-        /* Hack -- Interupted */
-
+else 
-        {
-                msg_print("Score not registered due to interruption.");
-                message_flush();
-                score_idx = -1;
-                return (0);
-        }
-
-        /* Hack -- Quitter */
-
+else 
-        {
-                msg_print("Score not registered due to quitting.");
-                message_flush();
-                score_idx = -1;
-                return (0);
-        }
-
+        /* Add a new entry to the score list, see where it went */
+        else
+        {
+                high_score entry;
+                high_score scores[MAX_HISCORES];
-
-
-
+
-
-
-
+
+
+
+
-
-        /* Calculate and save the points */
-        strnfmt(the_score.pts, sizeof(the_score.pts), "%9lu", (long)total_points());
-        the_score.pts[9] = '\0';
-
-        /* Save the current gold */
-        strnfmt(the_score.gold, sizeof(the_score.gold), "%9lu", (long)p_ptr->au);
-        the_score.gold[9] = '\0';
-
-        /* Save the current turn */
-        strnfmt(the_score.turns, sizeof(the_score.turns), "%9lu", (long)turn);
-        the_score.turns[9] = '\0';
-
-        /* Save the date in standard encoded form (9 chars) */
-        strftime(the_score.day, sizeof(the_score.day), "@%Y%m%d", localtime(death_time));
-
-        /* Save the player name (15 chars) */
-        strnfmt(the_score.who, sizeof(the_score.who), "%-.15s", op_ptr->full_name);
-
-        /* Save the player info XXX XXX XXX */
-        strnfmt(the_score.uid, sizeof(the_score.uid), "%7u", player_uid);
-        strnfmt(the_score.sex, sizeof(the_score.sex), "%c", (p_ptr->psex ? 'm' : 'f'));
-        strnfmt(the_score.p_r, sizeof(the_score.p_r), "%2d", p_ptr->prace);
-        strnfmt(the_score.p_c, sizeof(the_score.p_c), "%2d", p_ptr->pclass);
-
-        /* Save the level and such */
-        strnfmt(the_score.cur_lev, sizeof(the_score.cur_lev), "%3d", p_ptr->lev);
-        strnfmt(the_score.cur_dun, sizeof(the_score.cur_dun), "%3d", p_ptr->depth);
-        strnfmt(the_score.max_lev, sizeof(the_score.max_lev), "%3d", p_ptr->max_lev);
-        strnfmt(the_score.max_dun, sizeof(the_score.max_dun), "%3d", p_ptr->max_depth);
-
-        /* Save the cause of death (31 chars) */
-        strnfmt(the_score.how, sizeof(the_score.how), "%-.31s", p_ptr->died_from);
-
-        /* Add a new entry to the score list, see where it went */
-        score_idx = highscore_add(&the_score);
-
-        /* Success */
- (0)
+
-}
-
-
-
-/*
- * Enters a players name on a hi-score table, if "legal", and in any
- * case, displays some relevant portion of the high score list.
- *
- * Assumes "signals_ignore_tstp()" has been called.
- */
-void top_twenty(void)
-{
-        /* Clear screen */
-        Term_clear();
-
-        /* Player's score unavailable */
-        if (score_idx == -1)
-                display_scores_aux(0, 10, -1, NULL);
-
-        /* Hack -- Display the top fifteen scores */
-        else if (score_idx < 10)
-                display_scores_aux(0, 15, score_idx, NULL);
-
-        /* Display the scores surrounding the player */
-        else
-        {
-                display_scores_aux(0, 5, score_idx, NULL);
-                display_scores_aux(score_idx - 2, score_idx + 7, score_idx, NULL);
-        }
-}
-
-
-/*
- * Predict the players location, and display it.
- */
-void predict_score(void)
-{
-        ang_file *f;
-        char buf[1024];
-
-        int j;
-        high_score the_score;
-
-
-
+
-
-        /* Calculate and save the points */
-        strnfmt(the_score.pts, sizeof(the_score.pts), "%9lu", (long)total_points());
-
-
-
+
+
+
+
-
-        /* Save the current turn */
-        strnfmt(the_score.turns, sizeof(the_score.turns), "%9lu", (long)turn);
-
-        /* Hack -- no time needed */
-        my_strcpy(the_score.day, "TODAY", sizeof(the_score.day));
-
-        /* Save the player name (15 chars) */
-        strnfmt(the_score.who, sizeof(the_score.who), "%-.15s", op_ptr->full_name);
-
-        /* Save the player info XXX XXX XXX */
-        strnfmt(the_score.uid, sizeof(the_score.uid), "%7u", player_uid);
-        strnfmt(the_score.sex, sizeof(the_score.sex), "%c", (p_ptr->psex ? 'm' : 'f'));
-        strnfmt(the_score.p_r, sizeof(the_score.p_r), "%2d", p_ptr->prace);
-        strnfmt(the_score.p_c, sizeof(the_score.p_c), "%2d", p_ptr->pclass);
-
-        /* Save the level and such */
-        strnfmt(the_score.cur_lev, sizeof(the_score.cur_lev), "%3d", p_ptr->lev);
-        strnfmt(the_score.cur_dun, sizeof(the_score.cur_dun), "%3d", p_ptr->depth);
-        strnfmt(the_score.max_lev, sizeof(the_score.max_lev), "%3d", p_ptr->max_lev);
-        strnfmt(the_score.max_dun, sizeof(the_score.max_dun), "%3d", p_ptr->max_depth);
-
-        /* No cause of death */
-        my_strcpy(the_score.how, "nobody (yet!)", sizeof(the_score.how));
-
-
-
-        /* Open the highscore file */
-        path_build(buf, sizeof(buf), ANGBAND_DIR_APEX, "scores.raw");
-        f = file_open(buf, MODE_READ, -1);
-        if (!f) return;
-
-        /* See where the entry would be placed */
-        j = highscore_where(f, &the_score);
-
-        file_close(f);
-
-
-        /* Hack -- Display the top fifteen scores */
-        if (j < 10)
-        {
-0, 15, j, &the_score
+scores, 0, 15, j
-        }
-
-        /* Display some "useful" scores */
-        else
-        {
-0, 5, -1, NULL
-j - 2, j + 7, j, &the_score
+scores, 0, 5, -1
+scores, j - 2, j + 7, j
-        }
-}
-
-
+/*
+ * Show scores.
+ */
-void show_scores(void)
-{
+        high_score scores[MAX_HISCORES];
+
+        highscore_read(scores, N_ELEMENTS(scores));
+
-        screen_save();
-
-        /* Display the scores */
-        if (character_generated)
-                predict_score();
-        else
-0, MAX_HISCORES, -1, NULL
+scores, 0, MAX_HISCORES, -1
-
-        screen_load();
-
-        /* Hack - Flush it */
-        Term_fresh();
-}
-

death.c

@@ -324 +324 @@
-        (void)title;
-
-        screen_save();
-top_twenty
+show_scores
-        screen_load();
-}
-

externs.h

@@ -33 +33 @@
-extern char pf_result[];
-extern int pf_result_index;
-
-/* score.c */
-extern int score_idx;
-
-/* tables.c */
-extern const s16b ddd[9];
-extern const s16b ddx[10];
@@ -430 +427 @@
-extern errr do_randart(u32b randart_seed, bool full);
-
-/* score.c */
-errr
+void
-extern void show_scores(void);
-extern void display_scores(int from, int to);
-extern void top_twenty(void);
-extern void predict_score(void);
-
-

signals.c

@@ -121 +121 @@
-                /* Mark the savefile */
-                my_strcpy(p_ptr->died_from, "Abortion", sizeof(p_ptr->died_from));
-
-
-
-
-
-
-
+
-
-                /* Quit */
-                quit("interrupt");