ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/map.h
(Generate patch)

Comparing deliantra/server/include/map.h (file contents):
Revision 1.85 by root, Mon Aug 27 06:29:17 2007 UTC vs.
Revision 1.98 by root, Sun Aug 17 22:46:26 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* 24/*
25 * The maptile is allocated each time a new map is opened. 25 * The maptile is allocated each time a new map is opened.
26 * It contains pointers (very indirectly) to all objects on the map. 26 * It contains pointers (very indirectly) to all objects on the map.
… …
47#define MAGIC_MAP_SIZE 50 47#define MAGIC_MAP_SIZE 50
48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49 49
50#define MAP_LAYERS 3 50#define MAP_LAYERS 3
51 51
52/* Values for in_memory below. Should probably be an enumerations */ 52/* Values for in_memory below */
53enum { 53enum {
54 MAP_IN_MEMORY, 54 MAP_ACTIVE,
55 MAP_INACTIVE, // not used atm.
55 MAP_SWAPPED, 56 MAP_SWAPPED,
56 MAP_LOADING, 57 MAP_LOADING,
57 MAP_SAVING, 58 MAP_SAVING,
58}; 59};
59 60
… …
103 */ 104 */
104#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 105#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
105#define P_NEW_MAP 0x20000 106#define P_NEW_MAP 0x20000
106 /* Coordinates passed result in a new tiled map */ 107 /* Coordinates passed result in a new tiled map */
107 108
108/* P_NO_PASS is used for ob_blocked() return value. It needs
109 * to be here to make sure the bits don't match with anything.
110 */
111#define P_NO_PASS 0x80000
112
113/* Instead of having numerous arrays that have information on a 109/* Instead of having numerous arrays that have information on a
114 * particular space (was map, floor, floor2, map_ob), 110 * particular space (was map, floor, floor2, map_ob),
115 * have this structure take care of that information. 111 * have this structure take care of that information.
116 * This puts it all in one place, and should also make it easier 112 * This puts it all in one place, and should also make it easier
117 * to extend information about a space. 113 * to extend information about a space.
118 */ 114 */
115INTERFACE_CLASS (mapspace)
119struct mapspace 116struct mapspace
120{ 117{
118 object *ACC (RW, bot);
121 object *bot, *top; /* lowest/highest object on this space */ 119 object *ACC (RW, top); /* lowest/highest object on this space */
122 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 120 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
123 uint8 flags_; /* flags about this space (see the P_ values above) */ 121 uint8 flags_; /* flags about this space (see the P_ values above) */
124 sint8 light; /* How much light this space provides */ 122 sint8 ACC (RW, light); /* How much light this space provides */
125 MoveType move_block; /* What movement types this space blocks */ 123 MoveType ACC (RW, move_block); /* What movement types this space blocks */
126 MoveType move_slow; /* What movement types this space slows */ 124 MoveType ACC (RW, move_slow); /* What movement types this space slows */
127 MoveType move_on; /* What movement types are activated */ 125 MoveType ACC (RW, move_on); /* What movement types are activated */
128 MoveType move_off; /* What movement types are activated */ 126 MoveType ACC (RW, move_off); /* What movement types are activated */
129 127
130 void update_ (); 128 void update_ ();
131 void update () 129 MTH void update ()
132 { 130 {
133 if (!(flags_ & P_UPTODATE)) 131 if (!(flags_ & P_UPTODATE))
134 update_ (); 132 update_ ();
135 } 133 }
136 134
137 uint8 flags () 135 MTH uint8 flags ()
138 { 136 {
139 update (); 137 update ();
140 return flags_; 138 return flags_;
141 } 139 }
142 140
143 // maybe only inline quick flags_ checking?
144 object *player () 141 MTH object *player ()
145 { 142 {
146 // search from the top, because players are usually on top 143 object *op;
147 // make usually == always and this non-amortized O(1) 144
148 // could gte rid of P_PLAYER, too, then
149 if (flags () & P_PLAYER) 145 if (flags () & P_PLAYER)
150 for (object *op = top; op; op = op->below) 146 for (op = top; op->type != PLAYER; op = op->below)
151 if (op->type == PLAYER) 147 ;
152 return op; 148 else
149 op = 0;
153 150
154 return 0; 151 return op;
155 } 152 }
156 153
157 // return the item volume on this mapspace in cm³ 154 // return the item volume on this mapspace in cm³
158 uint64 volume () const; 155 MTH uint64 volume () const;
156
157 bool blocks (MoveType mt) const
158 {
159 return move_block && (mt & move_block) == mt;
160 }
161
162 bool blocks (object *op) const
163 {
164 return blocks (op->move_type);
165 }
159}; 166};
160 167
161struct shopitems : zero_initialised 168struct shopitems : zero_initialised
162{ 169{
163 const char *name; /* name of the item in question, null if it is the default item */ 170 const char *name; /* name of the item in question, null if it is the default item */
… …
215 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 222 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216 223
217 bool ACC (RW, per_player); 224 bool ACC (RW, per_player);
218 bool ACC (RW, per_party); 225 bool ACC (RW, per_party);
219 bool ACC (RW, outdoor); /* True if an outdoor map */ 226 bool ACC (RW, outdoor); /* True if an outdoor map */
220 bool ACC (RW, nodrop); /* avoid dropping anything on this map */ 227 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
221 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 228 uint8 ACC (RW, darkness); /* indicates level of darkness of map */
222 229
223 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 230 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
224 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 231 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
225 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 232 oblinkpt *buttons; /* Linked list of linked lists of buttons */
… …
261 268
262 MTH void play_sound (faceidx sound, int x, int y) const; 269 MTH void play_sound (faceidx sound, int x, int y) const;
263 270
264 // set the given flag on all objects in the map 271 // set the given flag on all objects in the map
265 MTH void set_object_flag (int flag, int value = 1); 272 MTH void set_object_flag (int flag, int value = 1);
273 MTH void post_load_original ();
266 274
267 MTH void link_multipart_objects (); 275 MTH void link_multipart_objects ();
268 MTH void clear_unique_items (); 276 MTH void clear_unique_items ();
269 277
270 MTH void clear_header (); 278 MTH void clear_header ();
271 MTH void clear_links_to (maptile *m); 279 MTH void clear_links_to (maptile *m);
272 280
273 MTH struct region *region (int x, int y) const; 281 MTH struct region *region (int x, int y) const;
274 282
275 // loas the header pseudo-object 283 // load the header pseudo-object
276 bool _load_header (object_thawer &thawer); 284 bool _load_header (object_thawer &thawer);
277 MTH bool _load_header (const char *path); 285 MTH bool _load_header (object_thawer *thawer) { return _load_header (*thawer); }
278 286
279 // load objects into the map 287 // load objects into the map
280 bool _load_objects (object_thawer &thawer); 288 bool _load_objects (object_thawer &thawer);
281 MTH bool _load_objects (const char *path, bool skip_header = true); 289 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
282 290
283 // save objects into the given file (uses IO_ flags) 291 // save objects into the given file (uses IO_ flags)
284 bool _save_objects (object_freezer &freezer, int flags); 292 bool _save_objects (object_freezer &freezer, int flags);
285 MTH bool _save_objects (const char *path, int flags); 293 MTH bool _save_objects (const char *path, int flags);
286 294
… …
324 bool generate_random_map (random_map_params *RP); 332 bool generate_random_map (random_map_params *RP);
325 333
326 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 334 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
327 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 335 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
328 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 336 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
329 MTH object *pick_random_object () const; 337 object *pick_random_object (rand_gen &gen = rndm) const;
330 338
331 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 339 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
332 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 340 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
333}; 341};
334 342
… …
348 int distance_y; 356 int distance_y;
349 int direction; 357 int direction;
350 object *part; 358 object *part;
351}; 359};
352 360
361// comaptibility cruft start
353//TODO: these should be refactored into things like xy_normalise 362//TODO: these should be refactored into things like xy_normalise
354// and so on. 363// and so on.
355int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 364int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
356int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
357int out_of_map (maptile *m, int x, int y); 365int out_of_map (maptile *m, int x, int y);
358maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 366maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
359void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 367void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
360void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 368void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
361int on_same_map (const object *op1, const object *op2); 369int on_same_map (const object *op1, const object *op2);
362int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 370int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
363 371
364// adjust map, x and y for tiled maps and return true if the position is valid at all 372// adjust map, x and y for tiled maps and return true if the position is valid at all
365inline bool 373static inline bool
366xy_normalise (maptile *&map, sint16 &x, sint16 &y) 374xy_normalise (maptile *&map, sint16 &x, sint16 &y)
367{ 375{
368 // when in range, do a quick return, otherwise go the slow route 376 // when in range, do a quick return, otherwise go the slow route
369 return 377 return
370 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height)) 378 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
371 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP); 379 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
372} 380}
381// comaptibility cruft end
373 382
374inline mapspace & 383inline mapspace &
375object::ms () const 384object::ms () const
376{ 385{
377 return map->at (x, y); 386 return map->at (x, y);
378} 387}
379 388
380// not used anywhere *yet*
381struct mapxy { 389struct mapxy {
382 maptile *m; 390 maptile *m;
383 sint16 x, y; 391 sint16 x, y;
384 392
385 mapxy (maptile *m, sint16 x, sint16 y) 393 mapxy (maptile *m, sint16 x, sint16 y)
… …
388 396
389 mapxy (object *op) 397 mapxy (object *op)
390 : m(op->map), x(op->x), y(op->y) 398 : m(op->map), x(op->x), y(op->y)
391 { } 399 { }
392 400
401 mapxy &move (int dx, int dy)
402 {
403 x += dx;
404 y += dy;
405
406 return *this;
407 }
408
393 mapxy &move (int dir) 409 mapxy &move (int dir)
394 { 410 {
395 x += freearr_x [dir]; 411 return move (freearr_x [dir], freearr_y [dir]);
396 y += freearr_y [dir];
397
398 return *this;
399 } 412 }
400 413
401 operator void *() const { return (void *)m; } 414 operator void *() const { return (void *)m; }
402 mapxy &operator =(const object *op) 415 mapxy &operator =(const object *op)
403 { 416 {
… …
407 420
408 return *this; 421 return *this;
409 } 422 }
410 423
411 mapspace *operator ->() const { return &m->at (x, y); } 424 mapspace *operator ->() const { return &m->at (x, y); }
412 mapspace *operator * () const { return &m->at (x, y); } 425 mapspace &operator * () const { return m->at (x, y); }
413 426
414 bool normalise () 427 bool normalise ()
415 { 428 {
416 return xy_normalise (m, x, y); 429 return xy_normalise (m, x, y);
430 }
431
432 mapspace &ms () const
433 {
434 return m->at (x, y);
435 }
436
437 object *insert (object *op, object *originator = 0, int flags = 0) const
438 {
439 return m->insert (op, x, y, originator, flags);
417 } 440 }
418}; 441};
419 442
420inline const mapxy & 443inline const mapxy &
421object::operator =(const mapxy &pos) 444object::operator =(const mapxy &pos)

Diff Legend

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