diff options
| author | wushin <pasekei@gmail.com> | 2015-06-09 01:06:22 -0500 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:44:49 -0400 |
| commit | 506a41d6926405b2753894f0b40130b4077828b3 (patch) | |
| tree | 401fd473a23d80dcdcbd56d0c89f6587a46f878c /src/map/pc.cpp | |
| parent | a8640e1df61c06faf6edb89c5c4b9f025c0dff33 (diff) | |
| download | tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.gz tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.bz2 tmwa-506a41d6926405b2753894f0b40130b4077828b3.tar.xz tmwa-506a41d6926405b2753894f0b40130b4077828b3.zip | |
Remove old Magic
Diffstat (limited to 'src/map/pc.cpp')
| -rw-r--r-- | src/map/pc.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp index c4c3ad9..7f7512c 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -54,7 +54,6 @@ #include "globals.hpp" #include "intif.hpp" #include "itemdb.hpp" -#include "magic-stmt.hpp" #include "map.hpp" #include "map_conf.hpp" #include "npc.hpp" @@ -742,7 +741,7 @@ int pc_authok(AccountId id, int login_id2, ClientVersion client_version, // The above is no longer accurate now that we use <chrono>, but // I'm still not reverting this. // -o11c - sd->cast_tick = tick; // + pc_readglobalreg (sd, "MAGIC_CAST_TICK"_s); + //sd->cast_tick = tick; // + pc_readglobalreg (sd, "MAGIC_CAST_TICK"_s); // アカウント変数の送信要求 intif_request_accountreg(sd); @@ -3272,8 +3271,8 @@ int pc_damage(dumb_ptr<block_list> src, dumb_ptr<map_session_data> sd, clif_updatestatus(sd, SP::HP); pc_calcstatus(sd, 0); // [Fate] Reset magic - sd->cast_tick = gettick(); - magic::magic_stop_completely(sd); + //sd->cast_tick = gettick(); + //magic_stop_completely(sd); if (battle_config.death_penalty_type > 0 && sd->status.base_level >= 20) { @@ -4992,7 +4991,7 @@ void do_init_pc(void) void pc_cleanup(dumb_ptr<map_session_data> sd) { - magic::magic_stop_completely(sd); + //magic_stop_completely(sd); } void pc_invisibility(dumb_ptr<map_session_data> sd, int enabled) |