summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAldrik Ramaekers <aldrik@amftech.nl>2023-10-29 16:53:33 +0100
committerAldrik Ramaekers <aldrik@amftech.nl>2023-10-29 16:53:33 +0100
commit04024078984bbaf84f34352061da2a224ecdb0b0 (patch)
treee576cdd0451e06d96c71131c551b1bc32d633f0d /include
parent61c5fb1e253f31d2faa3a0fc970ce4e18f32b205 (diff)
fix throwable collision
Diffstat (limited to 'include')
-rw-r--r--include/audio.h1
-rw-r--r--include/guns.h4
-rw-r--r--include/throwables.h1
3 files changed, 4 insertions, 2 deletions
diff --git a/include/audio.h b/include/audio.h
index 4354e6e..22e0a99 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -11,6 +11,7 @@
#define CHANNEL_IMPACT 2
#define CHANNEL_RELOAD 3
#define CHANNEL_EXPLODE 4
+#define CHANNEL_COLLECT 5
typedef enum t_audio_event_type {
EVENT_SHOOT,
diff --git a/include/guns.h b/include/guns.h
index 2ea0d1e..52f4a10 100644
--- a/include/guns.h
+++ b/include/guns.h
@@ -23,8 +23,8 @@ typedef struct t_gun {
gun guns[GUN_ALL] = {
{GUN_DESERTEAGLE, "Desert Eagle", 8, 64, 0.0f, 1, 4.0f, 350, 1.0f},
- {GUN_MP5, "MP5", 30, 120, 0.1f, 1, 10.0f, 150, 1.0f},
- {GUN_NOVA, "Nova", 12, 80, 0.2f, 3, 1.2f, 600, 1.0f},
+ {GUN_MP5, "MP5", 30, 120, 0.05f, 1, 10.0f, 150, 1.0f},
+ {GUN_NOVA, "Nova", 12, 80, 0.1f, 3, 1.2f, 600, 1.0f},
};
image* get_image_of_gun(gun_type type);
diff --git a/include/throwables.h b/include/throwables.h
index 0d227d9..714e66b 100644
--- a/include/throwables.h
+++ b/include/throwables.h
@@ -31,6 +31,7 @@ typedef struct t_throwable {
int bounces;
sprite sprite;
int damage;
+ float rotation;
} throwable;
vec3f grenade_explosion_size = (vec3f){2.0f, 2.0f, 2.0f};