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.51 by root, Sat Jan 13 23:06:13 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)
… …
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

Diff Legend

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