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 780ec6e30..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/ammo_clip.png and /dev/null differ 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 000000000..8efb4773a Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/small_feed_box.png differ 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);