From 87218e07b2bc89593eae1cb4abe859cd1a7eaa0f Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 23 May 2013 15:14:29 -0700
Subject: Make block_list a base class

---
 src/map/party.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/map/party.cpp')

diff --git a/src/map/party.cpp b/src/map/party.cpp
index c2dc5c4..c1488c0 100644
--- a/src/map/party.cpp
+++ b/src/map/party.cpp
@@ -644,11 +644,11 @@ void party_send_xyhp_timer_sub(struct party *p)
         if ((sd = p->member[i].sd) != NULL)
         {
             // 座標通知
-            if (sd->party_x != sd->bl.bl_x || sd->party_y != sd->bl.bl_y)
+            if (sd->party_x != sd->bl_x || sd->party_y != sd->bl_y)
             {
                 clif_party_xy(p, sd);
-                sd->party_x = sd->bl.bl_x;
-                sd->party_y = sd->bl.bl_y;
+                sd->party_x = sd->bl_x;
+                sd->party_y = sd->bl_y;
             }
             // ＨＰ通知
             if (sd->party_hp != sd->status.hp)
@@ -712,12 +712,12 @@ int party_exp_share(struct party *p, int mapid, int base_exp, int job_exp)
     nullpo_ret(p);
 
     for (i = c = 0; i < MAX_PARTY; i++)
-        if ((sd = p->member[i].sd) != NULL && sd->bl.bl_m == mapid)
+        if ((sd = p->member[i].sd) != NULL && sd->bl_m == mapid)
             c++;
     if (c == 0)
         return 0;
     for (i = 0; i < MAX_PARTY; i++)
-        if ((sd = p->member[i].sd) != NULL && sd->bl.bl_m == mapid)
+        if ((sd = p->member[i].sd) != NULL && sd->bl_m == mapid)
             pc_gainexp_reason(sd, base_exp / c + 1, job_exp / c + 1,
             PC_GAINEXP_REASON::SHARING);
     return 0;
@@ -740,23 +740,23 @@ void party_foreachsamemap(std::function<void(struct block_list *)> func,
     if ((p = party_search(sd->status.party_id)) == NULL)
         return;
 
-    x0 = sd->bl.bl_x - AREA_SIZE;
-    y0 = sd->bl.bl_y - AREA_SIZE;
-    x1 = sd->bl.bl_x + AREA_SIZE;
-    y1 = sd->bl.bl_y + AREA_SIZE;
+    x0 = sd->bl_x - AREA_SIZE;
+    y0 = sd->bl_y - AREA_SIZE;
+    x1 = sd->bl_x + AREA_SIZE;
+    y1 = sd->bl_y + AREA_SIZE;
 
     for (i = 0; i < MAX_PARTY; i++)
     {
         struct party_member *m = &p->member[i];
         if (m->sd != NULL)
         {
-            if (sd->bl.bl_m != m->sd->bl.bl_m)
+            if (sd->bl_m != m->sd->bl_m)
                 continue;
             if (type != 0 &&
-                (m->sd->bl.bl_x < x0 || m->sd->bl.bl_y < y0 ||
-                 m->sd->bl.bl_x > x1 || m->sd->bl.bl_y > y1))
+                (m->sd->bl_x < x0 || m->sd->bl_y < y0 ||
+                 m->sd->bl_x > x1 || m->sd->bl_y > y1))
                 continue;
-            list[blockcount++] = &m->sd->bl;
+            list[blockcount++] = m->sd;
         }
     }
 
-- 
cgit v1.2.3-60-g2f50