Build fixes to build cleanly on OS X; switch from makefile.lnx to

makefile.osx in the master makefile to build.

Note that this checkin adds comments to the start of each modified file
tagging the file as modified by Crawl Reference; the license requires this,
so we should be careful to stick with it.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 4 deletions

diff --git a/trunk/source/dungeon.cc b/trunk/source/dungeon.cc
index c899daa7dc..ce002f21d2 100644
--- a/trunk/source/dungeon.cc
+++ b/trunk/source/dungeon.cc
@@ -3,6 +3,8 @@
  *  Summary:    Functions used when building new levels.
  *  Written by: Linley Henzell
  *
+ *  Modified for Crawl Reference by $Author$ on $Date$
+ *
  *  Change History (most recent first):
  *
  *
@@ -5143,8 +5145,8 @@ static void build_vaults(int level_number, int force_vault)
                                       RANDOM_MONSTER,
                                       RANDOM_MONSTER);
 
-    char roomsss = 10 + random2(90);
-    char which_room = 0;
+    int roomsss = 10 + random2(90);
+    int which_room = 0;
 
     bool exclusive = (one_chance_in(10) ? false : true);
 
@@ -6947,14 +6949,14 @@ static char plan_3(void)
      */
     int i;
     char cnx, cny;
-    char roomsss = 30 + random2(90);
+    int roomsss = 30 + random2(90);
 
     bool exclusive = (one_chance_in(10) ? false : true);
     bool exclusive2 = coinflip();
 
     char romx1[30], romy1[30], romx2[30], romy2[30];
 
-    char which_room = 0;
+    int which_room = 0;
 
     for (i = 0; i < roomsss; i++)
     {