--- deliantra/server/include/map.h 2007/04/21 16:56:32 1.75
+++ deliantra/server/include/map.h 2007/08/27 06:29:17 1.85
@@ -1,25 +1,24 @@
/*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
*
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * 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
*
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
*/
/*
@@ -32,6 +31,7 @@
#include
+#include "region.h"
#include "cfperl.h"
/* We set this size - this is to make magic map work properly on
@@ -189,12 +189,12 @@
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);
@@ -202,6 +202,7 @@
* should be reset
*/
bool ACC (RW, dirty); /* if true, something was inserted or removed */
+ bool ACC (RW, no_reset); // must not reset this map
bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
* players entering/exiting map
*/
@@ -213,7 +214,6 @@
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 */
@@ -252,13 +252,15 @@
MTH void clear ();
MTH void fix_auto_apply ();
- MTH void decay_objects ();
+ MTH void do_decay_objects ();
MTH void update_buttons ();
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);
@@ -299,6 +301,8 @@
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
@@ -319,7 +323,7 @@
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;
@@ -373,5 +377,55 @@
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);
+ }
+};
+
+inline const mapxy &
+object::operator =(const mapxy &pos)
+{
+ map = pos.m;
+ x = pos.x;
+ y = pos.y;
+
+ return pos;
+}
+
#endif