diff options
60 files changed, 84 insertions, 85 deletions
diff --git a/src/birth.cc b/src/birth.cc index f358bd58..a49db966 100644 --- a/src/birth.cc +++ b/src/birth.cc @@ -2256,7 +2256,7 @@ static bool_ player_birth_aux_ask() plots[PLOT_OTHER] = QUEST_NULL; } - quest_random_init_hook(QUEST_RANDOM); + quest_random_init_hook(); /* Ok */ return (TRUE); diff --git a/src/bldg.cc b/src/bldg.cc index a1c38c9e..ae64efaf 100644 --- a/src/bldg.cc +++ b/src/bldg.cc @@ -738,7 +738,7 @@ static bool_ castle_quest(int y, int x) get_questinfo(plots[plot]); /* Add the hooks */ - quest[plots[plot]].init(plots[plot]); + quest[plots[plot]].init(); return (TRUE); } diff --git a/src/loadsave.cc b/src/loadsave.cc index f71a0e63..c31aeccc 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -2288,7 +2288,7 @@ static bool do_quests(ls_flag_t flag) // Initialize the quest if necessary if ((flag == ls_flag_t::LOAD) && (q->init != NULL)) { - q->init(i); + q->init(); } } diff --git a/src/q_betwen.cc b/src/q_betwen.cc index 541be9f9..ac4b665e 100644 --- a/src/q_betwen.cc +++ b/src/q_betwen.cc @@ -198,7 +198,7 @@ static bool_ quest_between_forbid_hook(void *, void *in_, void *) return (FALSE); } -bool_ quest_between_init_hook(int q) +bool_ quest_between_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_betwen.hpp b/src/q_betwen.hpp index d2fc08f0..1171d138 100644 --- a/src/q_betwen.hpp +++ b/src/q_betwen.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_between_init_hook(int q_idx); +bool_ quest_between_init_hook(); diff --git a/src/q_bounty.cc b/src/q_bounty.cc index 10331c4d..28cf71c5 100644 --- a/src/q_bounty.cc +++ b/src/q_bounty.cc @@ -78,7 +78,7 @@ static bool bounty_item_tester_hook(object_type const *o_ptr) return ((o_ptr->tval == TV_CORPSE) && (o_ptr->pval2 == bounty_quest_monster)); } -bool_ quest_bounty_init_hook(int dummy) +bool_ quest_bounty_init_hook() { return FALSE; } diff --git a/src/q_bounty.hpp b/src/q_bounty.hpp index 450ca8bd..960a391b 100644 --- a/src/q_bounty.hpp +++ b/src/q_bounty.hpp @@ -4,7 +4,7 @@ #include <string> -extern bool_ quest_bounty_init_hook(int q_idx); +extern bool_ quest_bounty_init_hook(); extern bool_ quest_bounty_drop_item(); extern bool_ quest_bounty_get_item(); extern std::string quest_bounty_describe(); diff --git a/src/q_dragons.cc b/src/q_dragons.cc index 8dc990d2..2c3faa69 100644 --- a/src/q_dragons.cc +++ b/src/q_dragons.cc @@ -152,7 +152,7 @@ static bool_ quest_dragons_finish_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_dragons_init_hook(int q_idx) +bool_ quest_dragons_init_hook() { if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_dragons.hpp b/src/q_dragons.hpp index f0aa50f2..af1bef20 100644 --- a/src/q_dragons.hpp +++ b/src/q_dragons.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_dragons_init_hook(int q_idx); +bool_ quest_dragons_init_hook(); diff --git a/src/q_eol.cc b/src/q_eol.cc index f27ce9df..1c141624 100644 --- a/src/q_eol.cc +++ b/src/q_eol.cc @@ -134,7 +134,7 @@ static bool_ quest_eol_finish_hook(void *, void *in_, void *) /* Continue the plot */ *(quest[q_idx].plot) = QUEST_NIRNAETH; - quest[*(quest[q_idx].plot)].init(*(quest[q_idx].plot)); + quest[*(quest[q_idx].plot)].init(); del_hook_new(HOOK_QUEST_FINISH, quest_eol_finish_hook); process_hooks_restart = TRUE; @@ -212,7 +212,7 @@ static bool_ quest_eol_stair_hook(void *, void *in_, void *) return FALSE; } -bool_ quest_eol_init_hook(int q) +bool_ quest_eol_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_eol.hpp b/src/q_eol.hpp index ab7f1274..6043b3ba 100644 --- a/src/q_eol.hpp +++ b/src/q_eol.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_eol_init_hook(int q_idx); +bool_ quest_eol_init_hook(); diff --git a/src/q_evil.cc b/src/q_evil.cc index d27e8986..cadaa171 100644 --- a/src/q_evil.cc +++ b/src/q_evil.cc @@ -121,7 +121,7 @@ static bool_ quest_evil_finish_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_evil_init_hook(int q_idx) +bool_ quest_evil_init_hook() { if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_evil.hpp b/src/q_evil.hpp index 06fb17e1..5346afe4 100644 --- a/src/q_evil.hpp +++ b/src/q_evil.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_evil_init_hook(int q_idx); +bool_ quest_evil_init_hook(); diff --git a/src/q_fireprof.cc b/src/q_fireprof.cc index 49fc0bdb..eb762fc4 100644 --- a/src/q_fireprof.cc +++ b/src/q_fireprof.cc @@ -559,7 +559,7 @@ static bool_ fireproof_gen_hook(void *, void *, void *) } } -bool_ quest_fireproof_init_hook(int q) +bool_ quest_fireproof_init_hook() { /* Only need hooks if the quest is unfinished. */ if ((cquest.status >= QUEST_STATUS_UNTAKEN) && diff --git a/src/q_fireprof.hpp b/src/q_fireprof.hpp index 48175ce9..7c897954 100644 --- a/src/q_fireprof.hpp +++ b/src/q_fireprof.hpp @@ -5,5 +5,5 @@ #include <string> extern void quest_fireproof_building(bool_ *paid, bool_ *recreate); -extern bool_ quest_fireproof_init_hook(int q); +extern bool_ quest_fireproof_init_hook(); extern std::string quest_fireproof_describe(); diff --git a/src/q_god.cc b/src/q_god.cc index 4aa06789..67371f46 100644 --- a/src/q_god.cc +++ b/src/q_god.cc @@ -1189,7 +1189,7 @@ static bool_ quest_god_birth_objects_hook(void *, void *, void *) return FALSE; } -bool_ quest_god_init_hook(int q) +bool_ quest_god_init_hook() { /* Only need hooks if the quest is unfinished. */ if ((cquest.status >= QUEST_STATUS_UNTAKEN) && diff --git a/src/q_god.hpp b/src/q_god.hpp index d5a993fa..9feef832 100644 --- a/src/q_god.hpp +++ b/src/q_god.hpp @@ -5,4 +5,4 @@ #include <string> std::string quest_god_describe(); -bool_ quest_god_init_hook(int q); +bool_ quest_god_init_hook(); diff --git a/src/q_haunted.cc b/src/q_haunted.cc index b72eb1ca..902778fc 100644 --- a/src/q_haunted.cc +++ b/src/q_haunted.cc @@ -150,7 +150,7 @@ static bool_ quest_haunted_finish_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_haunted_init_hook(int q_idx) +bool_ quest_haunted_init_hook() { if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_haunted.hpp b/src/q_haunted.hpp index 4f51bce3..9df36239 100644 --- a/src/q_haunted.hpp +++ b/src/q_haunted.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_haunted_init_hook(int q_idx); +bool_ quest_haunted_init_hook(); diff --git a/src/q_hobbit.cc b/src/q_hobbit.cc index 5a71711e..c32510ec 100644 --- a/src/q_hobbit.cc +++ b/src/q_hobbit.cc @@ -151,7 +151,7 @@ static bool_ quest_hobbit_chat_hook(void *, void *in_, void *) msg_print("maze and never been seen again! Could you find him for me?"); cquest.status = QUEST_STATUS_TAKEN; - quest[QUEST_HOBBIT].init(QUEST_HOBBIT); + quest[QUEST_HOBBIT].init(); } else if (cquest.status == QUEST_STATUS_COMPLETED) { @@ -198,7 +198,7 @@ static bool_ quest_hobbit_dump_hook(void *, void *in_, void *) return (FALSE); } -bool_ quest_hobbit_init_hook(int q_idx) +bool_ quest_hobbit_init_hook() { /* Get a level to place the hobbit */ if (!cquest.data[0]) diff --git a/src/q_hobbit.hpp b/src/q_hobbit.hpp index b1878748..283ba0dd 100644 --- a/src/q_hobbit.hpp +++ b/src/q_hobbit.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_hobbit_init_hook(int q_idx); +bool_ quest_hobbit_init_hook(); diff --git a/src/q_invas.cc b/src/q_invas.cc index 64483d28..f1cf43da 100644 --- a/src/q_invas.cc +++ b/src/q_invas.cc @@ -120,7 +120,7 @@ static bool_ quest_invasion_turn_hook(void *, void *, void *) cquest.status = QUEST_STATUS_TAKEN; - quest_invasion_init_hook(QUEST_INVASION); + quest_invasion_init_hook(); del_hook_new(HOOK_END_TURN, quest_invasion_turn_hook); process_hooks_restart = TRUE; @@ -207,7 +207,7 @@ static bool_ quest_invasion_stair_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_invasion_init_hook(int q_idx) +bool_ quest_invasion_init_hook() { add_hook_new(HOOK_END_TURN, quest_invasion_turn_hook, "invasion_turn", NULL); add_hook_new(HOOK_CHAR_DUMP, quest_invasion_dump_hook, "invasion_dump", NULL); diff --git a/src/q_invas.hpp b/src/q_invas.hpp index 87b8fc77..9993ac2b 100644 --- a/src/q_invas.hpp +++ b/src/q_invas.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_invasion_init_hook(int q_idx); +bool_ quest_invasion_init_hook(); diff --git a/src/q_library.cc b/src/q_library.cc index 483faba9..e47eee4f 100644 --- a/src/q_library.cc +++ b/src/q_library.cc @@ -501,7 +501,7 @@ std::string quest_library_describe() return w.str(); } -bool_ quest_library_init_hook(int q) +bool_ quest_library_init_hook() { /* Only need hooks if the quest is unfinished. */ if ((cquest.status >= QUEST_STATUS_UNTAKEN) && diff --git a/src/q_library.hpp b/src/q_library.hpp index 4c085472..467fac5e 100644 --- a/src/q_library.hpp +++ b/src/q_library.hpp @@ -4,7 +4,7 @@ #include <string> -bool_ quest_library_init_hook(int q); +bool_ quest_library_init_hook(); std::string quest_library_describe(); void quest_library_building(bool_ *paid, bool_ *recreate); void initialize_bookable_spells(); diff --git a/src/q_main.cc b/src/q_main.cc index 4cbf63ef..81b6ac85 100644 --- a/src/q_main.cc +++ b/src/q_main.cc @@ -93,7 +93,7 @@ static bool_ quest_morgoth_hook(void *, void *, void *) *(quest[QUEST_MORGOTH].plot) = QUEST_ULTRA_GOOD; else *(quest[QUEST_MORGOTH].plot) = QUEST_ULTRA_EVIL; - quest[*(quest[QUEST_MORGOTH].plot)].init(*(quest[QUEST_MORGOTH].plot)); + quest[*(quest[QUEST_MORGOTH].plot)].init(); } return (FALSE); } @@ -113,7 +113,7 @@ static bool_ quest_morgoth_dump_hook(void *, void *in_, void *) return (FALSE); } -bool_ quest_morgoth_init_hook(int q_idx) +bool_ quest_morgoth_init_hook() { if ((quest[QUEST_MORGOTH].status >= QUEST_STATUS_TAKEN) && (quest[QUEST_MORGOTH].status < QUEST_STATUS_FINISHED)) { @@ -140,7 +140,7 @@ static bool_ quest_sauron_hook(void *, void *, void *) del_hook_new(HOOK_MONSTER_DEATH, quest_sauron_hook); add_hook_new(HOOK_MONSTER_DEATH, quest_morgoth_hook, "morgort_death", NULL); *(quest[QUEST_SAURON].plot) = QUEST_MORGOTH; - quest_morgoth_init_hook(QUEST_MORGOTH); + quest_morgoth_init_hook(); process_hooks_restart = TRUE; } @@ -167,7 +167,7 @@ static bool_ quest_sauron_resurect_hook(void *, void *in_, void *) return FALSE; } -bool_ quest_sauron_init_hook(int q_idx) +bool_ quest_sauron_init_hook() { if ((quest[QUEST_SAURON].status >= QUEST_STATUS_TAKEN) && (quest[QUEST_SAURON].status < QUEST_STATUS_FINISHED)) { @@ -192,7 +192,7 @@ static bool_ quest_necro_hook(void *, void *, void *) quest[QUEST_NECRO].status = QUEST_STATUS_FINISHED; *(quest[QUEST_NECRO].plot) = QUEST_ONE; - quest[*(quest[QUEST_NECRO].plot)].init(*(quest[QUEST_NECRO].plot)); + quest[*(quest[QUEST_NECRO].plot)].init(); del_hook_new(HOOK_MONSTER_DEATH, quest_necro_hook); process_hooks_restart = TRUE; @@ -200,7 +200,7 @@ static bool_ quest_necro_hook(void *, void *, void *) return (FALSE); } -bool_ quest_necro_init_hook(int q_idx) +bool_ quest_necro_init_hook() { if ((quest[QUEST_NECRO].status >= QUEST_STATUS_TAKEN) && (quest[QUEST_NECRO].status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_main.hpp b/src/q_main.hpp index a88530fc..f677586e 100644 --- a/src/q_main.hpp +++ b/src/q_main.hpp @@ -2,6 +2,6 @@ #include "h-basic.h" -bool_ quest_necro_init_hook(int q_idx); -bool_ quest_sauron_init_hook(int q_idx); -bool_ quest_morgoth_init_hook(int q_idx); +bool_ quest_necro_init_hook(); +bool_ quest_sauron_init_hook(); +bool_ quest_morgoth_init_hook(); diff --git a/src/q_narsil.cc b/src/q_narsil.cc index a6c0eed3..4f358451 100644 --- a/src/q_narsil.cc +++ b/src/q_narsil.cc @@ -107,7 +107,7 @@ static bool_ quest_narsil_identify_hook(void *, void *in_, void *) return (FALSE); } -bool_ quest_narsil_init_hook(int q_idx) +bool_ quest_narsil_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_narsil.hpp b/src/q_narsil.hpp index b83e63cf..7dd6cd15 100644 --- a/src/q_narsil.hpp +++ b/src/q_narsil.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_narsil_init_hook(int q_idx); +bool_ quest_narsil_init_hook(); diff --git a/src/q_nazgul.cc b/src/q_nazgul.cc index 15a6a843..119c39d9 100644 --- a/src/q_nazgul.cc +++ b/src/q_nazgul.cc @@ -131,7 +131,7 @@ static bool_ quest_nazgul_death_hook(void *, void *in_, void *) return (FALSE); } -bool_ quest_nazgul_init_hook(int q_idx) +bool_ quest_nazgul_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_nazgul.hpp b/src/q_nazgul.hpp index 32e3237c..7efcd5a6 100644 --- a/src/q_nazgul.hpp +++ b/src/q_nazgul.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_nazgul_init_hook(int q_idx); +bool_ quest_nazgul_init_hook(); diff --git a/src/q_nirna.cc b/src/q_nirna.cc index a92ba6e4..7609bd06 100644 --- a/src/q_nirna.cc +++ b/src/q_nirna.cc @@ -112,7 +112,7 @@ static bool_ quest_nirnaeth_stair_hook(void *, void *, void *) return (FALSE); } -bool_ quest_nirnaeth_init_hook(int q_idx) +bool_ quest_nirnaeth_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_nirna.hpp b/src/q_nirna.hpp index 24a8759f..0076dcd2 100644 --- a/src/q_nirna.hpp +++ b/src/q_nirna.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_nirnaeth_init_hook(int q_idx); +bool_ quest_nirnaeth_init_hook(); diff --git a/src/q_one.cc b/src/q_one.cc index 3741e009..0c2753a0 100644 --- a/src/q_one.cc +++ b/src/q_one.cc @@ -82,7 +82,7 @@ static bool_ quest_one_move_hook(void *, void *in_, void *) /* Continue the plot */ cquest.status = QUEST_STATUS_TAKEN; - cquest.init(QUEST_ONE); + cquest.init(); return TRUE; } @@ -114,7 +114,7 @@ static bool_ quest_one_drop_hook(void *, void *in_, void *) cquest.status = QUEST_STATUS_FINISHED; *(quest[QUEST_ONE].plot) = QUEST_SAURON; quest[*(quest[QUEST_ONE].plot)].status = QUEST_STATUS_TAKEN; - quest[*(quest[QUEST_ONE].plot)].init(*(quest[QUEST_ONE].plot)); + quest[*(quest[QUEST_ONE].plot)].init(); return TRUE; } @@ -166,7 +166,7 @@ static bool_ quest_one_wield_hook(void *, void *in_, void *) cquest.status = QUEST_STATUS_FAILED_DONE; *(quest[QUEST_ONE].plot) = QUEST_SAURON; quest[*(quest[QUEST_ONE].plot)].status = QUEST_STATUS_TAKEN; - quest[*(quest[QUEST_ONE].plot)].init(*(quest[QUEST_ONE].plot)); + quest[*(quest[QUEST_ONE].plot)].init(); /* Ok lets reset the lives counter */ p_ptr->lives = 0; @@ -357,7 +357,7 @@ static bool_ quest_one_gen_hook(void *, void *, void *) return (FALSE); } -bool_ quest_one_init_hook(int q_idx) +bool_ quest_one_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_one.hpp b/src/q_one.hpp index a85a5733..0ad4e851 100644 --- a/src/q_one.hpp +++ b/src/q_one.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_one_init_hook(int q_idx); +bool_ quest_one_init_hook(); diff --git a/src/q_poison.cc b/src/q_poison.cc index b1205dca..45e7ede8 100644 --- a/src/q_poison.cc +++ b/src/q_poison.cc @@ -240,7 +240,7 @@ static bool_ quest_poison_drop_hook(void *, void *in_, void *) return FALSE; } -bool_ quest_poison_init_hook(int q_idx) +bool_ quest_poison_init_hook() { /* Get a place to place the poison */ if (!cquest.data[1]) diff --git a/src/q_poison.hpp b/src/q_poison.hpp index f8d97ace..0c054e0c 100644 --- a/src/q_poison.hpp +++ b/src/q_poison.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_poison_init_hook(int q_idx); +bool_ quest_poison_init_hook(); diff --git a/src/q_rand.cc b/src/q_rand.cc index e48fec98..1fed570e 100644 --- a/src/q_rand.cc +++ b/src/q_rand.cc @@ -646,7 +646,7 @@ std::string quest_random_describe() return w.str(); } -bool_ quest_random_init_hook(int q_idx) +bool_ quest_random_init_hook() { add_hook_new(HOOK_MONSTER_DEATH, quest_random_death_hook, "rand_death", NULL); add_hook_new(HOOK_NEW_LEVEL, quest_random_turn_hook, "rand_new_lvl", NULL); diff --git a/src/q_rand.hpp b/src/q_rand.hpp index 0aa9ccc8..02961c8c 100644 --- a/src/q_rand.hpp +++ b/src/q_rand.hpp @@ -6,5 +6,5 @@ void initialize_random_quests(int n); bool_ is_randhero(int level); -bool_ quest_random_init_hook(int q_idx); +bool_ quest_random_init_hook(); std::string quest_random_describe(); diff --git a/src/q_shroom.cc b/src/q_shroom.cc index 89b576d8..4fd1e066 100644 --- a/src/q_shroom.cc +++ b/src/q_shroom.cc @@ -270,7 +270,7 @@ static bool_ quest_shroom_chat_hook(void *, void *in_, void *) msg_print("to the west of Bree? Please try to not harm my dogs. They are so lovely..."); cquest.status = QUEST_STATUS_TAKEN; - quest[QUEST_SHROOM].init(QUEST_SHROOM); + quest[QUEST_SHROOM].init(); } else { @@ -280,7 +280,7 @@ static bool_ quest_shroom_chat_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_shroom_init_hook(int q_idx) +bool_ quest_shroom_init_hook() { /* Get a number of 'shrooms */ if (!cquest.data[1]) diff --git a/src/q_shroom.hpp b/src/q_shroom.hpp index 6124775b..f729e29e 100644 --- a/src/q_shroom.hpp +++ b/src/q_shroom.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_shroom_init_hook(int q_idx); +bool_ quest_shroom_init_hook(); diff --git a/src/q_spider.cc b/src/q_spider.cc index 07531b96..9fcf37c3 100644 --- a/src/q_spider.cc +++ b/src/q_spider.cc @@ -107,7 +107,7 @@ static bool_ quest_spider_finish_hook(void *, void *in_, void *) /* Continue the plot */ *(quest[q_idx].plot) = QUEST_POISON; - quest[*(quest[q_idx].plot)].init(*(quest[q_idx].plot)); + quest[*(quest[q_idx].plot)].init(); del_hook_new(HOOK_QUEST_FINISH, quest_spider_finish_hook); process_hooks_restart = TRUE; @@ -115,7 +115,7 @@ static bool_ quest_spider_finish_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_spider_init_hook(int q_idx) +bool_ quest_spider_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_spider.hpp b/src/q_spider.hpp index e17cb523..d76cccf1 100644 --- a/src/q_spider.hpp +++ b/src/q_spider.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_spider_init_hook(int q_idx); +bool_ quest_spider_init_hook(); diff --git a/src/q_thief.cc b/src/q_thief.cc index 35ecdfbb..a1ec76c6 100644 --- a/src/q_thief.cc +++ b/src/q_thief.cc @@ -160,7 +160,7 @@ static bool_ quest_thieves_finish_hook(void *, void *in_, void *) else *(quest[q_idx].plot) = QUEST_WIGHT; } - quest[*(quest[q_idx].plot)].init(*(quest[q_idx].plot)); + quest[*(quest[q_idx].plot)].init(); del_hook_new(HOOK_QUEST_FINISH, quest_thieves_finish_hook); process_hooks_restart = TRUE; @@ -181,7 +181,7 @@ static bool_ quest_thieves_feeling_hook(void *, void *, void *) return TRUE; } -bool_ quest_thieves_init_hook(int q_idx) +bool_ quest_thieves_init_hook() { if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_thief.hpp b/src/q_thief.hpp index 48e5dc8d..1ff74fac 100644 --- a/src/q_thief.hpp +++ b/src/q_thief.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_thieves_init_hook(int q_idx); +bool_ quest_thieves_init_hook(); diff --git a/src/q_thrain.cc b/src/q_thrain.cc index 05def27a..0f490bf0 100644 --- a/src/q_thrain.cc +++ b/src/q_thrain.cc @@ -194,7 +194,7 @@ static bool_ quest_thrain_feeling_hook(void *, void *, void *) cmsg_format(TERM_YELLOW, "You hear someone shouting under the torture."); cquest.status = QUEST_STATUS_TAKEN; - cquest.init(QUEST_THRAIN); + cquest.init(); return (FALSE); } @@ -235,7 +235,7 @@ static bool_ quest_thrain_turn_hook(void *, void *, void *) return (FALSE); } -bool_ quest_thrain_init_hook(int q) +bool_ quest_thrain_init_hook() { if (!cquest.data[0]) { diff --git a/src/q_thrain.hpp b/src/q_thrain.hpp index 830da016..ab69102f 100644 --- a/src/q_thrain.hpp +++ b/src/q_thrain.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -extern bool_ quest_thrain_init_hook(int q_idx); +extern bool_ quest_thrain_init_hook(); diff --git a/src/q_troll.cc b/src/q_troll.cc index fce3ad49..626897f0 100644 --- a/src/q_troll.cc +++ b/src/q_troll.cc @@ -125,7 +125,7 @@ static bool_ quest_troll_finish_hook(void *, void *in_, void *) /* Continue the plot */ *(quest[q_idx].plot) = QUEST_NAZGUL; - quest[*(quest[q_idx].plot)].init(*(quest[q_idx].plot)); + quest[*(quest[q_idx].plot)].init(); del_hook_new(HOOK_QUEST_FINISH, quest_troll_finish_hook); process_hooks_restart = TRUE; @@ -182,7 +182,7 @@ static bool_ quest_troll_death_hook(void *, void *in_, void *) return FALSE; } -bool_ quest_troll_init_hook(int q_idx) +bool_ quest_troll_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_troll.hpp b/src/q_troll.hpp index 140fe0b2..4564ace2 100644 --- a/src/q_troll.hpp +++ b/src/q_troll.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_troll_init_hook(int q_idx); +bool_ quest_troll_init_hook(); diff --git a/src/q_ultrae.cc b/src/q_ultrae.cc index d42b9c6f..de0d5f16 100644 --- a/src/q_ultrae.cc +++ b/src/q_ultrae.cc @@ -2,7 +2,7 @@ #define cquest (quest[QUEST_ULTRA_EVIL]) -bool_ quest_ultra_evil_init_hook(int q) +bool_ quest_ultra_evil_init_hook() { - return (FALSE); + return FALSE; } diff --git a/src/q_ultrae.hpp b/src/q_ultrae.hpp index 5b08127b..42584387 100644 --- a/src/q_ultrae.hpp +++ b/src/q_ultrae.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_ultra_evil_init_hook(int q_idx); +bool_ quest_ultra_evil_init_hook(); diff --git a/src/q_ultrag.cc b/src/q_ultrag.cc index a5b56f3f..9e250146 100644 --- a/src/q_ultrag.cc +++ b/src/q_ultrag.cc @@ -80,7 +80,7 @@ static bool_ quest_ultra_good_move_hook(void *, void *in_, void *) /* Continue the plot */ cquest.status = QUEST_STATUS_TAKEN; - cquest.init(QUEST_ULTRA_GOOD); + cquest.init(); } options->quick_messages = old_quick_messages; @@ -275,7 +275,7 @@ static bool_ quest_ultra_good_dump_hook(void *, void *in_, void *) } -bool_ quest_ultra_good_init_hook(int q) +bool_ quest_ultra_good_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_ultrag.hpp b/src/q_ultrag.hpp index 0064b878..32c4a1ae 100644 --- a/src/q_ultrag.hpp +++ b/src/q_ultrag.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_ultra_good_init_hook(int q_idx); +bool_ quest_ultra_good_init_hook(); diff --git a/src/q_wight.cc b/src/q_wight.cc index 7d459dee..9583365b 100644 --- a/src/q_wight.cc +++ b/src/q_wight.cc @@ -167,7 +167,7 @@ static bool_ quest_wight_finish_hook(void *, void *in_, void *) /* Continue the plot */ *(quest[q_idx].plot) = QUEST_NAZGUL; - quest[*(quest[q_idx].plot)].init(*(quest[q_idx].plot)); + quest[*(quest[q_idx].plot)].init(); del_hook_new(HOOK_QUEST_FINISH, quest_wight_finish_hook); process_hooks_restart = TRUE; @@ -175,7 +175,7 @@ static bool_ quest_wight_finish_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_wight_init_hook(int q_idx) +bool_ quest_wight_init_hook() { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_wight.hpp b/src/q_wight.hpp index 1252e4fa..d3c0a912 100644 --- a/src/q_wight.hpp +++ b/src/q_wight.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_wight_init_hook(int q_idx); +bool_ quest_wight_init_hook(); diff --git a/src/q_wolves.cc b/src/q_wolves.cc index 46a66935..3d83f414 100644 --- a/src/q_wolves.cc +++ b/src/q_wolves.cc @@ -134,7 +134,7 @@ static bool_ quest_wolves_finish_hook(void *, void *in_, void *) return TRUE; } -bool_ quest_wolves_init_hook(int q_idx) +bool_ quest_wolves_init_hook() { if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { diff --git a/src/q_wolves.hpp b/src/q_wolves.hpp index 59a83c56..27d9b0f3 100644 --- a/src/q_wolves.hpp +++ b/src/q_wolves.hpp @@ -2,4 +2,4 @@ #include "h-basic.h" -bool_ quest_wolves_init_hook(int q_idx); +bool_ quest_wolves_init_hook(); diff --git a/src/quest.cc b/src/quest.cc index a1aee67f..181b46d2 100644 --- a/src/quest.cc +++ b/src/quest.cc @@ -6,12 +6,11 @@ void init_hooks_quests() { - for (std::size_t i = 0; i < MAX_Q_IDX; i++) + for (auto const &q: quest) { - if (quest[i].init != NULL) + if (q.init) { - quest[i].init(i); + q.init(); } } } - diff --git a/src/quest_type.hpp b/src/quest_type.hpp index 19d9cc87..267ba4d2 100644 --- a/src/quest_type.hpp +++ b/src/quest_type.hpp @@ -21,9 +21,9 @@ struct quest_type s16b *plot; /* Which plot does it belongs to? */ - bool_ (*init)(int q); /* Function that takes care of generating hardcoded quests */ + bool_ (*init)(); /* Function that takes care of generating hardcoded quests */ - s32b data[9]; /* Various datas used by the quests */ + s32b data[9]; /* Various datas used by the quests */ std::string (*gen_desc)(); /* Function for generating description. */ }; diff --git a/src/wizard2.cc b/src/wizard2.cc index a4f697bd..295bf5ca 100644 --- a/src/wizard2.cc +++ b/src/wizard2.cc @@ -1680,7 +1680,7 @@ void do_cmd_debug() { quest[command_arg].status = QUEST_STATUS_TAKEN; *(quest[command_arg].plot) = command_arg; - quest[command_arg].init(command_arg); + quest[command_arg].init(); break; } break; |