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.45 by root, Sun Dec 31 18:10:40 2006 UTC vs.
Revision 1.52 by root, Mon Jan 15 00:40:49 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
… …
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)
… …
285 MTH int change_map_light (int change); 288 MTH int change_map_light (int change);
286 static void change_all_map_light (int change); //PERL 289 static void change_all_map_light (int change); //PERL
287 MTH void set_darkness_map (); 290 MTH void set_darkness_map ();
288 MTH int estimate_difficulty () const; 291 MTH int estimate_difficulty () const;
289 292
293 // set the given flag on all objects in the map
294 MTH void set_object_flag (int flag, int value = 1);
295
290 MTH void link_multipart_objects (); 296 MTH void link_multipart_objects ();
291 MTH void clear_unique_items (); 297 MTH void clear_unique_items ();
292 298
293 MTH void clear_header (); 299 MTH void clear_header ();
294 MTH void clear_links_to (maptile *m); 300 MTH void clear_links_to (maptile *m);
295 301
296 // loas the header pseudo-object 302 // loas the header pseudo-object
297 bool load_header (object_thawer &thawer); 303 bool _load_header (object_thawer &thawer);
298 MTH bool load_header (const char *path); 304 MTH bool _load_header (const char *path);
299 305
300 // load objects into the map 306 // load objects into the map
301 bool load_objects (object_thawer &thawer); 307 bool _load_objects (object_thawer &thawer);
302 MTH bool load_objects (const char *path, bool skip_header = true); 308 MTH bool _load_objects (const char *path, bool skip_header = true);
303 309
304 // save objects into the given file (uses IO_ flags) 310 // save objects into the given file (uses IO_ flags)
305 bool save_objects (object_freezer &freezer, int flags); 311 bool _save_objects (object_freezer &freezer, int flags);
306 MTH bool save_objects (const char *path, int flags); 312 MTH bool _save_objects (const char *path, int flags);
307 313
308 // save the header pseudo object _only_ 314 // save the header pseudo object _only_
309 bool save_header (object_freezer &freezer); 315 bool _save_header (object_freezer &freezer);
310 MTH bool save_header (const char *path); 316 MTH bool _save_header (const char *path);
311 317
312 maptile (); 318 maptile ();
313 maptile (int w, int h); 319 maptile (int w, int h);
314 ~maptile (); 320 ~maptile ();
315 321
… …
318 324
319 MTH int size () const { return width * height; } 325 MTH int size () const { return width * height; }
320 326
321 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);
322 328
323// static maptile *find_map (const char *path, maptile *origin);//PERL 329 MTH void touch () { last_access = runtime; }
324// 330
325// // load a map relative to this one 331 // find the map that is at coordinate x|y relative to this map
326// maptile *find_map (const char *path) 332 // TODO: need a better way than passing by reference
327// { 333 // TODO: make perl interface
328// return find_map (path, this); 334 maptile *xy_find (sint16 &x, sint16 &y);
329// } 335
330// 336 // like xy_find, but also loads the map
331// // customise this map for the given player 337 maptile *xy_load (sint16 &x, sint16 &y);
332// // might return this or a completely new map 338
333// maptile *customise_for (object *op);
334//
335// void do_force_map_sync ();//PERL 339 void do_load_sync ();//PERL
336// 340
337// // make sure the map is loaded 341 // make sure the map is loaded
338// MTH void force_map_sync () 342 MTH void load_sync ()
339// { 343 {
340// if (in_memory != MAP_IN_MEMORY) 344 if (!spaces)
341// do_force_map_sync (); 345 do_load_sync ();
342// } 346 }
343 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
344 static maptile *load_map_sync (const char *path, maptile *original = 0);//PERL 353 static maptile *find_async (const char *path, maptile *original = 0);//PERL
345 static void emergency_save ();//PERL
346 354
347 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]; }
348 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 356 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
349}; 357};
350 358
… …
364 int distance_y; 372 int distance_y;
365 int direction; 373 int direction;
366 object *part; 374 object *part;
367}; 375};
368 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
369inline mapspace & 397inline mapspace &
370object::ms () const 398object::ms () const
371{ 399{
372 return map->at (x, y); 400 return map->at (x, y);
373} 401}

Diff Legend

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