summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd4.c4
-rw-r--r--src/quest.pkg6
-rw-r--r--src/tables.c30
-rw-r--r--src/types.h2
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
@@ -3601,7 +3601,6 @@ quest_type quest[MAX_Q_IDX] =
{
{
FALSE,
- FALSE,
"",
{
"",
@@ -3625,7 +3624,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"Dol Guldur",
{
"The forest of Mirkwood is a very dangerous place to go, mainly due to",
@@ -3649,7 +3647,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"Sauron",
{
"It is time to take the battle to Morgoth. But, before you can",
@@ -3673,7 +3670,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"Morgoth",
{
"Your final quest is the ultimate quest that has always been",
@@ -3699,7 +3695,6 @@ quest_type quest[MAX_Q_IDX] =
/* Bree plot */
{
FALSE,
- FALSE,
"Thieves!",
{
"There are thieves robbing my people! They live in a small",
@@ -3724,7 +3719,6 @@ quest_type quest[MAX_Q_IDX] =
{
FALSE,
- TRUE,
"Random Quest",
{
"",
@@ -3749,7 +3743,6 @@ quest_type quest[MAX_Q_IDX] =
{
FALSE,
- FALSE,
"Lost Hobbit",
{
"Merton Proudfoot, a young hobbit, seems to have disappeared.",
@@ -3774,7 +3767,6 @@ quest_type quest[MAX_Q_IDX] =
{
FALSE,
- FALSE,
"The Dark Horseman",
{
"A dark-cloaked horseman has been spotted several times in town.",
@@ -3799,7 +3791,6 @@ quest_type quest[MAX_Q_IDX] =
{
FALSE,
- FALSE,
"The Trolls Glade",
{
"A group of Forest Trolls settled in an abandoned forest in the",
@@ -3824,7 +3815,6 @@ quest_type quest[MAX_Q_IDX] =
{
FALSE,
- FALSE,
"The Wight Grave",
{
"The Barrow-Downs hides many mysteries and dangers.",
@@ -3850,7 +3840,6 @@ quest_type quest[MAX_Q_IDX] =
/* Lorien plot */
{
FALSE,
- FALSE,
"Spiders of Mirkwood",
{
"Powers lurk deep within Mirkwood. Spiders have blocked the",
@@ -3874,7 +3863,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"Poisoned Water",
{
"A curse has beset Lothlorien. All trees along the shorelines of Nimrodel",
@@ -3899,7 +3887,6 @@ quest_type quest[MAX_Q_IDX] =
/* Other quests */
{
FALSE,
- FALSE,
"The Broken Sword",
{
"You have found Narsil, a broken sword. It is said that the sword that",
@@ -3924,7 +3911,6 @@ quest_type quest[MAX_Q_IDX] =
/* Gondolin plot */
{
FALSE,
- FALSE,
"Eol the Dark Elf",
{
"We have disturbing tidings. Eol the Dark Elf has come seeking his kin in",
@@ -3948,7 +3934,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"Nirnaeth Arnoediad",
{
"The fortunes of war in the north turn against us.",
@@ -3972,7 +3957,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"Invasion of Gondolin",
{
"Morgoth is upon us! Dragons and Balrogs have poured over secret",
@@ -3997,7 +3981,6 @@ quest_type quest[MAX_Q_IDX] =
/* Minas Anor Plot*/
{
FALSE,
- FALSE,
"The Last Alliance",
{
"The armies of Morgoth are closing in on the last remaining strongholds",
@@ -4021,7 +4004,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"The One Ring",
{
"Find the One Ring, then bring it to Mount Doom, in Mordor, to drop",
@@ -4046,7 +4028,6 @@ quest_type quest[MAX_Q_IDX] =
{
FALSE,
- FALSE,
"Mushroom supplies",
{
"Farmer Maggot asked you to bring him back his mushrooms.",
@@ -4071,7 +4052,6 @@ quest_type quest[MAX_Q_IDX] =
{
FALSE,
- FALSE,
"The prisoner of Dol Guldur",
{
"You keep hearing distress cries in the dark tower of",
@@ -4097,7 +4077,6 @@ quest_type quest[MAX_Q_IDX] =
/* The 2 ultra endings go here */
{
FALSE,
- FALSE,
"Falling Toward Apotheosis",
{
"You must enter the Void where Melkor spirit lurks to destroy",
@@ -4121,7 +4100,6 @@ quest_type quest[MAX_Q_IDX] =
},
{
FALSE,
- FALSE,
"Falling Toward Apotheosis",
{
"You must now launch an onslaught on Valinor itself to eliminate",
@@ -4146,7 +4124,6 @@ quest_type quest[MAX_Q_IDX] =
/* More Lorien */
{
FALSE,
- FALSE,
"Wolves!",
{
"There are wolves pestering my people! They gather in a hut",
@@ -4171,7 +4148,6 @@ quest_type quest[MAX_Q_IDX] =
/* More Gondolin */
{
FALSE,
- FALSE,
"Dragons!",
{
"There are dragons pestering my people! They gather in a",
@@ -4196,7 +4172,6 @@ quest_type quest[MAX_Q_IDX] =
/* More Minas Anor */
{
FALSE,
- FALSE,
"Haunted House!",
{
"There are undead pestering my people! They gather in a hut",
@@ -4221,7 +4196,6 @@ quest_type quest[MAX_Q_IDX] =
/* Khazad-Dum Plot*/
{
FALSE,
- FALSE,
"Evil!",
{
"We have burrowed too deep, and let out some creatures of",
@@ -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 */