summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2015-04-05 14:57:24 -0500
committerwushin <pasekei@gmail.com>2015-04-05 14:57:24 -0500
commited11ed5dbb597bebd5a08232326257063155d97f (patch)
tree92fdfddc02f92f8efd62de644a95dfb11e19e4ac
parent6f4699ff0c6400a2adc5e4008b2e289737f4a303 (diff)
downloadtmwa-ed11ed5dbb597bebd5a08232326257063155d97f.tar.gz
tmwa-ed11ed5dbb597bebd5a08232326257063155d97f.tar.bz2
tmwa-ed11ed5dbb597bebd5a08232326257063155d97f.tar.xz
tmwa-ed11ed5dbb597bebd5a08232326257063155d97f.zip
Remove Warp Debug Sprite Action
-rw-r--r--src/map/npc-parse.cpp5
-rw-r--r--src/map/npc.hpp1
-rwxr-xr-xtools/config.py1
3 files changed, 1 insertions, 6 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);
diff --git a/tools/config.py b/tools/config.py
index 8d1423b..88b7644 100755
--- a/tools/config.py
+++ b/tools/config.py
@@ -581,7 +581,6 @@ def build_config():
map_conf.opt('gm_log', RString, '{}')
map_conf.opt('log_file', RString, '{}')
- battle_conf.opt('warp_point_debug', bool, 'false')
battle_conf.opt('enemy_critical', bool, 'false')
battle_conf.opt('enemy_critical_rate', percent, '100')
battle_conf.opt('enemy_str', bool, 'true')