Merge branch 'main' of yibble.dev:bulmanator/ld58

code/first.c

@@ -127,6 +127,13 @@ int main(int argc, char **argv)
 		badman->waitTime = 0;
 		badman->maxWaitTime = 2;
 		badman->poiCount = 2;
+		badman->shootoutTimer = 1.5;
+		badman->agroRadius = 600.0;
+    badman->bullets = 6;
+    badman->shootDelay = 1;
+    badman->accuracyRange = 0.25;
+    badman->reloadTime = 2.5;
+    badman->reloadTimer = 0;
     badman->pointsOfInterest[0] = 937;
     badman->pointsOfInterest[1] = 12;
 
@@ -215,7 +222,7 @@ int main(int argc, char **argv)
     world->propTypes[12].assetHandle=D_ImageHandle(&game->draw, S("house_int"));
     world->propTypes[12].scale=6.875f;
 	}
-  game->editor.enabled = true;
+  game->editor.enabled = false;
   game->editor.mode = G_EDITOR_MODE_TILE;
   game->editor.currentLevel = WORLD_AREA_OUTSIDE;
 
@@ -340,8 +347,9 @@ int main(int argc, char **argv)
 
     if(!game->editor.enabled) {
 		  UpdateWorld(1.0f / 60.0f, game->world);
-      game->camera.p.x = game->world->player.pos.x;
-      game->camera.p.y = game->world->player.pos.y;
+
+      game->camera.p.x = game->world->player.collision.pos.x;
+      game->camera.p.y = game->world->player.collision.pos.y;
     }
 
 		int w, h;