Small ammo box sprites, fix dog gun offset #712

cxong · May 4, 2024 · 7715db1 · 7715db1
1 parent 0c8a17a
commit 7715db1
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 8 deletions.
diff --git 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
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/small_feed_box.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/small_feed_box.png
diff --git 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
@@ -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
@@ -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);