From 87218e07b2bc89593eae1cb4abe859cd1a7eaa0f Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 23 May 2013 15:14:29 -0700 Subject: Make block_list a base class --- src/map/battle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/battle.cpp') 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? -- cgit v1.2.3-70-g09d2