diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 15:14:29 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 19:12:48 -0700 |
| commit | 87218e07b2bc89593eae1cb4abe859cd1a7eaa0f (patch) | |
| tree | 9343c393ddebf50086fdef8f2a4668781e4afd66 /src/map/battle.cpp | |
| parent | 543e4b419239f37321bc5a224d56773d1fe6ebfe (diff) | |
| download | tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.gz tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.bz2 tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.xz tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.zip | |
Make block_list a base class
Diffstat (limited to 'src/map/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index e0706dc..34d4751 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -785,7 +785,7 @@ int battle_get_party_id(struct block_list *bl) struct mob_data *md = (struct mob_data *) bl; if (md->master_id > 0) return -md->master_id; - return -md->bl.bl_id; + return -md->bl_id; } return 0; } @@ -1396,7 +1396,7 @@ struct Damage battle_calc_pc_weapon_attack(struct block_list *src, div_ = 1; // single attack { - damage = damage2 = battle_get_baseatk(&sd->bl); //damega,damega2初登場、base_atkの取得 + damage = damage2 = battle_get_baseatk(sd); //damega,damega2初登場、base_atkの取得 } if (sd->attackrange > 2) { // [fate] ranged weapon? |