[ViewVC] Diff of: cvs/deliantra/server/include/map.h

Comparing deliantra/server/include/map.h (file contents):
Revision 1.77 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.87 by root, Tue Sep 4 05:43:21 2007 UTC

 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * Crossfire TRT is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /*
 #ifndef MAP_H
 #define MAP_H
 #include <tr1/unordered_map>
+#include "region.h"
 #include "cfperl.h"
 /* We set this size - this is to make magic map work properly on
  * tiled maps. There is no requirement that this matches the
  * tiled maps size - it just seemed like a reasonable value.
 struct maptile : zero_initialised, attachable
 {
   sint32 ACC (RW, width), ACC (RW, height);        /* Width and height of map. */
   struct mapspace *spaces;         /* Array of spaces on this map */
   uint8 *regions;                  /* region index per mapspace, if != 0 */
-  struct region **regionmap;       /* index to region */
+  region_ptr *regionmap;           /* index to region */
   tstamp ACC (RW, last_access);    /* last time this map was accessed somehow */
   shstr ACC (RW, name);    /* Name of map as given by its creator */
-  struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
+  region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
                                     * points to the struct containing all the properties of
                                     * the region */
   double ACC (RW, reset_time);
   uint32 ACC (RW, reset_timeout);  /* How many seconds must elapse before this map
                                     * should be reset
                                     * be loaded before used.  The map,omap and map_ob
                                     * arrays will be allocated when the map is loaded */
   sint16 players;        /* How many players are on this map right now */
   uint16 ACC (RW, difficulty);     /* What level the player should be to play here */
-  bool ACC (RW, active);           // wether this map is active or not
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
   bool ACC (RW, nodrop);   /* avoid dropping anything on this map */
   uint8 ACC (RW, darkness);        /* indicates level of darkness of map */
   MTH int change_map_light (int change);
   static void change_all_map_light (int change); //PERL
   MTH void set_darkness_map ();
   MTH int estimate_difficulty () const;
+  MTH void play_sound (faceidx sound, int x, int y) const;
   // set the given flag on all objects in the map
   MTH void set_object_flag (int flag, int value = 1);
   MTH void link_multipart_objects ();
   MTH void clear_unique_items ();
   MTH void clear_header ();
   MTH void clear_links_to (maptile *m);
   MTH struct region *region (int x, int y) const;
-  // loas the header pseudo-object
+  // load the header pseudo-object
   bool _load_header (object_thawer &thawer);
-  MTH bool _load_header (const char *path);
+  MTH bool _load_header (object_thawer *thawer) { return _load_header (*thawer); }
   // load objects into the map
   bool _load_objects (object_thawer &thawer);
-  MTH bool _load_objects (const char *path, bool skip_header = true);
+  MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
   // save objects into the given file (uses IO_ flags)
   bool _save_objects (object_freezer &freezer, int flags);
   MTH bool _save_objects (const char *path, int flags);
   MTH int size () const { return width * height; }
   MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
   MTH void touch () { last_access = runtime; }
+  MTH bool tile_available (int dir, bool load = true);
   // find the map that is at coordinate x|y relative to this map
   // TODO: need a better way than passing by reference
   // TODO: make perl interface
   maptile *xy_find (sint16 &x, sint16 &y);
   }
   void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
   bool generate_random_map (random_map_params *RP);
-  static maptile *find_async (const char *path, maptile *original = 0);//PERL
+  static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
   static maptile *find_sync (const char *path, maptile *original = 0);//PERL
   static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
   MTH object *pick_random_object () const;
   mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
 object::ms () const
 {
   return map->at (x, y);
 }
+// not used anywhere *yet*
+struct mapxy {
+  maptile *m;
+  sint16 x, y;
+  mapxy (maptile *m, sint16 x, sint16 y)
+  : m(m), x(x), y(y)
+  { }
+  mapxy (object *op)
+  : m(op->map), x(op->x), y(op->y)
+  { }
+  mapxy &move (int dir)
+  {
+    x += freearr_x [dir];
+    y += freearr_y [dir];
+    return *this;
+  }
+  operator void *() const { return (void *)m; }
+  mapxy &operator =(const object *op)
+  {
+    m = op->map;
+    x = op->x;
+    y = op->y;
+    return *this;
+  }
+  mapspace *operator ->() const { return &m->at (x, y); }
+  mapspace *operator * () const { return &m->at (x, y); }
+  bool normalise ()
+  {
+    return xy_normalise (m, x, y);
+  }
+  object *insert (object *op, object *originator = 0, int flags = 0) const
+  {
+    m->insert (op, x, y, originator, flags);
+  }
+};
+inline const mapxy &
+object::operator =(const mapxy &pos)
+{
+  map = pos.m;
+  x   = pos.x;
+  y   = pos.y;
+  return pos;
+}
 #endif

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.77 by root, Thu Jun 7 19:12:22 2007 UTC vs. Revision 1.87 by root, Tue Sep 4 05:43:21 2007 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.77 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.87 by root, Tue Sep 4 05:43:21 2007 UTC