From 719cedf5269c7daf48b681f20d63589a92b60dd2 Mon Sep 17 00:00:00 2001
From: Llywelwyn <lewiiswynne@gmail.com>
Date: Fri, 29 Sep 2023 02:53:14 +0100
Subject: [PATCH] viewport-sized dungeons

---
 src/consts/mod.rs       |  1 +
 src/map_builders/mod.rs | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/consts/mod.rs b/src/consts/mod.rs
index d21ba60..7713b62 100644
--- a/src/consts/mod.rs
+++ b/src/consts/mod.rs
@@ -9,6 +9,7 @@ pub mod sprites;
 
 pub mod prelude {
     pub use super::visuals::{ TILE_LAYER, ENTITY_LAYER, TEXT_LAYER, HP_BAR_LAYER };
+    pub use super::visuals::{ VIEWPORT_H, VIEWPORT_W };
 }
 
 pub const TILESIZE: f32 = 16.0;
diff --git a/src/map_builders/mod.rs b/src/map_builders/mod.rs
index 407dfdd..728d1f6 100644
--- a/src/map_builders/mod.rs
+++ b/src/map_builders/mod.rs
@@ -213,12 +213,12 @@ fn random_start_position(rng: &mut RandomNumberGenerator) -> (XStart, YStart) {
 }
 
 fn random_room_builder(rng: &mut RandomNumberGenerator, builder: &mut BuilderChain, end: bool) {
-    let build_roll = rng.roll_dice(1, 3);
+    let build_roll = rng.roll_dice(1, 2); // TODO: BSP Interiors, change this to 1d3 and uncomment.
     // Start with a room builder.
     match build_roll {
         1 => builder.start_with(SimpleMapBuilder::new(None)),
-        2 => builder.start_with(BspDungeonBuilder::new()),
-        _ => builder.start_with(BspInteriorBuilder::new()),
+        _ => builder.start_with(BspDungeonBuilder::new()),
+        //_ => builder.start_with(BspInteriorBuilder::new()),
     }
 
     // BspInterior makes its own doorways. If we're not using that one,
@@ -437,6 +437,8 @@ pub fn random_builder(
     builder
 }
 
+use crate::consts::prelude::*;
+
 pub fn level_builder(
     id: i32,
     rng: &mut RandomNumberGenerator,
@@ -452,8 +454,8 @@ pub fn level_builder(
             random_builder(
                 id,
                 rng,
-                width,
-                height,
+                VIEWPORT_W,
+                VIEWPORT_H,
                 2,
                 1,
                 initial_player_level,
@@ -464,8 +466,8 @@ pub fn level_builder(
             random_builder(
                 id,
                 rng,
-                width,
-                height,
+                VIEWPORT_W,
+                VIEWPORT_H,
                 4 + diff(ID_INFINITE, id),
                 1 + diff(ID_INFINITE, id),
                 initial_player_level,
@@ -476,8 +478,8 @@ pub fn level_builder(
             random_builder(
                 id,
                 rng,
-                width,
-                height,
+                VIEWPORT_W,
+                VIEWPORT_H,
                 1,
                 404,
                 initial_player_level,