From b48ab7cb7d115ebcfd4bc2bde8169fb8c49400d3 Mon Sep 17 00:00:00 2001 From: Cong Date: Tue, 8 Oct 2024 22:52:42 +1100 Subject: [PATCH] Fix build --- data/.wolf3d/N3Ddata.cdogscpn/character_classes.json | 1 + src/cdogs/actor_pickup.c | 2 +- src/cdogs/actor_pickup.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json b/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json index e6c8405be..b39589123 100644 --- a/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json +++ b/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json @@ -88,6 +88,7 @@ "Body": "camel", "Sounds": "camel", "Footsteps": "camel", + "BloodColor": "00000000", "HasHair": false, "HasFacehair": false, "HasHat": false, diff --git a/src/cdogs/actor_pickup.c b/src/cdogs/actor_pickup.c index 620d3df07..f2066bd9f 100644 --- a/src/cdogs/actor_pickup.c +++ b/src/cdogs/actor_pickup.c @@ -70,7 +70,7 @@ void PickupPickup(TActor *a, Pickup *p, const bool pickupAll) } bool PickupApplyEffect( TActor *a, const Pickup *p, const PickupEffect *pe, const bool force, - char **sound) + const char **sound) { bool canPickup = false; GameEvent e; diff --git a/src/cdogs/actor_pickup.h b/src/cdogs/actor_pickup.h index a79e55e01..5ff6b10ba 100644 --- a/src/cdogs/actor_pickup.h +++ b/src/cdogs/actor_pickup.h @@ -33,4 +33,4 @@ void PickupPickup(TActor *a, Pickup *p, const bool pickupAll); bool PickupApplyEffect( TActor *a, const Pickup *p, const PickupEffect *pe, const bool force, - char **sound); + const char **sound);