From 7137a17f77fd3b6c3bbcefa2d621b3a11f161679 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Remove monster memory Instead of having monster memory, the player automatically knows everything about all monsters from the start. --- src/monster2.hpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/monster2.hpp') diff --git a/src/monster2.hpp b/src/monster2.hpp index 84f79e36..5ef5eaf9 100644 --- a/src/monster2.hpp +++ b/src/monster2.hpp @@ -23,8 +23,6 @@ extern errr get_mon_num_prep(void); extern s16b get_mon_num(int level); extern void monster_desc(char *desc, monster_type *m_ptr, int mode); extern void monster_race_desc(char *desc, int r_idx, int ego); -extern void lore_do_probe(int m_idx); -extern void lore_treasure(int m_idx, int num_item, int num_gold); extern void update_mon(int m_idx, bool_ full); extern void update_monsters(bool_ full); extern void monster_carry(monster_type *m_ptr, int m_idx, object_type *q_ptr); -- cgit v1.2.1 From a40e1d524849e22edf2fb65b5c2fedbe47a59b81 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove redundant "extern" on function declarations --- src/monster2.hpp | 76 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'src/monster2.hpp') diff --git a/src/monster2.hpp b/src/monster2.hpp index 5ef5eaf9..552331ef 100644 --- a/src/monster2.hpp +++ b/src/monster2.hpp @@ -6,45 +6,45 @@ #include "object_type_fwd.hpp" #include -extern s32b monster_exp(s16b level); -extern void monster_set_level(int m_idx, int level); -extern s32b modify_aux(s32b a, s32b b, char mod); -extern void monster_msg_simple(cptr s); -extern bool_ mego_ok(monster_race const *r_ptr, int ego); -extern void monster_check_experience(int m_idx, bool_ silent); -extern void monster_gain_exp(int m_idx, u32b exp, bool_ silent); -extern std::shared_ptr race_info_idx(int r_idx, int ego); -extern void delete_monster_idx(int i); -extern void delete_monster(int y, int x); -extern void compact_monsters(int size); -extern void wipe_m_list(void); -extern s16b m_pop(void); -extern errr get_mon_num_prep(void); -extern s16b get_mon_num(int level); -extern void monster_desc(char *desc, monster_type *m_ptr, int mode); -extern void monster_race_desc(char *desc, int r_idx, int ego); -extern void update_mon(int m_idx, bool_ full); -extern void update_monsters(bool_ full); -extern void monster_carry(monster_type *m_ptr, int m_idx, object_type *q_ptr); +s32b monster_exp(s16b level); +void monster_set_level(int m_idx, int level); +s32b modify_aux(s32b a, s32b b, char mod); +void monster_msg_simple(cptr s); +bool_ mego_ok(monster_race const *r_ptr, int ego); +void monster_check_experience(int m_idx, bool_ silent); +void monster_gain_exp(int m_idx, u32b exp, bool_ silent); +std::shared_ptr race_info_idx(int r_idx, int ego); +void delete_monster_idx(int i); +void delete_monster(int y, int x); +void compact_monsters(int size); +void wipe_m_list(void); +s16b m_pop(void); +errr get_mon_num_prep(void); +s16b get_mon_num(int level); +void monster_desc(char *desc, monster_type *m_ptr, int mode); +void monster_race_desc(char *desc, int r_idx, int ego); +void update_mon(int m_idx, bool_ full); +void update_monsters(bool_ full); +void monster_carry(monster_type *m_ptr, int m_idx, object_type *q_ptr); extern bool_ bypass_r_ptr_max_num ; -extern bool_ place_monster_aux(int y, int x, int r_idx, bool_ slp, bool_ grp, int status); -extern bool_ place_monster(int y, int x, bool_ slp, bool_ grp); -extern bool_ alloc_horde(int y, int x); -extern bool_ alloc_monster(int dis, bool_ slp); +bool_ place_monster_aux(int y, int x, int r_idx, bool_ slp, bool_ grp, int status); +bool_ place_monster(int y, int x, bool_ slp, bool_ grp); +bool_ alloc_horde(int y, int x); +bool_ alloc_monster(int dis, bool_ slp); extern int summon_specific_level; -extern bool_ summon_specific(int y1, int x1, int lev, int type); -extern void monster_swap(int y1, int x1, int y2, int x2); -extern bool_ multiply_monster(int m_idx, bool_ charm, bool_ clone); +bool_ summon_specific(int y1, int x1, int lev, int type); +void monster_swap(int y1, int x1, int y2, int x2); +bool_ multiply_monster(int m_idx, bool_ charm, bool_ clone); extern bool_ hack_message_pain_may_silent; -extern void message_pain(int m_idx, int dam); -extern void update_smart_learn(int m_idx, int what); -extern bool_ summon_specific_friendly(int y1, int x1, int lev, int type, bool_ Group_ok); +void message_pain(int m_idx, int dam); +void update_smart_learn(int m_idx, int what); +bool_ summon_specific_friendly(int y1, int x1, int lev, int type, bool_ Group_ok); extern bool_ place_monster_one_no_drop; -extern s16b place_monster_one(int y, int x, int r_idx, int ego, bool_ slp, int status); -extern s16b player_place(int y, int x); -extern void monster_drop_carried_objects(monster_type *m_ptr); -extern bool_ monster_dungeon(int r_idx); -extern bool_ monster_quest(int r_idx); -extern void set_mon_num_hook(void); -extern void set_mon_num2_hook(int y, int x); -extern bool_ monster_can_cross_terrain(byte feat, std::shared_ptr r_ptr); +s16b place_monster_one(int y, int x, int r_idx, int ego, bool_ slp, int status); +s16b player_place(int y, int x); +void monster_drop_carried_objects(monster_type *m_ptr); +bool_ monster_dungeon(int r_idx); +bool_ monster_quest(int r_idx); +void set_mon_num_hook(void); +void set_mon_num2_hook(int y, int x); +bool_ monster_can_cross_terrain(byte feat, std::shared_ptr r_ptr); -- cgit v1.2.1 From 6a35e3de332df186eab39c3b67506882409a3ca2 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove redundant (void) parameters and return value casts --- src/monster2.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/monster2.hpp') diff --git a/src/monster2.hpp b/src/monster2.hpp index 552331ef..ddd0b6bc 100644 --- a/src/monster2.hpp +++ b/src/monster2.hpp @@ -17,9 +17,9 @@ std::shared_ptr race_info_idx(int r_idx, int ego); void delete_monster_idx(int i); void delete_monster(int y, int x); void compact_monsters(int size); -void wipe_m_list(void); -s16b m_pop(void); -errr get_mon_num_prep(void); +void wipe_m_list(); +s16b m_pop(); +errr get_mon_num_prep(); s16b get_mon_num(int level); void monster_desc(char *desc, monster_type *m_ptr, int mode); void monster_race_desc(char *desc, int r_idx, int ego); @@ -45,6 +45,6 @@ s16b player_place(int y, int x); void monster_drop_carried_objects(monster_type *m_ptr); bool_ monster_dungeon(int r_idx); bool_ monster_quest(int r_idx); -void set_mon_num_hook(void); +void set_mon_num_hook(); void set_mon_num2_hook(int y, int x); bool_ monster_can_cross_terrain(byte feat, std::shared_ptr r_ptr); -- cgit v1.2.1