From 7715db17d8d23e3786f7875ed6712f870973893e Mon Sep 17 00:00:00 2001
From: Cong <congusbongus@gmail.com>
Date: Sat, 4 May 2024 16:20:53 +1000
Subject: [PATCH] Small ammo box sprites, fix dog gun offset #712

---
 data/.wolf3d/N3Ddata.cdogscpn/ammo.json           |   2 +-
 .../N3Ddata.cdogscpn/graphics/ammo_clip.png       | Bin 588 -> 0 bytes
 .../N3Ddata.cdogscpn/graphics/small_feed_box.png  | Bin 0 -> 123 bytes
 data/.wolf3d/N3Ddata.cdogscpn/pickups.json        |   4 ++--
 graphics/chars/bodies/dog/data.json               |   3 ---
 src/cdogs/map_wolf.c                              |   3 +--
 6 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_clip.png
 create mode 100644 data/.wolf3d/N3Ddata.cdogscpn/graphics/small_feed_box.png

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/ammo.json b/data/.wolf3d/N3Ddata.cdogscpn/ammo.json
index ac6af1024..3634cca33 100644
--- a/data/.wolf3d/N3Ddata.cdogscpn/ammo.json
+++ b/data/.wolf3d/N3Ddata.cdogscpn/ammo.json
@@ -5,7 +5,7 @@
       "Name": "Feed",
       "Pic": {
         "Type": "Normal",
-        "Pic": "ammo_clip"
+        "Pic": "small_feed_box"
       },
       "Sound": "ammo_pickup",
       "Amount": 5,
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_clip.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_clip.png
deleted file mode 100644
index 780ec6e304ceac04a69117aa3764aa494ea66bb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000C4000FD1^@s6Vy#Wv0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iKcpfpf_4yb$WWbH5EXIMDionYs1;guFuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|=H{g6A|?JWDYS_3;J6>}?mh0_0sdx{sb+8-P&LcQ
zq>@4|zbb@Y5kLe%3?MEsQ=b#XG(5-GJ$!t<OYki3bAOJAQZO0d6NqP-Zdk+{#M7IW
z&Uv3W%F2>Ld`=uU=z_$LT$f#b<6Lss&oiS&HZxBgB^F9uEO#+08!GV>aZFJ)%J=77
zRyc2QR;zW^z9)ZSxS*{pbDic0Qdq<iL<o>kM+H?_NYJX0Vj@HPNe}<9;}^*#ldA$o
zjs?`9LUR1zfAG6ovp6~7CWVtg&x>t;i~^xupw+PL?_=9;odAJn;7aTGYfWJ0lk`SM
ziyZ;|+rY(jN0aw}%N=0oNtX=CkpeXR#Uk*2M&FbN25*7BHMh6+K29HiEOnK>0S*p<
zu@Yskd%U~1ySIPOwEO!3IZASnb0B>Q00009a7bBm000XU000XU0RWnu7ytkO2XskI
zMF-^r90@TN>S{X*0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbN
zHc3Q5R0!8q#<2~6Fc1X6F`~sMqr&fia;U=DIRFAiT4}+I+?T)(=TRP=QB{HN2AjX}
aP2Ma7G7d>in8T+40000<MNUMnLSTYs>F_WB

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/small_feed_box.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/small_feed_box.png
new file mode 100644
index 0000000000000000000000000000000000000000..8efb4773a9f184080ac443935204c143241f50d2
GIT binary patch
literal 123
zcmeAS@N?(olHy`uVBq!ia0vp^tU%1h!3HF`e}{MjDJM@C#}JO0xhFPqHW)Ct9yH!D
zJ$T0??TB5iu6NXy3g4)eKFG1}*@MQgr(IjL65{U_x<2#dn!~<VdChG9qyC4Je^oN~
X*-3Hvy2Y6RO=IwM^>bP0l+XkKV-qN4

literal 0
HcmV?d00001

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/pickups.json b/data/.wolf3d/N3Ddata.cdogscpn/pickups.json
index 288234b56..53235686d 100644
--- a/data/.wolf3d/N3Ddata.cdogscpn/pickups.json
+++ b/data/.wolf3d/N3Ddata.cdogscpn/pickups.json
@@ -160,10 +160,10 @@
       "Sound": "pickup_crown"
     },
     {
-      "Name": "ammo_clip",
+      "Name": "small_feed_box",
       "Pic": {
         "Type": "Normal",
-        "Pic": "ammo_clip"
+        "Pic": "small_feed_box"
       },
       "Effects": [{
         "Type": "Ammo",
diff --git a/graphics/chars/bodies/dog/data.json b/graphics/chars/bodies/dog/data.json
index a295c0a98..5cc112408 100644
--- a/graphics/chars/bodies/dog/data.json
+++ b/graphics/chars/bodies/dog/data.json
@@ -36,9 +36,6 @@
     "Dir": {
       "Head": [
         [0, -3], [4, -3], [6, 0], [6, 4], [0, 6], [-6, 4], [-7, 0], [-5, -3]
-      ],
-      "Gun": [
-        [7, -2], [6, 0], [4, 2], [-1, 4], [-6, 2], [-6, -1], [-3, -3], [0, -3]
       ]
     }
   }
diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c
index 442330e44..8b4b62911 100644
--- a/src/cdogs/map_wolf.c
+++ b/src/cdogs/map_wolf.c
@@ -2164,9 +2164,8 @@ static void LoadEntity(
 			MissionStaticTryAddItem(&m->u.Static, StrMapObject("shadow"), v);
 			break;
 		case CWMAPTYPE_N3D:
-
 			MissionStaticTryAddPickup(
-				&m->u.Static, StrPickupClass("ammo_clip"), v);
+				&m->u.Static, StrPickupClass("small_feed_box"), v);
 			break;
 		default:
 			MissionStaticTryAddItem(&m->u.Static, StrMapObject("bed"), v);