From 0a87ce3d63c5a0ac8eb1a388491ab363d877a6b5 Mon Sep 17 00:00:00 2001
From: backwardsEric <55062581+backwardsEric@users.noreply.github.com>
Date: Sun, 15 Sep 2024 13:02:29 -0600
Subject: [PATCH] Call make_patches_of_sunlight() after placing player (#114)

Also constrain trial locations for patches of sunlight near player to be within the bounds of the cave.  Resolves https://github.com/sil-quirk/sil-q/issues/113 .
---
 src/generate.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/generate.c b/src/generate.c
index 8dd5d5d..56c9de2 100644
--- a/src/generate.c
+++ b/src/generate.c
@@ -3486,8 +3486,10 @@ void make_patches_of_sunlight()
     // bunch near the player
     for (i = 0; i < 40; ++i)
     {
-        y = rand_range(p_ptr->py - 5, p_ptr->py + 5);
-        x = rand_range(p_ptr->px - 5, p_ptr->px + 5);
+        y = rand_range(MAX(p_ptr->py - 5, 1),
+            MIN(p_ptr->py + 5, p_ptr->cur_map_hgt - 2));
+        x = rand_range(MAX(p_ptr->px - 5, 1),
+            MIN(p_ptr->px + 5, p_ptr->cur_map_wid - 2));
         make_patch_of_sunlight(y, x);
     }
 
@@ -3670,6 +3672,16 @@ static bool cave_gen(void)
             }
         }
 
+    /* place the stairs, traps, rubble, secret doors, and player */
+    if (!place_rubble_player())
+    {
+        if (cheat_room)
+            msg_format("Couldn't place, rubble, or player.");
+        if (p_ptr->force_forge)
+            p_ptr->fixed_forge_count--;
+        return (FALSE);
+    }
+
     if (p_ptr->depth == 1)
     {
         // smaller number of monsters at 50ft
@@ -3684,16 +3696,6 @@ static bool cave_gen(void)
         mon_gen = (dun->cent_n + dieroll(dun->cent_n)) / 2;
     }
 
-    /* place the stairs, traps, rubble, secret doors */
-    if (!place_rubble_player())
-    {
-        if (cheat_room)
-            msg_format("Couldn't place, rubble, or player.");
-        if (p_ptr->force_forge)
-            p_ptr->fixed_forge_count--;
-        return (FALSE);
-    }
-
     // check dungeon connectivity
     if (!check_connectivity())
     {