From d8bb5848f7a39025ae9d0f43fd04fa2b8884349a Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sat, 2 Mar 2019 09:55:40 +0800
Subject: [PATCH] Fixed the return FID in NPC armor appearance mod.

---
 artifacts/mods/gl_npcarmor.int | Bin 4238 -> 4280 bytes
 artifacts/mods/gl_npcarmor.ssl |   3 ++-
 sfall/stdafx.h                 |   1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/artifacts/mods/gl_npcarmor.int b/artifacts/mods/gl_npcarmor.int
index 45aa8ae4cbdeb20e9614876cfefffcc6358e065c..bc267a74304facd16a09c2879d40ae6c1b72cf1b 100644
GIT binary patch
delta 385
zcmeBE+@Uz(qT~Vw2)F~GU?lgtjjyzsSl2bMG-yx$z$CWWfO!+!BxW`yu8zr1I8_;~
zCL3_8`!hDM9$*A%X)pxQTpb{ifuX_Z0OSAv|Nl3bH0U=z0f~KJXm9}03``J}Fg5)D
z;o?ROj+0}!+;gWj?4JNK^G;J4NIysy_cRd6z}R5aa01L?XfSS&2C=wB8YCL@8>B#N
zu>46diy1B-gd`7k7Xt$WBSLnv0Jl72%VY!Y-P{WrQy^yY7)<`g-Oi{pxsIoiam6Iw
zNXB)Oqj*~x`zAl&ZBXLlYG47|!3FXq*fdKh9~=g}Et7afCr{_IVO%iz3SU2?+2j;{
bA0`2@$(#7Y8T%%431l+=Yhali$0Y#(cFky{

delta 258
zcmdm?*rzz*qGTBZ1l)m8Fp|4v<11|@=9UJQ$rm^!HXAT+Vq@ZpoBWDXmC<Cf0GGLJ
z+yO?A+6JQojQ{`t|KDKJpbryid^&l7fW+hlT)O%>4f`j6)ZJ++gQ?)o0jpzdFlsmf
zW-&AvH%Nn6T(2ho;gV<6m@LCB%cwEgid&vBYO(;A`s7CLDcog^DG*gWY?Bpu+8LQ9
zui$B9tedRG8_C!*xrMitF=a9rUjq~GgULO7AdPGI0vXFD|Ksat<eA*Z@599ZX7U~W
SaK@C$CIXp^S0>LBkOBau@JbZ`

diff --git a/artifacts/mods/gl_npcarmor.ssl b/artifacts/mods/gl_npcarmor.ssl
index 548a2485..d16ede07 100644
--- a/artifacts/mods/gl_npcarmor.ssl
+++ b/artifacts/mods/gl_npcarmor.ssl
@@ -118,7 +118,8 @@ procedure adjustfid_handler begin
       armor := critter_inven_obj(dude_obj, INVEN_TYPE_WORN);
       fid := check_armor_change(dude_obj, armor, armor != 0);
       if (fid != -1) then begin
-         set_sfall_return(fid);
+         variable weapAnim := get_sfall_arg bwand 0xF000;
+         set_sfall_return(fid bwand 0xFFFF0FFF bwor weapAnim);
       end
    end
 end
diff --git a/sfall/stdafx.h b/sfall/stdafx.h
index a1555b3a..faaaaf1c 100644
--- a/sfall/stdafx.h
+++ b/sfall/stdafx.h
@@ -6,5 +6,6 @@
 #include <memory>
 #include <vector>
 #include <unordered_map>
+#include <map>
 #include <string>
 #include <Windows.h>