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.121 by root, Mon Nov 9 18:47:56 2009 UTC vs.
Revision 1.131 by root, Sun Apr 4 02:51:56 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;
… …
281 static sint8 outdoor_darkness; /* the global darkness level outside */ 281 static sint8 outdoor_darkness; /* the global darkness level outside */
282 282
283 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 283 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
284 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 284 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
285 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 285 oblinkpt *buttons; /* Linked list of linked lists of buttons */
286 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
287 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
288 sint8 ACC (RW, humid); /* humitidy of this tile */
289 sint8 ACC (RW, windspeed); /* windspeed of this tile */
290 sint8 ACC (RW, winddir); /* direction of wind */
291 sint8 ACC (RW, sky); /* sky conditions */
292 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
293 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 286 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
294 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 287 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
295 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 288 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
296 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 289 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
297 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 290 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
… …
319 // allocates all (empty) mapspace 312 // allocates all (empty) mapspace
320 MTH void alloc (); 313 MTH void alloc ();
321 // deallocates the mapspaces (and destroys all objects) 314 // deallocates the mapspaces (and destroys all objects)
322 MTH void clear (); 315 MTH void clear ();
323 316
317 MTH void post_load (); // update cached values in mapspaces etc.
324 MTH void fix_auto_apply (); 318 MTH void fix_auto_apply ();
325 MTH void do_decay_objects (); 319 MTH void do_decay_objects ();
326 MTH void update_buttons (); 320 MTH void update_buttons ();
327 MTH int change_map_light (int change); 321 MTH int change_map_light (int change);
328 MTH int estimate_difficulty () const; 322 MTH int estimate_difficulty () const;
329 323
330 MTH void play_sound (faceidx sound, int x, int y) const; 324 MTH void play_sound (faceidx sound, int x, int y) const;
331 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;
332 326
333 // connected links 327 // connected links
334 oblinkpt *find_link (shstr_tmp id); 328 oblinkpt *find_link (shstr_tmp id);
335 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);
336 330
… …
354 bool _load_objects (object_thawer &thawer); 348 bool _load_objects (object_thawer &thawer);
355 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 349 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
356 350
357 // save objects into the given file (uses IO_ flags) 351 // save objects into the given file (uses IO_ flags)
358 bool _save_objects (object_freezer &freezer, int flags); 352 bool _save_objects (object_freezer &freezer, int flags);
359 MTH bool _save_objects (const char *path, int flags); 353 MTH bool _save_objects (const_octet_string path, int flags);
360 354
361 // save the header pseudo object _only_ 355 // save the header pseudo object _only_
362 bool _save_header (object_freezer &freezer); 356 bool _save_header (object_freezer &freezer);
363 MTH bool _save_header (const char *path); 357 MTH bool _save_header (const_octet_string path);
364 358
365 maptile (); 359 maptile ();
366 maptile (int w, int h); 360 maptile (int w, int h);
367 ~maptile (); 361 ~maptile ();
368 362
… …
395 } 389 }
396 390
397 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);
398 bool generate_random_map (random_map_params *RP); 392 bool generate_random_map (random_map_params *RP);
399 393
400 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
401 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 395 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
402 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
403 object *pick_random_object (rand_gen &gen = rndm) const; 397 object *pick_random_object (rand_gen &gen = rndm) const;
404 398
405 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]; }
406 400
407 // return an array of maprects corresponding 401 // return an array of maprects corresponding
408 // to the given rectangular area. the last rect will have 402 // to the given rectangular area. the last rect will have
409 // a 0 map pointer. 403 // a 0 map pointer.
410 // the array will be stored in a static memory area,
411 // so recursion is not atm. supported
412 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);
405
406 MTH bool is_in_shop (int x, int y) const;
413}; 407};
408
409inline bool
410object::is_in_shop () const
411{
412 return is_on_map ()
413 && map->is_in_shop (x, y);
414}
414 415
415//+GPL 416//+GPL
416 417
417/* This is used by get_rangevector to determine where the other 418/* This is used by get_rangevector to determine where the other
418 * creature is. get_rangevector takes into account map tiling, 419 * creature is. get_rangevector takes into account map tiling,
… …
553 554
554#define ordered_mapwalk_end \ 555#define ordered_mapwalk_end \
555 } \ 556 } \
556 } 557 }
557 558
559extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
560
558// loop over every space in the given maprect, 561// loop over every space in the given maprect,
559// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0 562// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
560// the iterator code must be a single statement following this macro call, similar to "if" 563// the iterator code must be a single statement following this macro call, similar to "if"
561// "continue" will skip to the next space 564// "continue" will skip to the next space
562#define rect_mapwalk(rect,dx0,dy0) \ 565#define rect_mapwalk(rect,dx0,dy0) \
… …
568 571
569// same as ordered_mapwalk, but the walk will not follow any particular 572// same as ordered_mapwalk, but the walk will not follow any particular
570// order (unorded), but is likely faster. 573// order (unorded), but is likely faster.
571// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op 574// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
572// "continue" will skip to the next space 575// "continue" will skip to the next space
573#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ 576#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
574 for (maprect *r_e_c_t = (map)->split_to_tiles ( \ 577 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
575 (ox) + (dx0) , (oy) + (dy0) , \ 578 (ox) + (dx0) , (oy) + (dy0) , \
576 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ 579 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
577 r_e_c_t->m; \ 580 r_e_c_t->m; \
578 ++r_e_c_t) \ 581 ++r_e_c_t) \
579 rect_mapwalk (r_e_c_t, (ox), (oy)) 582 rect_mapwalk (r_e_c_t, (ox), (oy))
580 583
581#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 584#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
582 unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1) 585 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
583 586
584#endif 587#endif
585 588

Diff Legend

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