diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2013-03-25 13:48:04 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2013-09-27 14:46:41 +0200 |
| commit | 3f0417be80c0cd9bae1d2aa9a81bc0bcc9ef4841 (patch) | |
| tree | 24f35798388c200ac15f38414835cd0e0e53fc40 | |
| parent | d777849861081855a9fdc3a6c71ef9510884190e (diff) | |
Remove monster_mind
| -rw-r--r-- | src/loadsave.c | 11 | ||||
| -rw-r--r-- | src/monster2.c | 7 | ||||
| -rw-r--r-- | src/types.h | 18 |
3 files changed, 0 insertions, 36 deletions
diff --git a/src/loadsave.c b/src/loadsave.c index 1800298d..85c05260 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -1554,17 +1554,6 @@ static void do_monster(monster_type *m_ptr, int flag) do_byte(&m_ptr->blow[i].d_side, flag); } - /* Mind */ - tmp = (m_ptr->mind) ? TRUE : FALSE; - do_byte((byte*)&tmp, flag); - if (tmp) - { - if (flag == LS_LOAD) - { - MAKE(m_ptr->mind, monster_mind); - } - } - /* Special race */ tmp = (m_ptr->sr_ptr) ? TRUE : FALSE; do_byte((byte*)&tmp, flag); diff --git a/src/monster2.c b/src/monster2.c index 4c4df91d..9d79f73a 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -495,8 +495,6 @@ void delete_monster_idx(int i) /* Delete mind & special race if needed */ if (m_ptr->sr_ptr) KILL(m_ptr->sr_ptr, monster_race); - if (m_ptr->mind) - KILL(m_ptr->mind, monster_mind); /* Wipe the Monster */ m_ptr = WIPE(m_ptr, monster_type); @@ -619,8 +617,6 @@ static void compact_monsters_aux(int i1, int i2) /* Delete mind & special race if needed */ if (m_list[i1].sr_ptr) KILL(m_list[i1].sr_ptr, monster_race); - if (m_list[i1].mind) - KILL(m_list[i1].mind, monster_mind); /* Wipe the hole */ m_ptr = WIPE(&m_list[i1], monster_type); @@ -743,8 +739,6 @@ void wipe_m_list(void) /* Delete mind & special race if needed */ if (m_ptr->sr_ptr) KILL(m_ptr->sr_ptr, monster_race); - if (m_ptr->mind) - KILL(m_ptr->mind, monster_mind); /* Wipe the Monster */ @@ -2360,7 +2354,6 @@ s16b place_monster_one(int y, int x, int r_idx, int ego, bool_ slp, int status) /* No special, no mind */ m_ptr->sr_ptr = place_monster_one_race; - m_ptr->mind = NULL; /* Place the monster at the location */ m_ptr->fy = y; diff --git a/src/types.h b/src/types.h index f0cdec0f..2339a9ce 100644 --- a/src/types.h +++ b/src/types.h @@ -836,22 +836,6 @@ struct object_type /* - * Monster mind, use for skills and such - */ -typedef struct monster_mind monster_mind; -struct monster_mind -{ - /* - * Without this, bcc can't compile because it does not - * allow empty structure. Remove this when you add some - * variables to this structure. -- Kusunose - */ - byte dummy; -}; - - - -/* * Monster information, for a specific monster. * * Note: fy, fx constrain dungeon size to 256x256 @@ -910,8 +894,6 @@ struct monster_type s16b possessor; /* Is it under the control of a possessor ? */ monster_race *sr_ptr; /* Does it have a specific race(not in r_info) */ - - monster_mind *mind; /* Does it have a mind? */ }; |