Merge pull request #91 from mekolat/version

check manaplus version

1 files changed, 28 insertions, 2 deletions

diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index b7c047c..897244e 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -826,6 +826,21 @@ void clif_mob007b(dumb_ptr<mob_data> md, Buffer& buf)
  *------------------------------------------
  */
 static
+void clif_0225_being_move3_sub(dumb_ptr<block_list> bl, const Buffer& buf)
+{
+    nullpo_retv(bl);
+    dumb_ptr<map_session_data> sd = bl->is_player();
+
+    if (sd->sess != nullptr)
+    {
+        if(sd->client_version >= 3)
+        {
+            send_buffer(sd->sess, buf);
+        }
+    }
+}
+
+static
 int clif_0225_being_move3(dumb_ptr<mob_data> md)
 {
     Packet_Head<0x0225> head_225;
@@ -844,7 +859,12 @@ int clif_0225_being_move3(dumb_ptr<mob_data> md)
     }
 
     Buffer buf = create_vpacket<0x0225, 14, 1>(head_225, repeat_225);
-    clif_send(buf, md, SendWho::AREA);
+
+    map_foreachinarea(std::bind(clif_0225_being_move3_sub, ph::_1, buf),
+            md->bl_m,
+            md->bl_x - AREA_SIZE, md->bl_y - AREA_SIZE,
+            md->bl_x + AREA_SIZE, md->bl_y + AREA_SIZE,
+            BL::PC);
 
     return 0;
 }
@@ -2654,7 +2674,7 @@ void clif_skillinfoblock(dumb_ptr<map_session_data> sd)
     std::vector<Packet_Repeat<0x010f>> repeat_10f;
     for (SkillID i : erange(SkillID(), MAX_SKILL))
     {
-        if (sd->status.skill[i].lv && sd->tmw_version >= 1)
+        if (sd->status.skill[i].lv && sd->client_version >= 1)
         {
             Packet_Repeat<0x010f> info;
             // [Fate] Version 1 and later don't crash because of bad skill IDs anymore
@@ -4705,6 +4725,9 @@ void clif_sendallquest(dumb_ptr<map_session_data> sd)
     if (!sd->sess)
         return;
 
+    if(sd->client_version < 2)
+        return;
+
     Session *s = sd->sess;
     Packet_Head<0x0215> head_215;
     std::vector<Packet_Repeat<0x0215>> repeat_215;
@@ -4739,6 +4762,9 @@ void clif_sendquest(dumb_ptr<map_session_data> sd, QuestId questid, int value)
     if (!sd->sess)
         return;
 
+    if(sd->client_version < 2)
+        return;
+
     Session *s = sd->sess;
 
     Packet_Fixed<0x0214> fixed;