From 07a11792fc5f385130b36da44aa71c32cb96c514 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 9 Apr 2012 16:33:20 +0200 Subject: Remove unnecessary dynamic_desc field from quest_type --- src/cmd4.c | 4 ++-- src/quest.pkg | 6 ------ src/tables.c | 30 ------------------------------ src/types.h | 2 -- 4 files changed, 2 insertions(+), 40 deletions(-) diff --git a/src/cmd4.c b/src/cmd4.c index 2bc7b7e8..d0099360 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -4149,8 +4149,8 @@ static void do_cmd_knowledge_quests(void) { i = order[z]; - /* Dynamic quests */ - if (quest[i].dynamic_desc) + /* Dynamic descriptions */ + if (quest[i].gen_desc != NULL) { if (!quest[i].gen_desc(fff)) { diff --git a/src/quest.pkg b/src/quest.pkg index 5021659e..aed3569a 100644 --- a/src/quest.pkg +++ b/src/quest.pkg @@ -89,12 +89,6 @@ struct quest_type */ bool silent; - /** @structvar dynamic_desc - * @brief Boolean - * @note Do we need to ask a function to get the description ? - */ - bool dynamic_desc; - /** @structvar status * @brief Number * @note Is the quest taken, completed, finished? diff --git a/src/tables.c b/src/tables.c index a3470ede..18a9329a 100644 --- a/src/tables.c +++ b/src/tables.c @@ -3600,7 +3600,6 @@ power_type powers_type[POWER_MAX] = quest_type quest[MAX_Q_IDX] = { { - FALSE, FALSE, "", { @@ -3624,7 +3623,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "Dol Guldur", { @@ -3648,7 +3646,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "Sauron", { @@ -3672,7 +3669,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "Morgoth", { @@ -3698,7 +3694,6 @@ quest_type quest[MAX_Q_IDX] = /* Bree plot */ { - FALSE, FALSE, "Thieves!", { @@ -3724,7 +3719,6 @@ quest_type quest[MAX_Q_IDX] = { FALSE, - TRUE, "Random Quest", { "", @@ -3748,7 +3742,6 @@ quest_type quest[MAX_Q_IDX] = }, { - FALSE, FALSE, "Lost Hobbit", { @@ -3773,7 +3766,6 @@ quest_type quest[MAX_Q_IDX] = }, { - FALSE, FALSE, "The Dark Horseman", { @@ -3798,7 +3790,6 @@ quest_type quest[MAX_Q_IDX] = }, { - FALSE, FALSE, "The Trolls Glade", { @@ -3823,7 +3814,6 @@ quest_type quest[MAX_Q_IDX] = }, { - FALSE, FALSE, "The Wight Grave", { @@ -3849,7 +3839,6 @@ quest_type quest[MAX_Q_IDX] = /* Lorien plot */ { - FALSE, FALSE, "Spiders of Mirkwood", { @@ -3873,7 +3862,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "Poisoned Water", { @@ -3898,7 +3886,6 @@ quest_type quest[MAX_Q_IDX] = }, /* Other quests */ { - FALSE, FALSE, "The Broken Sword", { @@ -3923,7 +3910,6 @@ quest_type quest[MAX_Q_IDX] = }, /* Gondolin plot */ { - FALSE, FALSE, "Eol the Dark Elf", { @@ -3947,7 +3933,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "Nirnaeth Arnoediad", { @@ -3971,7 +3956,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "Invasion of Gondolin", { @@ -3996,7 +3980,6 @@ quest_type quest[MAX_Q_IDX] = }, /* Minas Anor Plot*/ { - FALSE, FALSE, "The Last Alliance", { @@ -4020,7 +4003,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "The One Ring", { @@ -4045,7 +4027,6 @@ quest_type quest[MAX_Q_IDX] = }, { - FALSE, FALSE, "Mushroom supplies", { @@ -4070,7 +4051,6 @@ quest_type quest[MAX_Q_IDX] = }, { - FALSE, FALSE, "The prisoner of Dol Guldur", { @@ -4096,7 +4076,6 @@ quest_type quest[MAX_Q_IDX] = /* The 2 ultra endings go here */ { - FALSE, FALSE, "Falling Toward Apotheosis", { @@ -4120,7 +4099,6 @@ quest_type quest[MAX_Q_IDX] = NULL, }, { - FALSE, FALSE, "Falling Toward Apotheosis", { @@ -4145,7 +4123,6 @@ quest_type quest[MAX_Q_IDX] = }, /* More Lorien */ { - FALSE, FALSE, "Wolves!", { @@ -4170,7 +4147,6 @@ quest_type quest[MAX_Q_IDX] = }, /* More Gondolin */ { - FALSE, FALSE, "Dragons!", { @@ -4195,7 +4171,6 @@ quest_type quest[MAX_Q_IDX] = }, /* More Minas Anor */ { - FALSE, FALSE, "Haunted House!", { @@ -4220,7 +4195,6 @@ quest_type quest[MAX_Q_IDX] = }, /* Khazad-Dum Plot*/ { - FALSE, FALSE, "Evil!", { @@ -4246,7 +4220,6 @@ quest_type quest[MAX_Q_IDX] = /* Bounty */ { FALSE, - TRUE, "Bounty quest", { "", /* dynamic desc */ @@ -4261,7 +4234,6 @@ quest_type quest[MAX_Q_IDX] = /* Fireproofing */ { FALSE, - TRUE, "Old Mages quest", { "", /* dynamic desc */ @@ -4276,7 +4248,6 @@ quest_type quest[MAX_Q_IDX] = /* Library */ { FALSE, - TRUE, "Library quest", { "", /* dynamic desc */ @@ -4291,7 +4262,6 @@ quest_type quest[MAX_Q_IDX] = /* God quest */ { FALSE, - TRUE, "God quest", { "", /* dynamic desc */ diff --git a/src/types.h b/src/types.h index c594f79b..7b6019ae 100644 --- a/src/types.h +++ b/src/types.h @@ -2238,8 +2238,6 @@ struct quest_type { bool_ silent; - bool_ dynamic_desc; /* Do we need to ask a function to get the description ? */ - char name[40]; /* Quest name */ char desc[10][80]; /* Quest desc */ -- cgit v1.2.3