Merge branch 'main' of yibble.dev:bulmanator/ld58
This commit is contained in:
@@ -9,6 +9,9 @@
|
||||
|
||||
void UpdateWorld(F32 delta, World *world)
|
||||
{
|
||||
if(world->bandit.mode == BANDIT_SHOOTOUT){
|
||||
delta = delta/4;
|
||||
}
|
||||
UpdateBandit(delta, &world->bandit, world);
|
||||
UpdateNPCs(delta, world);
|
||||
PlayerUpdate(delta, &world->player);
|
||||
@@ -21,7 +24,7 @@ void UpdateNPCs(F32 delta, World *world)
|
||||
NPC *npc = &world->npcs[i];
|
||||
UpdateNPC(delta, npc, world);
|
||||
if (
|
||||
world->player.controls.shot && AABB_Slab(world->player.pos, world->player.shotPos, npc->collision) && npc->currentArea == world->player.currentArea)
|
||||
world->player.controls.shot && AABB_Slab(world->player.collision.pos, world->player.shotPos, npc->collision) && npc->currentArea == world->player.currentArea)
|
||||
{
|
||||
printf("You shot %*.s\n", Sv(world->npcs[i].name));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user