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.123 by root, Sun Nov 29 09:41:28 2009 UTC vs.
Revision 1.130 by root, Fri Mar 26 01:04:44 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
204 { 204 {
205 return blocks (op->move_type); 205 return blocks (op->move_type);
206 } 206 }
207}; 207};
208 208
209// a rectangular area of a map 209// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
210struct maprect 210struct maprect
211{ 211{
212 maptile *m; 212 maptile *m;
213 int x0, y0; 213 int x0, y0;
214 int x1, y1; 214 int x1, y1;
… …
320 MTH void update_buttons (); 320 MTH void update_buttons ();
321 MTH int change_map_light (int change); 321 MTH int change_map_light (int change);
322 MTH int estimate_difficulty () const; 322 MTH int estimate_difficulty () const;
323 323
324 MTH void play_sound (faceidx sound, int x, int y) const; 324 MTH void play_sound (faceidx sound, int x, int y) const;
325 MTH void say_msg (const char *msg, int x, int y) const; 325 MTH void say_msg (const_utf8_string msg, int x, int y) const;
326 326
327 // connected links 327 // connected links
328 oblinkpt *find_link (shstr_tmp id); 328 oblinkpt *find_link (shstr_tmp id);
329 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0); 329 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
330 330
… …
348 bool _load_objects (object_thawer &thawer); 348 bool _load_objects (object_thawer &thawer);
349 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 349 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
350 350
351 // save objects into the given file (uses IO_ flags) 351 // save objects into the given file (uses IO_ flags)
352 bool _save_objects (object_freezer &freezer, int flags); 352 bool _save_objects (object_freezer &freezer, int flags);
353 MTH bool _save_objects (const char *path, int flags); 353 MTH bool _save_objects (const_octet_string path, int flags);
354 354
355 // save the header pseudo object _only_ 355 // save the header pseudo object _only_
356 bool _save_header (object_freezer &freezer); 356 bool _save_header (object_freezer &freezer);
357 MTH bool _save_header (const char *path); 357 MTH bool _save_header (const_octet_string path);
358 358
359 maptile (); 359 maptile ();
360 maptile (int w, int h); 360 maptile (int w, int h);
361 ~maptile (); 361 ~maptile ();
362 362
… …
389 } 389 }
390 390
391 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 391 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
392 bool generate_random_map (random_map_params *RP); 392 bool generate_random_map (random_map_params *RP);
393 393
394 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 394 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
395 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 395 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
396 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 396 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
397 object *pick_random_object (rand_gen &gen = rndm) const; 397 object *pick_random_object (rand_gen &gen = rndm) const;
398 398
399 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 399 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
400 400
401 // return an array of maprects corresponding 401 // return an array of maprects corresponding
402 // to the given rectangular area. the last rect will have 402 // to the given rectangular area. the last rect will have
403 // a 0 map pointer. 403 // a 0 map pointer.
404 // the array will be stored in a static memory area,
405 // so recursion is not atm. supported
406 maprect *split_to_tiles (int x0, int y0, int x1, int y1); 404 maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
407}; 405};
408 406
409//+GPL 407//+GPL
410 408
411/* This is used by get_rangevector to determine where the other 409/* This is used by get_rangevector to determine where the other
… …
547 545
548#define ordered_mapwalk_end \ 546#define ordered_mapwalk_end \
549 } \ 547 } \
550 } 548 }
551 549
550extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
551
552// loop over every space in the given maprect, 552// loop over every space in the given maprect,
553// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0 553// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
554// the iterator code must be a single statement following this macro call, similar to "if" 554// the iterator code must be a single statement following this macro call, similar to "if"
555// "continue" will skip to the next space 555// "continue" will skip to the next space
556#define rect_mapwalk(rect,dx0,dy0) \ 556#define rect_mapwalk(rect,dx0,dy0) \
… …
562 562
563// same as ordered_mapwalk, but the walk will not follow any particular 563// same as ordered_mapwalk, but the walk will not follow any particular
564// order (unorded), but is likely faster. 564// order (unorded), but is likely faster.
565// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op 565// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
566// "continue" will skip to the next space 566// "continue" will skip to the next space
567#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ 567#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
568 for (maprect *r_e_c_t = (map)->split_to_tiles ( \ 568 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
569 (ox) + (dx0) , (oy) + (dy0) , \ 569 (ox) + (dx0) , (oy) + (dy0) , \
570 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ 570 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
571 r_e_c_t->m; \ 571 r_e_c_t->m; \
572 ++r_e_c_t) \ 572 ++r_e_c_t) \
573 rect_mapwalk (r_e_c_t, (ox), (oy)) 573 rect_mapwalk (r_e_c_t, (ox), (oy))
574 574
575#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 575#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
576 unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1) 576 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
577 577
578#endif 578#endif
579 579

Diff Legend

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