Revert world object refactors

2026-06-27 23:22:45 -07:00
parent 6bdb096e1b
commit 2a99d7ecf3
11 changed files with 72 additions and 99 deletions
@@ -7,7 +7,7 @@ Tile_Kind :: enum {
 	Build,
 }

-World_Map :: struct {
+Map :: struct {
 	tiles: [MAP_H][MAP_W]Tile_Kind,
 }

@@ -24,7 +24,7 @@ tile_color :: proc(kind: Tile_Kind) -> rl.Color {
 	return rl.MAGENTA
 }

-init_map :: proc(world_map: ^World_Map) {
+init_map :: proc(world_map: ^Map) {
 	for y in 0 ..< MAP_H {
 		for x in 0 ..< MAP_W {
 			world_map.tiles[y][x] = .Blocked
@@ -48,16 +48,16 @@ init_map :: proc(world_map: ^World_Map) {
 	}
 }

-can_build_at :: proc(world_map: ^World_Map, gx, gy: int) -> bool {
+can_build_at :: proc(world_map: ^Map, gx, gy: int) -> bool {
 	if gx < 0 || gx >= MAP_W do return false
 	if gy < 0 || gy >= MAP_H do return false
 	return world_map.tiles[gy][gx] == .Build
 }

-render_map :: proc(world_map: ^World_Map) {
+render_map :: proc(world: ^World) {
 	for y in 0 ..< MAP_H {
 		for x in 0 ..< MAP_W {
-			c := tile_color(world_map.tiles[y][x])
+			c := tile_color(world.world_map.tiles[y][x])
 			rl.DrawRectangle(i32(x * TILE_SIZE), i32(y * TILE_SIZE), TILE_SIZE, TILE_SIZE, c)
 		}
 	}