From 6eb63903cd839b2c0dbf3acefceee4ba7b07b0f8 Mon Sep 17 00:00:00 2001 From: mekolat Date: Thu, 24 Mar 2016 14:32:09 -0400 Subject: remove MESSAGE npc subtype --- src/map/map.hpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/map/map.hpp') diff --git a/src/map/map.hpp b/src/map/map.hpp index 1fd86d1..2919d04 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -342,12 +342,10 @@ private: dumb_ptr as_script(); dumb_ptr as_shop(); dumb_ptr as_warp(); - dumb_ptr as_message(); public: dumb_ptr is_script(); dumb_ptr is_shop(); dumb_ptr is_warp(); - dumb_ptr is_message(); }; class npc_data_script : public npc_data @@ -402,12 +400,6 @@ public: } warp; }; -class npc_data_message : public npc_data -{ -public: - RString message; -}; - constexpr int MOB_XP_BONUS_BASE = 1024; constexpr int MOB_XP_BONUS_SHIFT = 10; @@ -684,12 +676,10 @@ inline dumb_ptr block_list::is_item() { return bl_type == BL::IT inline dumb_ptr npc_data::as_script() { return dumb_ptr(static_cast(this)) ; } inline dumb_ptr npc_data::as_shop() { return dumb_ptr(static_cast(this)) ; } inline dumb_ptr npc_data::as_warp() { return dumb_ptr(static_cast(this)) ; } -inline dumb_ptr npc_data::as_message() { return dumb_ptr(static_cast(this)) ; } inline dumb_ptr npc_data::is_script() { return npc_subtype == NpcSubtype::SCRIPT ? as_script() : nullptr ; } inline dumb_ptr npc_data::is_shop() { return npc_subtype == NpcSubtype::SHOP ? as_shop() : nullptr ; } inline dumb_ptr npc_data::is_warp() { return npc_subtype == NpcSubtype::WARP ? as_warp() : nullptr ; } -inline dumb_ptr npc_data::is_message() { return npc_subtype == NpcSubtype::MESSAGE ? as_message() : nullptr ; } void map_addmap(MapName mapname); void map_delmap(MapName mapname); -- cgit v1.2.3-60-g2f50