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.46 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.56 by root, Fri Jan 19 21:49:58 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at crossfire@schmorp.de 22 * The authors can be reached via e-mail at crossfire@schmorp.de
22*/ 23 */
23 24
24/* 25/*
25 * The maptile is allocated each time a new map is opened. 26 * The maptile is allocated each time a new map is opened.
26 * It contains pointers (very indirectly) to all objects on the map. 27 * It contains pointers (very indirectly) to all objects on the map.
27 */ 28 */
… …
54#define MAP_BLOCK 0x04 55#define MAP_BLOCK 0x04
55#define MAP_STYLE 0x08 56#define MAP_STYLE 0x08
56#define MAP_OVERLAY 0x10 57#define MAP_OVERLAY 0x10
57 58
58/* Values for in_memory below. Should probably be an enumerations */ 59/* Values for in_memory below. Should probably be an enumerations */
59#define MAP_IN_MEMORY 1 60enum {
60#define MAP_SWAPPED 2 61 MAP_IN_MEMORY,
61#define MAP_LOADING 3 62 MAP_SWAPPED,
62#define MAP_SAVING 4 63 MAP_LOADING,
64 MAP_SAVING,
65};
63 66
64/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 67/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
65 * really be used, as it is multi tile aware. However, there are some cases 68 * really be used, as it is multi tile aware. However, there are some cases
66 * where it is known the map is not tiled or the values are known 69 * where it is known the map is not tiled or the values are known
67 * consistent (eg, op->map, op->x, op->y) 70 * consistent (eg, op->map, op->x, op->y)
… …
80 83
81/* You should really know what you are doing before using this - you 84/* You should really know what you are doing before using this - you
82 * should almost always be using out_of_map instead, which takes into account 85 * should almost always be using out_of_map instead, which takes into account
83 * map tiling. 86 * map tiling.
84 */ 87 */
85#define OUT_OF_REAL_MAP(M,X,Y) ((X)<0 || (Y)<0 || (X)>=(M)->width || (Y)>=(M)->height) 88#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
86 89
87/* These are used in the MapLook flags element. They are not used in 90/* These are used in the MapLook flags element. They are not used in
88 * in the object flags structure. 91 * in the object flags structure.
89 */ 92 */
90#define P_BLOCKSVIEW 0x01 93#define P_BLOCKSVIEW 0x01
… …
122 * to extend information about a space. 125 * to extend information about a space.
123 */ 126 */
124struct mapspace 127struct mapspace
125{ 128{
126 object *bot, *top; /* lowest/highest object on this space */ 129 object *bot, *top; /* lowest/highest object on this space */
127 New_Face *faces[MAP_LAYERS]; /* faces for the 3 layers */ 130 facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */
128 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 131 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
129 uint8 flags_; /* flags about this space (see the P_ values above) */ 132 uint8 flags_; /* flags about this space (see the P_ values above) */
130 sint8 light; /* How much light this space provides */ 133 sint8 light; /* How much light this space provides */
131 MoveType move_block; /* What movement types this space blocks */ 134 MoveType move_block; /* What movement types this space blocks */
132 MoveType move_slow; /* What movement types this space slows */ 135 MoveType move_slow; /* What movement types this space slows */
… …
295 298
296 MTH void clear_header (); 299 MTH void clear_header ();
297 MTH void clear_links_to (maptile *m); 300 MTH void clear_links_to (maptile *m);
298 301
299 // loas the header pseudo-object 302 // loas the header pseudo-object
300 bool load_header (object_thawer &thawer); 303 bool _load_header (object_thawer &thawer);
301 MTH bool load_header (const char *path); 304 MTH bool _load_header (const char *path);
302 305
303 // load objects into the map 306 // load objects into the map
304 bool load_objects (object_thawer &thawer); 307 bool _load_objects (object_thawer &thawer);
305 MTH bool load_objects (const char *path, bool skip_header = true); 308 MTH bool _load_objects (const char *path, bool skip_header = true);
306 309
307 // save objects into the given file (uses IO_ flags) 310 // save objects into the given file (uses IO_ flags)
308 bool save_objects (object_freezer &freezer, int flags); 311 bool _save_objects (object_freezer &freezer, int flags);
309 MTH bool save_objects (const char *path, int flags); 312 MTH bool _save_objects (const char *path, int flags);
310 313
311 // save the header pseudo object _only_ 314 // save the header pseudo object _only_
312 bool save_header (object_freezer &freezer); 315 bool _save_header (object_freezer &freezer);
313 MTH bool save_header (const char *path); 316 MTH bool _save_header (const char *path);
314 317
315 maptile (); 318 maptile ();
316 maptile (int w, int h); 319 maptile (int w, int h);
317 ~maptile (); 320 ~maptile ();
318 321
… …
323 326
324 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 327 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
325 328
326 MTH void touch () { last_access = runtime; } 329 MTH void touch () { last_access = runtime; }
327 330
328// static maptile *find_map (const char *path, maptile *origin);//PERL 331 // find the map that is at coordinate x|y relative to this map
329// 332 // TODO: need a better way than passing by reference
330// // load a map relative to this one 333 // TODO: make perl interface
331// maptile *find_map (const char *path) 334 maptile *xy_find (sint16 &x, sint16 &y);
332// { 335
333// return find_map (path, this); 336 // like xy_find, but also loads the map
334// } 337 maptile *xy_load (sint16 &x, sint16 &y);
335// 338
336// // customise this map for the given player
337// // might return this or a completely new map
338// maptile *customise_for (object *op);
339//
340// void do_force_map_sync ();//PERL 339 void do_load_sync ();//PERL
341// 340
342// // make sure the map is loaded 341 // make sure the map is loaded
343// MTH void force_map_sync () 342 MTH void load_sync ()
344// { 343 {
345// if (in_memory != MAP_IN_MEMORY) 344 if (!spaces)
346// do_force_map_sync (); 345 do_load_sync ();
347// } 346 }
348 347
348 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
349 bool generate_random_map (random_map_params *RP);
350
351 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
352 // async prefetch
349 static maptile *load_map_sync (const char *path, maptile *original = 0);//PERL 353 static maptile *find_async (const char *path, maptile *original = 0);//PERL
350 static void emergency_save ();//PERL
351 354
352 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 355 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
353 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 356 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
354}; 357};
355 358
… …
369 int distance_y; 372 int distance_y;
370 int direction; 373 int direction;
371 object *part; 374 object *part;
372}; 375};
373 376
377//TODO: these should be refactored into things like xy_normalise
378// and so on.
379int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
380int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y);
381int out_of_map(maptile *m, int x, int y);
382maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y);
383void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags);
384void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
385int on_same_map(const object *op1, const object *op2);
386
387// adjust map, x and y for tiled maps and return true if the position is valid at all
388inline bool
389xy_normalise (maptile *&map, sint16 &x, sint16 &y)
390{
391 // when in range, do a quick return, otherwise go the slow route
392 return
393 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
394 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
395}
396
374inline mapspace & 397inline mapspace &
375object::ms () const 398object::ms () const
376{ 399{
377 return map->at (x, y); 400 return map->at (x, y);
378} 401}

Diff Legend

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