[ViewVC] Diff of: cvs/deliantra/server/random

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.49 by root, Fri Mar 26 00:59:21 2010 UTC vs.
Revision 1.56 by root, Fri Jul 2 03:40:14 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
           freeindex = -1;
           for (tries = 0; tries < 15 && freeindex == -1; tries++)
             {
               kx = rmg_rndm (RP->Xsize - 2) + 1;
               ky = rmg_rndm (RP->Ysize - 2) + 1;
-              freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
+              freeindex = rmg_find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
             }
           // can freeindex ever be < 0?
           if (freeindex >= 0)
             {
 layout,      (required)
 treasure style    (may be empty or NULL, or "none" to cause no treasure.)
 treasureoptions   (may be 0 for random choices or positive)
 */
 void
-place_treasure (maptile *map, char **layout, char *treasure_style, int treasureoptions, random_map_params *RP)
+place_treasure (maptile *map, char **layout, const char *treasure_style, int treasureoptions, random_map_params *RP)
 {
-  char styledirname[1024];
-  char stylefilepath[1024];
-  maptile *style_map = 0;
   int num_treasures;
   /* bail out if treasure isn't wanted. */
   if (treasure_style)
     if (!strcmp (treasure_style, "none"))
   if (num_treasures <= 0)
     return;
   /* get the style map */
-  sprintf (styledirname, "%s", "/styles/treasurestyles");
+  maptile *style_map = find_style ("/styles/treasurestyles", treasure_style, RP->difficulty);
-  sprintf (stylefilepath, "%s/%s", styledirname, treasure_style);
-  style_map = find_style (styledirname, treasure_style, -1);
   if (!style_map)
     {
-      LOG (llevError, "unable to load style map %s %s.\n", styledirname, treasure_style);
+      LOG (llevError, "unable to load style map %s %s.\n", "/styles/treasurestyles", treasure_style);
       return;
     }
   /* all the treasure at one spot in the map. */
   if (treasureoptions & CONCENTRATED)
   }
   /* stick a trap in the chest if required  */
   if (treasureoptions & TRAPPED)
     {
-      maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
+      maptile *trap_map = find_style ("/styles/trapstyles", "traps", RP->difficulty);
       if (trap_map)
         {
           object *the_trap = trap_map->pick_random_object (rmg_rndm);
         /* don't bother searching this square unless the map says life exists. */
         if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE)
           {
             object *the_monster = GET_MAP_OB (map, lx, ly);
-            for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_MONSTER)); the_monster = the_monster->above);
+            for (; the_monster != NULL && (!the_monster->flag [FLAG_MONSTER]); the_monster = the_monster->above);
-            if (the_monster && QUERY_FLAG (the_monster, FLAG_MONSTER))
+            if (the_monster && the_monster->flag [FLAG_MONSTER])
               return the_monster;
           }
     }
   return NULL;
 }
   if (GET_MAP_FLAGS (map, x, y) & P_IS_ALIVE)
     {
       object *the_monster = GET_MAP_OB (map, x, y);
       /* check off this point */
-      for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_ALIVE)); the_monster = the_monster->above);
+      for (; the_monster != NULL && (!the_monster->flag [FLAG_ALIVE]); the_monster = the_monster->above);
-      if (the_monster && QUERY_FLAG (the_monster, FLAG_ALIVE))
+      if (the_monster && the_monster->flag [FLAG_ALIVE])
         {
           theMonsterToFind = the_monster;
           return theMonsterToFind;
         }
     }
 /* sets up some data structures:  the _recursive form does the
    real work.  */
 static object *
 find_monster_in_room (maptile *map, int x, int y, random_map_params *RP)
 {
-  Layout layout2 (RP);
+  Layout layout2 (map->width, map->height);
-  layout2->clear ();
+  // find walls
-  /* allocate and copy the layout, converting C to 0. */
-  for (int i = 0; i < layout2->w; i++)
+  for (int i = 0; i < layout2.w; i++)
-    for (int j = 0; j < layout2->h; j++)
+    for (int j = 0; j < layout2.h; j++)
-      if (wall_blocked (map, i, j))
+      layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
-        layout2[i][j] = '#';
   theMonsterToFind = 0;
   theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP);
-  layout2.free ();
   return theMonsterToFind;
 }
 /* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
     {
       int lx, ly, sindex;
       lx = x + freearr_x[i];
       ly = y + freearr_y[i];
-      sindex = surround_flag3 (map, lx, ly, RP);
+      sindex = surround_flag3 (map, lx, ly);
       /* if it's blocked on 3 sides, it's enclosed */
       if (sindex == 7 || sindex == 11 || sindex == 13 || sindex == 14)
         {
           *cx = lx;
           *cy = ly;
     {
       int lx, ly, sindex;
       lx = x + freearr_x[i];
       ly = y + freearr_y[i];
-      sindex = surround_flag3 (map, lx, ly, RP);
+      sindex = surround_flag3 (map, lx, ly);
       /* if it's blocked on 3 sides, it's enclosed */
       if (sindex == 3 || sindex == 5 || sindex == 9 || sindex == 6 || sindex == 10 || sindex == 12)
         {
           *cx = lx;
           *cy = ly;
     {
       int lx, ly, sindex;
       lx = x + freearr_x[i];
       ly = y + freearr_y[i];
-      sindex = surround_flag3 (map, lx, ly, RP);
+      sindex = surround_flag3 (map, lx, ly);
       /* if it's blocked on 3 sides, it's enclosed */
       if (sindex)
         {
           *cx = lx;
           *cy = ly;
           return;
         }
     }
   /* give up and return the closest free spot. */
-  i = find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
+  i = rmg_find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
   if (i != -1)
     {
       *cx = x + freearr_x[i];
       *cy = y + freearr_y[i];
   int i, j;
   int ndoors = 0;
   object **doorlist = (object **)calloc (sizeof (int), 1024);
-  LayoutData layout2 (RP->Xsize, RP->Ysize);
+  Layout layout2 (RP->Xsize, RP->Ysize);
   layout2.clear ();
   /* allocate and copy the layout, converting C to 0. */
   for (i = 0; i < RP->Xsize; i++)
     for (j = 0; j < RP->Ysize; j++)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/random_maps/treasure.C (file contents): Revision 1.49 by root, Fri Mar 26 00:59:21 2010 UTC vs. Revision 1.56 by root, Fri Jul 2 03:40:14 2010 UTC

Diff Legend

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.49 by root, Fri Mar 26 00:59:21 2010 UTC vs.
Revision 1.56 by root, Fri Jul 2 03:40:14 2010 UTC