diff options
Diffstat (limited to 'src/map/mob.hpp')
| -rw-r--r-- | src/map/mob.hpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/map/mob.hpp b/src/map/mob.hpp index d0cc07a..6d87228 100644 --- a/src/map/mob.hpp +++ b/src/map/mob.hpp @@ -20,24 +20,25 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. -#include "fwd.hpp" - #include "mob.t.hpp" -#include "../generic/fwd.hpp" +#include "fwd.hpp" + #include "../generic/enum.hpp" #include "../generic/random.t.hpp" #include "../net/timer.t.hpp" #include "battle.t.hpp" -#include "clif.t.hpp" +#include "../mmo/clif.t.hpp" #include "map.hpp" -#include "skill.t.hpp" +#include "../mmo/skill.t.hpp" namespace tmwa { +namespace map +{ #define ENGLISH_NAME stringish<MobName>("--en--"_s) #define JAPANESE_NAME stringish<MobName>("--ja--"_s) #define MOB_THIS_MAP stringish<MapName>("this"_s) @@ -72,7 +73,7 @@ struct mob_db_ Race race; LevelElement element; MobMode mode; - int speed, adelay, amotion, dmotion; + interval_t speed, adelay, amotion, dmotion; int mutations_nr, mutation_power; struct { @@ -127,7 +128,7 @@ int mob_deleteslave(dumb_ptr<mob_data> md); int mob_counttargeted(dumb_ptr<mob_data> md, dumb_ptr<block_list> src, ATK target_lv); -int mob_warp(dumb_ptr<mob_data> md, map_local *m, int x, int y, BeingRemoveWhy type); +int mob_warp(dumb_ptr<mob_data> md, Option<Borrowed<map_local>> m, int x, int y, BeingRemoveWhy type); int mobskill_use(dumb_ptr<mob_data> md, tick_t tick, MobSkillCondition event); int mobskill_event(dumb_ptr<mob_data> md, BF flag); @@ -136,4 +137,5 @@ void mobskill_castend_pos(TimerData *tid, tick_t tick, BlockId id); int mob_summonslave(dumb_ptr<mob_data> md2, int *value, int amount, int flag); void mob_reload(void); +} // namespace map } // namespace tmwa |