From ed11ed5dbb597bebd5a08232326257063155d97f Mon Sep 17 00:00:00 2001 From: wushin Date: Sun, 5 Apr 2015 14:57:24 -0500 Subject: Remove Warp Debug Sprite Action --- src/map/npc-parse.cpp | 5 +---- src/map/npc.hpp | 1 - tools/config.py | 1 - 3 files changed, 1 insertion(+), 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(110000000); // TODO make these species, see npc_class in npc_data constexpr Species WARP_CLASS = wrap(45); constexpr Species FAKE_NPC_CLASS = wrap(127); -constexpr Species WARP_DEBUG_CLASS = wrap(722); constexpr Species INVISIBLE_CLASS = wrap(32767); int npc_event_dequeue(dumb_ptr 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') -- cgit v1.2.3-70-g09d2