Revert world object refactors

game/world.odin

@@ -1,56 +1,29 @@
 package game
 
 World :: struct {
-	economy:        Economy,
-	combat:         Combat,
-	player:         Player,
+	gold:           int,
+	base_health:    int,
 	world_map:      Map,
+	path:           [dynamic]Vec2,
+	enemies:        [MAX_ENEMIES]Enemy,
+	towers:         [dynamic]Tower,
 	events:         [dynamic]Event,
 	phase:          Game_Phase,
-	wave:           Wave,
+	wave:           int,
+	spawner:        Wave_Spawner,
+	projectiles:    [MAX_PROJECTILES]Projectile,
 	selected_tower: Tower_Kind,
 }
 
-Player :: struct {
-	base_health: int,
-}
-
-Map :: struct {
-	current_map: World_Map,
-	path:        [dynamic]Vec2,
-}
-
-Economy :: struct {
-	gold: int,
-}
-
-Combat :: struct {
-	enemies:     [MAX_ENEMIES]Enemy,
-	towers:      [dynamic]Tower,
-	projectiles: [MAX_PROJECTILES]Projectile,
-}
-
-Wave :: struct {
-	current_wave: int,
-	spawner:      Wave_Spawner,
-}
-
 init_world :: proc() -> World {
-	economy := Economy {
-		gold = 100,
-	}
-
-	player := Player {
-		base_health = 20,
-	}
 	world := World {
-		economy        = economy,
-		player         = player,
+		gold           = 100,
+		base_health    = 20,
 		phase          = .Build,
 		selected_tower = .Archer,
 	}
-	init_map(&world.world_map.current_map)
-	build_path(&world.world_map.current_map, &world.world_map.path)
+	init_map(&world.world_map)
+	build_path(&world.world_map, &world.path)
 	return world
 }