summaryrefslogtreecommitdiff
path: root/src/cmd4.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-02-13 13:56:52 +0100
committerBardur Arantsson <bardur@scientician.net>2016-02-13 13:56:52 +0100
commit37eecbadf90ec9635f8c75ca36d32f6bdcee28c1 (patch)
tree127d39eb1487670bbfdec1c97133a4e210ae7f51 /src/cmd4.cc
parent4d237a87eb76eb4c6bcc5d8cbf7544a8f3184f30 (diff)
Remove insert_sort_quest()
Diffstat (limited to 'src/cmd4.cc')
-rw-r--r--src/cmd4.cc45
1 files changed, 5 insertions, 40 deletions
diff --git a/src/cmd4.cc b/src/cmd4.cc
index 9a8a3a65..9df90887 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -3690,51 +3690,16 @@ static void do_cmd_knowledge_corruptions(void)
/*
- * Helper function for do_cmd_knowledge_quests
- */
-static void insert_sort_quest(int *order, int *num, int q_idx)
-{
- int i, j;
-
- quest_type *q_ptr = &quest[q_idx];
-
- int level = q_ptr->level;
-
-
- /* Find the place */
- for (i = 0; i < *num; i++)
- {
- quest_type *q2_ptr = &quest[order[i]];
- int level2 = q2_ptr->level;
-
- if (level < level2) break;
- }
-
- /* Move the remaining items */
- for (j = *num - 1; j >= i; j--)
- {
- order[j + 1] = order[j];
- }
-
- /* Insert it */
- order[i] = q_idx;
- (*num)++;
-}
-
-
-/*
* Print quest status of all active quests
*/
static void do_cmd_knowledge_quests(void)
{
/* Figure out display order of quests */
- int order[MAX_Q_IDX] = { };
-
- int num = 0;
- for (int i = 0; i < MAX_Q_IDX; i++)
- {
- insert_sort_quest(order, &num, i);
- }
+ int order[MAX_Q_IDX];
+ std::iota(order, order + MAX_Q_IDX, 0); // Start with order of definition
+ std::sort(order, order + MAX_Q_IDX, [](int qi, int qj) -> bool {
+ return (quest[qi].level < quest[qj].level);
+ });
/* Write */
fmt::MemoryWriter w;