diff options
author | Wushin <pasekei@gmail.com> | 2015-04-13 21:10:10 -0500 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2015-04-13 21:10:10 -0500 |
commit | 3e589cd6fc0ef3a3958d1ace8f970c91e96b4b3d (patch) | |
tree | bcf31020d071857fc0e3a020eb92a5cac9db68e9 /src/map | |
parent | 28d26850fbf832c15c08ad09af4a6127386c36b8 (diff) | |
parent | ed11ed5dbb597bebd5a08232326257063155d97f (diff) | |
download | tmwa-3e589cd6fc0ef3a3958d1ace8f970c91e96b4b3d.tar.gz tmwa-3e589cd6fc0ef3a3958d1ace8f970c91e96b4b3d.tar.bz2 tmwa-3e589cd6fc0ef3a3958d1ace8f970c91e96b4b3d.tar.xz tmwa-3e589cd6fc0ef3a3958d1ace8f970c91e96b4b3d.zip |
Merge pull request #45 from wushin/deprecate-warp-debug-sprite
Remove Warp Debug Sprite Action
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/npc-parse.cpp | 5 | ||||
-rw-r--r-- | src/map/npc.hpp | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp index bdb212c..443a1e7 100644 --- a/src/map/npc-parse.cpp +++ b/src/map/npc-parse.cpp @@ -154,10 +154,7 @@ bool npc_load_warp(ast::npc::Warp& warp) nd->flag = 0; nd->name = warp.name.data; - if (!battle_config.warp_point_debug) - nd->npc_class = WARP_CLASS; - else - nd->npc_class = WARP_DEBUG_CLASS; + nd->npc_class = WARP_CLASS; nd->speed = 200_ms; nd->option = Opt0::ZERO; nd->opt1 = Opt1::ZERO; diff --git a/src/map/npc.hpp b/src/map/npc.hpp index c856a8c..b9f32b9 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -41,7 +41,6 @@ constexpr BlockId START_NPC_NUM = wrap<BlockId>(110000000); // TODO make these species, see npc_class in npc_data constexpr Species WARP_CLASS = wrap<Species>(45); constexpr Species FAKE_NPC_CLASS = wrap<Species>(127); -constexpr Species WARP_DEBUG_CLASS = wrap<Species>(722); constexpr Species INVISIBLE_CLASS = wrap<Species>(32767); int npc_event_dequeue(dumb_ptr<map_session_data> sd); |