bulmanator/ld58
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

use slab aabb for gunshots

Browse Source
This commit is contained in:
Declan Grant
2025-10-06 00:48:41 +01:00
parent b09bdc6209
commit 24e9b472c3
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/impl/bandit.c
View File

@@ -3,10 +3,8 @@
void UpdateBandit(F32 delta, Bandit *bandit, World *world) { void UpdateBandit(F32 delta, Bandit *bandit, World *world) {
if ( if (
world->player.controls.shot world->player.controls.shot && AABB_Slab(world->player.pos, world->player.shotPos, bandit->collision) && bandit->currentArea == world->player.currentArea)
&& AABB_Point(bandit->collision, world->player.shotPos) {
&& bandit->currentArea == world->player.currentArea
) {
printf("You shot the bandit %*.s\n", Sv(bandit->name)); printf("You shot the bandit %*.s\n", Sv(bandit->name));
bandit->health--; bandit->health--;
} }

6
code/game/impl/world.c
View File

@@ -19,10 +19,8 @@ void UpdateNPCs(F32 delta, World *world)
NPC *npc = &world->npcs[i]; NPC *npc = &world->npcs[i];
UpdateNPC(delta, npc, world); UpdateNPC(delta, npc, world);
if ( if (
world->player.controls.shot world->player.controls.shot && AABB_Slab(world->player.pos, world->player.shotPos, npc->collision) && npc->currentArea == world->player.currentArea)
&& AABB_Point(npc->collision, world->player.shotPos) {
&& npc->currentArea == world->player.currentArea
) {
printf("You shot %*.s\n", Sv(world->npcs[i].name)); printf("You shot %*.s\n", Sv(world->npcs[i].name));
} }
} }