diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-14 22:25:07 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-15 19:41:53 -0800 |
| commit | 4bd7eeec09629d3c0f900d42c899fe23c69e07b6 (patch) | |
| tree | 4fbbfa45d9538cab7e1062f2c927297bb93ada0a /src/map/map.cpp | |
| parent | 069f39e8a1ebee3e4a4ce8302d0099842876782b (diff) | |
| download | tmwa-4bd7eeec09629d3c0f900d42c899fe23c69e07b6.tar.gz tmwa-4bd7eeec09629d3c0f900d42c899fe23c69e07b6.tar.bz2 tmwa-4bd7eeec09629d3c0f900d42c899fe23c69e07b6.tar.xz tmwa-4bd7eeec09629d3c0f900d42c899fe23c69e07b6.zip | |
Prepare to trim skills
Diffstat (limited to 'src/map/map.cpp')
| -rw-r--r-- | src/map/map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index a6b8b08..dbdafdc 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -688,7 +688,7 @@ int map_delobjectnofree(int id, int type) { fprintf(stderr, "Incorrect type: expected %d, got %d\n", type, object[id]->type); - *((char *) 0) = 0; // break for backtrace + abort(); } map_delblock(object[id]); @@ -1115,7 +1115,7 @@ int map_quit(struct map_session_data *sd) skill_castcancel(&sd->bl, 0); // 詠唱を中断する skill_stop_dancing(&sd->bl, 1); // ダンス/演奏中断 - if (sd->sc_data && sd->sc_data[SC_BERSERK].timer != -1) //バーサーク中の終了はHPを100に + if (sd->sc_data[SC_BERSERK].timer != -1) //バーサーク中の終了はHPを100に sd->status.hp = 100; skill_status_change_clear(&sd->bl, 1); // ステータス異常を解除する |