summaryrefslogtreecommitdiff
path: root/src/map/clif.cpp
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2015-06-09 01:06:22 -0500
committermekolat <mekolat@users.noreply.github.com>2016-04-15 11:44:49 -0400
commit506a41d6926405b2753894f0b40130b4077828b3 (patch)
tree401fd473a23d80dcdcbd56d0c89f6587a46f878c /src/map/clif.cpp
parenta8640e1df61c06faf6edb89c5c4b9f025c0dff33 (diff)
downloadtmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.gz
tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.bz2
tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.xz
tmwa-506a41d6926405b2753894f0b40130b4077828b3.zip
Remove old Magic
Diffstat (limited to 'src/map/clif.cpp')
-rw-r--r--src/map/clif.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index a2a2a33..33de3e6 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -62,8 +62,6 @@
#include "globals.hpp"
#include "intif.hpp"
#include "itemdb.hpp"
-#include "magic.hpp"
-#include "magic-stmt.hpp"
#include "map.hpp"
#include "map_conf.hpp"
#include "npc.hpp"
@@ -2641,12 +2639,6 @@ void clif_getareachar(dumb_ptr<block_list> bl, dumb_ptr<map_session_data> sd)
case BL::ITEM:
clif_getareachar_item(sd, bl->is_item());
break;
- case BL::SPELL:
- // spell objects are not visible
- // (at least, I *think* that's what this code is for)
- // in any case, this is not a behavior change, just silencing
- // the below warning
- break;
default:
if (battle_config.error_log)
PRINTF("get area char ??? %d\n"_fmt,
@@ -3792,7 +3784,6 @@ RecvResult clif_parse_GetCharNameRequest(Session *s, dumb_ptr<map_session_data>
send_fpacket<0x0095, 30>(s, fixed_95);
}
break;
- // case BL::SPELL
default:
if (battle_config.error_log)
PRINTF("clif_parse_GetCharNameRequest : bad type %d (%d)\n"_fmt,
@@ -4273,8 +4264,8 @@ RecvResult clif_parse_TakeItem(Session *s, dumb_ptr<map_session_data> sd)
|| abs(sd->bl_y - fitem->bl_y) >= 2)
return rv; // too far away to pick up
- if (sd->state.shroud_active && sd->state.shroud_disappears_on_pickup)
- magic::magic_unshroud(sd);
+// if (sd->state.shroud_active && sd->state.shroud_disappears_on_pickup)
+// magic_unshroud(sd);
pc_takeitem(sd, fitem);