--- deliantra/server/random_maps/random_map.C	2010/07/04 22:12:26	1.71
+++ deliantra/server/random_maps/random_map.C	2010/08/22 20:36:37	1.75
@@ -25,7 +25,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <global.h>
-#include <random_map.h>
+#include <rmg.h>
 #include <rproto.h>
 #include <sproto.h>
 
@@ -62,7 +62,6 @@
 
   xsize               = get_iv ("xsize");
   ysize               = get_iv ("ysize");
-  expand2x            = get_iv ("expand2x");
   layoutoptions1      = get_iv ("layoutoptions1");
   layoutoptions2      = get_iv ("layoutoptions2");
   layoutoptions3      = get_iv ("layoutoptions3");
@@ -71,7 +70,6 @@
   difficulty_increase = get_nv ("difficulty_increase");
   dungeon_level       = get_iv ("dungeon_level");
   dungeon_depth       = get_iv ("dungeon_depth");
-  random_seed         = get_uv ("random_seed");
   total_map_hp        = get_nv ("total_map_hp"); // actually val64, but I am too lazy
   symmetry_used       = get_iv ("symmetry_used");
 }
@@ -90,7 +88,6 @@
   set ("layoutoptions2"     , layoutoptions2);
   set ("layoutoptions3"     , layoutoptions3);
   set ("dungeon_depth"      , dungeon_depth);
-  set ("random_seed"        , (UV)random_seed);
   set ("difficulty"         , difficulty && difficulty_given ? difficulty : 0);
   set ("difficulty_increase", difficulty_increase);
   set ("dungeon_level"      , dungeon_level);
@@ -192,14 +189,16 @@
 
   max_it (RP->dungeon_level, 1);
 
+  IV expand2x    = RP->get_iv ("expand2x");
+  UV random_seed = RP->get_uv ("random_seed");
+
   /* pick a random seed, or use the one from the input file */
-  RP->random_seed = RP->random_seed
-                       ? RP->random_seed + RP->dungeon_level
-                       : pticks;
+  random_seed = random_seed
+                ? random_seed + RP->dungeon_level
+                : pticks;
 
   // we run "single-threaded"
-  rmg_rndm.seed (RP->random_seed);
-  rmg_rndm.seed (RP->random_seed + pticks);//D
+  rmg_rndm.seed (random_seed);
 
   shstr buf = RP->as_shstr ();
 
@@ -238,7 +237,7 @@
   if (RP->symmetry_used == SYMMETRY_X || RP->symmetry_used == SYMMETRY_XY)
     RP->Xsize = RP->Xsize / 2 + 1;
 
-  if (RP->expand2x > 0)
+  if (expand2x)
     {
       RP->Xsize /= 2;
       RP->Ysize /= 2;
@@ -275,7 +274,7 @@
 
   maze.symmetrize (RP->symmetry_used);
 
-  if (RP->expand2x)
+  if (expand2x)
     maze.expand2x ();
 
 #if 0
@@ -345,7 +344,7 @@
 
   CEDE;
 
-  const char *decorstyle = RP->get_str ("treasurestyle", "");
+  const char *decorstyle = RP->get_str ("decorstyle", "");
 
   /* create decor unless the decorstyle is "none" */
   if (strcmp (decorstyle, "none"))