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.122 by root, Tue Nov 10 05:11:06 2009 UTC vs.
Revision 1.133 by root, Tue May 4 22:26:49 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 */
… …
327 MTH void update_buttons (); 320 MTH void update_buttons ();
328 MTH int change_map_light (int change); 321 MTH int change_map_light (int change);
329 MTH int estimate_difficulty () const; 322 MTH int estimate_difficulty () const;
330 323
331 MTH void play_sound (faceidx sound, int x, int y) const; 324 MTH void play_sound (faceidx sound, int x, int y) const;
332 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;
333 326
334 // connected links 327 // connected links
335 oblinkpt *find_link (shstr_tmp id); 328 oblinkpt *find_link (shstr_tmp id);
336 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);
337 330
… …
355 bool _load_objects (object_thawer &thawer); 348 bool _load_objects (object_thawer &thawer);
356 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 349 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
357 350
358 // save objects into the given file (uses IO_ flags) 351 // save objects into the given file (uses IO_ flags)
359 bool _save_objects (object_freezer &freezer, int flags); 352 bool _save_objects (object_freezer &freezer, int flags);
360 MTH bool _save_objects (const char *path, int flags); 353 MTH bool _save_objects (const_octet_string path, int flags);
361 354
362 // save the header pseudo object _only_ 355 // save the header pseudo object _only_
363 bool _save_header (object_freezer &freezer); 356 bool _save_header (object_freezer &freezer);
364 MTH bool _save_header (const char *path); 357 MTH bool _save_header (const_octet_string path);
365 358
366 maptile (); 359 maptile ();
367 maptile (int w, int h); 360 maptile (int w, int h);
361 void init ();
368 ~maptile (); 362 ~maptile ();
369 363
370 void do_destroy (); 364 void do_destroy ();
371 void gather_callbacks (AV *&callbacks, event_type event) const; 365 void gather_callbacks (AV *&callbacks, event_type event) const;
372 366
… …
396 } 390 }
397 391
398 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 392 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
399 bool generate_random_map (random_map_params *RP); 393 bool generate_random_map (random_map_params *RP);
400 394
401 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 395 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
402 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 396 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
403 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 397 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
404 object *pick_random_object (rand_gen &gen = rndm) const; 398 object *pick_random_object (rand_gen &gen = rndm) const;
405 399
406 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 400 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
407 401
408 // return an array of maprects corresponding 402 // return an array of maprects corresponding
409 // to the given rectangular area. the last rect will have 403 // to the given rectangular area. the last rect will have
410 // a 0 map pointer. 404 // a 0 map pointer.
411 // the array will be stored in a static memory area,
412 // so recursion is not atm. supported
413 maprect *split_to_tiles (int x0, int y0, int x1, int y1); 405 maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
406
407 MTH bool is_in_shop (int x, int y) const;
414}; 408};
409
410inline bool
411object::is_in_shop () const
412{
413 return is_on_map ()
414 && map->is_in_shop (x, y);
415}
415 416
416//+GPL 417//+GPL
417 418
418/* This is used by get_rangevector to determine where the other 419/* This is used by get_rangevector to determine where the other
419 * creature is. get_rangevector takes into account map tiling, 420 * creature is. get_rangevector takes into account map tiling,
… …
438// and so on. 439// and so on.
439int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 440int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
440int out_of_map (maptile *m, int x, int y); 441int out_of_map (maptile *m, int x, int y);
441maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 442maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
442void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 443void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
443void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/); 444void get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
444int on_same_map (const object *op1, const object *op2); 445int on_same_map (const object *op1, const object *op2);
445int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 446int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
446 447
447// adjust map, x and y for tiled maps and return true if the position is valid at all 448// adjust map, x and y for tiled maps and return true if the position is valid at all
448static inline bool 449static inline bool
449xy_normalise (maptile *&map, sint16 &x, sint16 &y) 450xy_normalise (maptile *&map, sint16 &x, sint16 &y)
450{ 451{
… …
554 555
555#define ordered_mapwalk_end \ 556#define ordered_mapwalk_end \
556 } \ 557 } \
557 } 558 }
558 559
560extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
561
559// loop over every space in the given maprect, 562// loop over every space in the given maprect,
560// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0 563// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
561// the iterator code must be a single statement following this macro call, similar to "if" 564// the iterator code must be a single statement following this macro call, similar to "if"
562// "continue" will skip to the next space 565// "continue" will skip to the next space
563#define rect_mapwalk(rect,dx0,dy0) \ 566#define rect_mapwalk(rect,dx0,dy0) \
… …
569 572
570// same as ordered_mapwalk, but the walk will not follow any particular 573// same as ordered_mapwalk, but the walk will not follow any particular
571// order (unorded), but is likely faster. 574// order (unorded), but is likely faster.
572// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op 575// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
573// "continue" will skip to the next space 576// "continue" will skip to the next space
574#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ 577#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
575 for (maprect *r_e_c_t = (map)->split_to_tiles ( \ 578 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
576 (ox) + (dx0) , (oy) + (dy0) , \ 579 (ox) + (dx0) , (oy) + (dy0) , \
577 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ 580 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
578 r_e_c_t->m; \ 581 r_e_c_t->m; \
579 ++r_e_c_t) \ 582 ++r_e_c_t) \
580 rect_mapwalk (r_e_c_t, (ox), (oy)) 583 rect_mapwalk (r_e_c_t, (ox), (oy))
581 584
582#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 585#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
583 unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1) 586 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
584 587
585#endif 588#endif
586 589

Diff Legend

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