ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.153 by root, Tue Dec 23 06:58:23 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
26 25
27#include "global.h" 26#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h" 27#include "loader.h"
31
32#include "path.h" 28#include "path.h"
33 29
34/* 30sint8 maptile::outdoor_darkness;
35 * This makes a path absolute outside the world of Crossfire.
36 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
37 * and returns the pointer to a static array containing the result.
38 * it really should be called create_mapname
39 */
40const char *
41create_pathname (const char *name)
42{
43 static char buf[8192];
44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
45 return buf;
46}
47
48/*
49 * This function checks if a file with the given path exists.
50 * -1 is returned if it fails, otherwise the mode of the file
51 * is returned.
52 * It tries out all the compression suffixes listed in the uncomp[] array.
53 *
54 * If prepend_dir is set, then we call create_pathname (which prepends
55 * libdir & mapdir). Otherwise, we assume the name given is fully
56 * complete.
57 * Only the editor actually cares about the writablity of this -
58 * the rest of the code only cares that the file is readable.
59 * when the editor goes away, the call to stat should probably be
60 * replaced by an access instead (similar to the windows one, but
61 * that seems to be missing the prepend_dir processing
62 */
63int
64check_path (const char *name, int prepend_dir)
65{
66 char buf[MAX_BUF];
67
68 char *endbuf;
69 struct stat statbuf;
70 int mode = 0;
71
72 if (prepend_dir)
73 assign (buf, create_pathname (name));
74 else
75 assign (buf, name);
76
77 /* old method (strchr(buf, '\0')) seemd very odd to me -
78 * this method should be equivalant and is clearer.
79 * Can not use strcat because we need to cycle through
80 * all the names.
81 */
82 endbuf = buf + strlen (buf);
83
84 if (stat (buf, &statbuf))
85 return -1;
86 if (!S_ISREG (statbuf.st_mode))
87 return (-1);
88
89 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
90 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
91 mode |= 4;
92
93 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
94 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
95 mode |= 2;
96
97 return (mode);
98}
99 31
100/* This rolls up wall, blocks_magic, blocks_view, etc, all into 32/* This rolls up wall, blocks_magic, blocks_view, etc, all into
101 * one function that just returns a P_.. value (see map.h) 33 * one function that just returns a P_.. value (see map.h)
102 * it will also do map translation for tiled maps, returning 34 * it will also do map translation for tiled maps, returning
103 * new values into newmap, nx, and ny. Any and all of those 35 * new values into newmap, nx, and ny. Any and all of those
… …
233 } 165 }
234 return 0; 166 return 0;
235} 167}
236 168
237/* 169/*
238 * Returns true if the given object can't fit in the given spot. 170 * Returns qthe blocking object if the given object can't fit in the given
239 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
240 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
241 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
242 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
243 * 175 *
244 * While this doesn't call out of map, the get_map_flags does. 176 * While this doesn't call out of map, the get_map_flags does.
245 * 177 *
246 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
247 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
258 * 190 *
259 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
260 * code, we need to have actual object to check its move_type 192 * code, we need to have actual object to check its move_type
261 * against the move_block values. 193 * against the move_block values.
262 */ 194 */
263int 195bool
264ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
265{ 197{
266 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
267 int flag;
268 maptile *m1;
269 sint16 sx, sy;
270
271 if (!ob)
272 {
273 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
274 if (flag & P_OUT_OF_MAP)
275 return P_OUT_OF_MAP;
276
277 /* don't have object, so don't know what types would block */
278 return m1->at (sx, sy).move_block;
279 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
280 201
281 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 202 if (!pos.normalise ())
282 { 203 return 1;
283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
284 204
285 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
286 return P_OUT_OF_MAP; 206
287 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
288 return P_IS_ALIVE; 208 return 1;
289 209
290 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
291 211 * (signifying non-moving objects)
292 /* find_first_free_spot() calls this function. However, often
293 * ob doesn't have any move type (when used to place exits)
294 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
295 */ 213 */
296
297 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
298 continue; 215 continue;
299 216
300 /* Note it is intentional that we check ob - the movement type of the 217 /* Note it is intentional that we check ob - the movement type of the
301 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
302 */ 219 */
303 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
304 return P_NO_PASS; 221 return 1;
305 } 222 }
306 223
307 return 0; 224 return 0;
308} 225}
309 226
… …
327 244
328 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
329 tmp = next; 246 tmp = next;
330 } 247 }
331 248
332 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
333 * carrying. 250 //TODO: remove
334 */ 251 container->update_weight ();
335 sum_weight (container);
336} 252}
337 253
338void 254void
339maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
340{ 256{
… …
342 return; 258 return;
343 259
344 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 260 for (mapspace *ms = spaces + size (); ms-- > spaces; )
345 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 261 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
346 tmp->flag [flag] = value; 262 tmp->flag [flag] = value;
263}
264
265void
266maptile::post_load_original ()
267{
268 if (!spaces)
269 return;
270
271 set_object_flag (FLAG_OBJ_ORIGINAL);
272
273 for (mapspace *ms = spaces + size (); ms-- > spaces; )
274 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275 INVOKE_OBJECT (RESET, tmp);
347} 276}
348 277
349/* link_multipart_objects go through all the objects on the map looking 278/* link_multipart_objects go through all the objects on the map looking
350 * for objects whose arch says they are multipart yet according to the 279 * for objects whose arch says they are multipart yet according to the
351 * info we have, they only have the head (as would be expected when 280 * info we have, they only have the head (as would be expected when
… …
356{ 285{
357 if (!spaces) 286 if (!spaces)
358 return; 287 return;
359 288
360 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 289 for (mapspace *ms = spaces + size (); ms-- > spaces; )
361 for (object *op = ms->bot; op; op = op->above) 290 {
291 object *op = ms->bot;
292 while (op)
362 { 293 {
363 /* already multipart - don't do anything more */ 294 /* already multipart - don't do anything more */
364 if (op->head_ () == op && !op->more && op->arch->more) 295 if (op->head_ () == op && !op->more && op->arch->more)
365 { 296 {
366 op->remove (); 297 op->remove ();
367 op->expand_tail (); 298 op->expand_tail ();
299
300 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
301 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
302 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 303 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
304
305 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
306 // so we have to reset the iteration through the mapspace
369 } 307 }
308 else
309 op = op->above;
370 } 310 }
311 }
371} 312}
372 313
373/* 314/*
374 * Loads (ands parses) the objects into a given map from the specified 315 * Loads (ands parses) the objects into a given map from the specified
375 * file pointer. 316 * file pointer.
… …
377bool 318bool
378maptile::_load_objects (object_thawer &f) 319maptile::_load_objects (object_thawer &f)
379{ 320{
380 for (;;) 321 for (;;)
381 { 322 {
382 coroapi::cede_to_tick_every (100); // cede once in a while 323 coroapi::cede_to_tick (); // cede once in a while
383 324
384 switch (f.kw) 325 switch (f.kw)
385 { 326 {
386 case KW_arch: 327 case KW_arch:
387 if (object *op = object::read (f, this)) 328 if (object *op = object::read (f, this))
388 { 329 {
330 // TODO: why?
389 if (op->inv) 331 if (op->inv)
390 sum_weight (op); 332 op->update_weight ();
391 333
392 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 334 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335 {
336 // we insert manually because
337 // a) its way faster
338 // b) we remove manually, too, and there are good reasons for that
339 // c) its correct
340 mapspace &ms = at (op->x, op->y);
341
342 op->flag [FLAG_REMOVED] = false;
343
344 op->above = 0;
345 op->below = ms.top;
346
347 if (ms.top)
348 ms.top->above = op;
349 else
350 ms.bot = op;
351
352 ms.top = op;
353 ms.flags_ = 0;
354 }
355 else
356 {
357 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
358 op->destroy ();
359 }
393 } 360 }
394 361
395 continue; 362 continue;
396 363
397 case KW_EOF: 364 case KW_EOF:
… …
410} 377}
411 378
412void 379void
413maptile::activate () 380maptile::activate ()
414{ 381{
415 active = true;
416
417 if (spaces) 382 if (spaces)
418 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 383 for (mapspace *ms = spaces + size (); ms-- > spaces; )
419 for (object *op = ms->bot; op; op = op->above) 384 for (object *op = ms->bot; op; op = op->above)
420 op->activate_recursive (); 385 op->activate_recursive ();
421} 386}
422 387
423void 388void
424maptile::deactivate () 389maptile::deactivate ()
425{ 390{
426 active = false;
427
428 if (spaces) 391 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 392 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 393 for (object *op = ms->bot; op; op = op->above)
431 op->deactivate_recursive (); 394 op->deactivate_recursive ();
432} 395}
… …
442 if (!spaces) 405 if (!spaces)
443 return false; 406 return false;
444 407
445 for (int i = 0; i < size (); ++i) 408 for (int i = 0; i < size (); ++i)
446 { 409 {
447 int unique = 0; 410 bool unique = 0;
411
448 for (object *op = spaces [i].bot; op; op = op->above) 412 for (object *op = spaces [i].bot; op; op = op->above)
449 { 413 {
450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 414 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
451 unique = 1;
452 415
453 if (!op->can_map_save ()) 416 if (expect_false (!op->can_map_save ()))
454 continue; 417 continue;
455 418
456 if (unique || op->flag [FLAG_UNIQUE]) 419 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
457 { 420 {
458 if (flags & IO_UNIQUES) 421 if (flags & IO_UNIQUES)
459 op->write (f); 422 op->write (f);
460 } 423 }
461 else if (flags & IO_OBJECTS) 424 else if (expect_true (flags & IO_OBJECTS))
462 op->write (f); 425 op->write (f);
463 } 426 }
464 } 427 }
465 428
466 coroapi::cede_to_tick (); 429 coroapi::cede_to_tick ();
467 430
468 return true; 431 return true;
469}
470
471bool
472maptile::_load_objects (const char *path, bool skip_header)
473{
474 object_thawer f (path);
475
476 if (!f)
477 return false;
478
479 f.next ();
480
481 if (skip_header)
482 for (;;)
483 {
484 keyword kw = f.kw;
485 f.skip ();
486 if (kw == KW_end)
487 break;
488 }
489
490 return _load_objects (f);
491} 432}
492 433
493bool 434bool
494maptile::_save_objects (const char *path, int flags) 435maptile::_save_objects (const char *path, int flags)
495{ 436{
… …
670bool 611bool
671maptile::_load_header (object_thawer &thawer) 612maptile::_load_header (object_thawer &thawer)
672{ 613{
673 for (;;) 614 for (;;)
674 { 615 {
675 thawer.next ();
676
677 switch (thawer.kw) 616 switch (thawer.kw)
678 { 617 {
679 case KW_msg: 618 case KW_msg:
680 thawer.get_ml (KW_endmsg, msg); 619 thawer.get_ml (KW_endmsg, msg);
681 break; 620 break;
… …
715 case KW_sky: thawer.get (sky); break; 654 case KW_sky: thawer.get (sky); break;
716 655
717 case KW_per_player: thawer.get (per_player); break; 656 case KW_per_player: thawer.get (per_player); break;
718 case KW_per_party: thawer.get (per_party); break; 657 case KW_per_party: thawer.get (per_party); break;
719 case KW_no_reset: thawer.get (no_reset); break; 658 case KW_no_reset: thawer.get (no_reset); break;
659 case KW_no_drop: thawer.get (no_drop); break;
720 660
721 case KW_region: default_region = region::find (thawer.get_str ()); break; 661 case KW_region: default_region = region::find (thawer.get_str ()); break;
722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 662 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
723 663
724 // old names new names 664 // old names new names
… …
735 case KW_tile_path_1: thawer.get (tile_path [0]); break; 675 case KW_tile_path_1: thawer.get (tile_path [0]); break;
736 case KW_tile_path_2: thawer.get (tile_path [1]); break; 676 case KW_tile_path_2: thawer.get (tile_path [1]); break;
737 case KW_tile_path_3: thawer.get (tile_path [2]); break; 677 case KW_tile_path_3: thawer.get (tile_path [2]); break;
738 case KW_tile_path_4: thawer.get (tile_path [3]); break; 678 case KW_tile_path_4: thawer.get (tile_path [3]); break;
739 679
680 case KW_ERROR:
681 set_key_text (thawer.kw_str, thawer.value);
682 break;
683
740 case KW_end: 684 case KW_end:
685 thawer.next ();
741 return true; 686 return true;
742 687
743 default: 688 default:
744 if (!thawer.parse_error ("map", 0)) 689 if (!thawer.parse_error ("map", 0))
745 return false; 690 return false;
746 break; 691 break;
747 } 692 }
693
694 thawer.next ();
748 } 695 }
749 696
750 abort (); 697 abort ();
751}
752
753bool
754maptile::_load_header (const char *path)
755{
756 object_thawer thawer (path);
757
758 if (!thawer)
759 return false;
760
761 return _load_header (thawer);
762} 698}
763 699
764/****************************************************************************** 700/******************************************************************************
765 * This is the start of unique map handling code 701 * This is the start of unique map handling code
766 *****************************************************************************/ 702 *****************************************************************************/
… …
778 714
779 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 715 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
780 unique = 1; 716 unique = 1;
781 717
782 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 718 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
783 {
784 op->destroy_inv (false);
785 op->destroy (); 719 op->destroy ();
786 }
787 720
788 op = above; 721 op = above;
789 } 722 }
790 } 723 }
791} 724}
… …
802 MAP_OUT (swap_time); 735 MAP_OUT (swap_time);
803 MAP_OUT (reset_time); 736 MAP_OUT (reset_time);
804 MAP_OUT (reset_timeout); 737 MAP_OUT (reset_timeout);
805 MAP_OUT (fixed_resettime); 738 MAP_OUT (fixed_resettime);
806 MAP_OUT (no_reset); 739 MAP_OUT (no_reset);
740 MAP_OUT (no_drop);
807 MAP_OUT (difficulty); 741 MAP_OUT (difficulty);
808 742
809 if (default_region) MAP_OUT2 (region, default_region->name); 743 if (default_region) MAP_OUT2 (region, default_region->name);
810 744
811 if (shopitems) 745 if (shopitems)
… …
865 * Remove and free all objects in the given map. 799 * Remove and free all objects in the given map.
866 */ 800 */
867void 801void
868maptile::clear () 802maptile::clear ()
869{ 803{
870 sfree (regions, size ()), regions = 0;
871 free (regionmap), regionmap = 0;
872
873 if (spaces) 804 if (spaces)
874 { 805 {
875 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 806 for (mapspace *ms = spaces + size (); ms-- > spaces; )
876 while (object *op = ms->bot) 807 while (object *op = ms->bot)
877 { 808 {
809 // manually remove, as to not trigger anything
810 if (ms->bot = op->above)
811 ms->bot->below = 0;
812
813 op->flag [FLAG_REMOVED] = true;
814
878 op = op->head_ (); 815 object *head = op->head_ ();
879 op->destroy_inv (false); 816 if (op == head)
880 op->destroy (); 817 op->destroy ();
818 else if (head->map != op->map)
819 {
820 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
821 head->destroy ();
822 }
881 } 823 }
882 824
883 sfree (spaces, size ()), spaces = 0; 825 sfree0 (spaces, size ());
884 } 826 }
885 827
886 if (buttons) 828 if (buttons)
887 free_objectlinkpt (buttons), buttons = 0; 829 free_objectlinkpt (buttons), buttons = 0;
830
831 sfree0 (regions, size ());
832 delete [] regionmap; regionmap = 0;
888} 833}
889 834
890void 835void
891maptile::clear_header () 836maptile::clear_header ()
892{ 837{
… …
944 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
945 break; 890 break;
946 891
947 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 892 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
948 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
949 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
950 || QUERY_FLAG (op, FLAG_UNIQUE) 894 || QUERY_FLAG (op, FLAG_UNIQUE)
951 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 895 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
952 || QUERY_FLAG (op, FLAG_UNPAID) 896 || QUERY_FLAG (op, FLAG_UNPAID)
953 || op->is_alive ()) 897 || op->is_alive ())
954 ; // do not decay 898 ; // do not decay
… …
1021/* 965/*
1022 * This routine is supposed to find out the difficulty of the map. 966 * This routine is supposed to find out the difficulty of the map.
1023 * difficulty does not have a lot to do with character level, 967 * difficulty does not have a lot to do with character level,
1024 * but does have a lot to do with treasure on the map. 968 * but does have a lot to do with treasure on the map.
1025 * 969 *
1026 * Difficulty can now be set by the map creature. If the value stored 970 * Difficulty can now be set by the map creator. If the value stored
1027 * in the map is zero, then use this routine. Maps should really 971 * in the map is zero, then use this routine. Maps should really
1028 * have a difficulty set than using this function - human calculation 972 * have a difficulty set rather than using this function - human calculation
1029 * is much better than this functions guesswork. 973 * is much better than this function's guesswork.
1030 */ 974 */
1031int 975int
1032maptile::estimate_difficulty () const 976maptile::estimate_difficulty () const
1033{ 977{
1034 long monster_cnt = 0; 978 long monster_cnt = 0;
… …
1046 990
1047 if (QUERY_FLAG (op, FLAG_GENERATOR)) 991 if (QUERY_FLAG (op, FLAG_GENERATOR))
1048 { 992 {
1049 total_exp += op->stats.exp; 993 total_exp += op->stats.exp;
1050 994
1051 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 995 if (archetype *at = op->other_arch)
996 {
1052 total_exp += at->stats.exp * 8; 997 total_exp += at->stats.exp * 8;
1053
1054 monster_cnt++; 998 monster_cnt++;
999 }
1000
1001 for (object *inv = op->inv; inv; inv = inv->below)
1002 {
1003 total_exp += op->stats.exp * 8;
1004 monster_cnt++;
1005 }
1055 } 1006 }
1056 } 1007 }
1057 1008
1058 avgexp = (double) total_exp / monster_cnt; 1009 avgexp = (double) total_exp / monster_cnt;
1059 1010
… …
1098 else 1049 else
1099 darkness = new_level; 1050 darkness = new_level;
1100 1051
1101 /* All clients need to get re-updated for the change */ 1052 /* All clients need to get re-updated for the change */
1102 update_all_map_los (this); 1053 update_all_map_los (this);
1054
1103 return 1; 1055 return 1;
1104} 1056}
1105 1057
1106/* 1058/*
1107 * This function updates various attributes about a specific space 1059 * This function updates various attributes about a specific space
… …
1110 * through, etc) 1062 * through, etc)
1111 */ 1063 */
1112void 1064void
1113mapspace::update_ () 1065mapspace::update_ ()
1114{ 1066{
1115 object *tmp, *last = 0; 1067 object *last = 0;
1116 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1068 uint8 flags = P_UPTODATE, anywhere = 0;
1069 sint8 light = 0;
1117 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1070 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1118 1071
1119 //object *middle = 0; 1072 //object *middle = 0;
1120 //object *top = 0; 1073 //object *top = 0;
1121 //object *floor = 0; 1074 //object *floor = 0;
1122 // this seems to generate better code than using locals, above 1075 // this seems to generate better code than using locals, above
1123 object *&top = faces_obj[0] = 0; 1076 object *&top = faces_obj[0] = 0;
1124 object *&middle = faces_obj[1] = 0; 1077 object *&middle = faces_obj[1] = 0;
1125 object *&floor = faces_obj[2] = 0; 1078 object *&floor = faces_obj[2] = 0;
1126 1079
1127 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1080 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1128 { 1081 {
1129 /* This could be made additive I guess (two lights better than 1082 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1130 * one). But if so, it shouldn't be a simple additive - 2
1131 * light bulbs do not illuminate twice as far as once since
1132 * it is a dissapation factor that is cubed.
1133 */
1134 if (tmp->glow_radius > light)
1135 light = tmp->glow_radius; 1083 light += tmp->glow_radius;
1136 1084
1137 /* This call is needed in order to update objects the player 1085 /* This call is needed in order to update objects the player
1138 * is standing in that have animations (ie, grass, fire, etc). 1086 * is standing in that have animations (ie, grass, fire, etc).
1139 * However, it also causes the look window to be re-drawn 1087 * However, it also causes the look window to be re-drawn
1140 * 3 times each time the player moves, because many of the 1088 * 3 times each time the player moves, because many of the
… …
1159 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1107 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1160 { 1108 {
1161 middle = tmp; 1109 middle = tmp;
1162 anywhere = 1; 1110 anywhere = 1;
1163 } 1111 }
1112
1164 /* Find the highest visible face around. If equal 1113 /* Find the highest visible face around. If equal
1165 * visibilities, we still want the one nearer to the 1114 * visibilities, we still want the one nearer to the
1166 * top 1115 * top
1167 */ 1116 */
1168 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1117 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1187 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1136 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1188 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1137 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1189 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1138 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1190 } 1139 }
1191 1140
1192 this->light = light; 1141 this->light = min (light, MAX_LIGHT_RADIUS);
1193 this->flags_ = flags; 1142 this->flags_ = flags;
1194 this->move_block = move_block & ~move_allow; 1143 this->move_block = move_block & ~move_allow;
1195 this->move_on = move_on; 1144 this->move_on = move_on;
1196 this->move_off = move_off; 1145 this->move_off = move_off;
1197 this->move_slow = move_slow; 1146 this->move_slow = move_slow;
… …
1217 * 1) top face is set, need middle to be set. 1166 * 1) top face is set, need middle to be set.
1218 * 2) middle is set, need to set top. 1167 * 2) middle is set, need to set top.
1219 * 3) neither middle or top is set - need to set both. 1168 * 3) neither middle or top is set - need to set both.
1220 */ 1169 */
1221 1170
1222 for (tmp = last; tmp; tmp = tmp->below) 1171 for (object *tmp = last; tmp; tmp = tmp->below)
1223 { 1172 {
1224 /* Once we get to a floor, stop, since we already have a floor object */ 1173 /* Once we get to a floor, stop, since we already have a floor object */
1225 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1174 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1226 break; 1175 break;
1227 1176
… …
1279 vol += op->volume (); 1228 vol += op->volume ();
1280 1229
1281 return vol; 1230 return vol;
1282} 1231}
1283 1232
1284/* this updates the orig_map->tile_map[tile_num] value after finding 1233bool
1285 * the map. It also takes care of linking back the freshly found 1234maptile::tile_available (int dir, bool load)
1286 * maps tile_map values if it tiles back to this one. It returns
1287 * the value of orig_map->tile_map[tile_num].
1288 */
1289static inline maptile *
1290find_and_link (maptile *orig_map, int tile_num)
1291{ 1235{
1292 maptile *mp = orig_map->tile_map [tile_num]; 1236 if (!tile_path[dir])
1237 return 0;
1293 1238
1294 if (!mp) 1239 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1295 { 1240 return 1;
1296 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1297 1241
1298 if (!mp) 1242 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1299 { 1243 return 1;
1300 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1301 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1302 &orig_map->tile_path[tile_num], &orig_map->path);
1303 mp = new maptile (1, 1);
1304 mp->alloc ();
1305 mp->in_memory = MAP_IN_MEMORY;
1306 }
1307 }
1308 1244
1309 int dest_tile = (tile_num + 2) % 4;
1310
1311 orig_map->tile_map [tile_num] = mp;
1312
1313 // optimisation: back-link map to origin map if euclidean
1314 //TODO: non-euclidean maps MUST GO
1315 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1316 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1317
1318 return mp; 1245 return 0;
1319}
1320
1321static inline void
1322load_and_link (maptile *orig_map, int tile_num)
1323{
1324 find_and_link (orig_map, tile_num)->load_sync ();
1325} 1246}
1326 1247
1327/* this returns TRUE if the coordinates (x,y) are out of 1248/* this returns TRUE if the coordinates (x,y) are out of
1328 * map m. This function also takes into account any 1249 * map m. This function also takes into account any
1329 * tiling considerations, loading adjacant maps as needed. 1250 * tiling considerations, loading adjacant maps as needed.
… …
1342 if (!m) 1263 if (!m)
1343 return 0; 1264 return 0;
1344 1265
1345 if (x < 0) 1266 if (x < 0)
1346 { 1267 {
1347 if (!m->tile_path[3]) 1268 if (!m->tile_available (3))
1348 return 1; 1269 return 1;
1349 1270
1350 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1351 find_and_link (m, 3);
1352
1353 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1271 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1354 } 1272 }
1355 1273
1356 if (x >= m->width) 1274 if (x >= m->width)
1357 { 1275 {
1358 if (!m->tile_path[1]) 1276 if (!m->tile_available (1))
1359 return 1; 1277 return 1;
1360 1278
1361 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1362 find_and_link (m, 1);
1363
1364 return out_of_map (m->tile_map[1], x - m->width, y); 1279 return out_of_map (m->tile_map[1], x - m->width, y);
1365 } 1280 }
1366 1281
1367 if (y < 0) 1282 if (y < 0)
1368 { 1283 {
1369 if (!m->tile_path[0]) 1284 if (!m->tile_available (0))
1370 return 1; 1285 return 1;
1371 1286
1372 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1373 find_and_link (m, 0);
1374
1375 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1287 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1376 } 1288 }
1377 1289
1378 if (y >= m->height) 1290 if (y >= m->height)
1379 { 1291 {
1380 if (!m->tile_path[2]) 1292 if (!m->tile_available (2))
1381 return 1; 1293 return 1;
1382
1383 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1384 find_and_link (m, 2);
1385 1294
1386 return out_of_map (m->tile_map[2], x, y - m->height); 1295 return out_of_map (m->tile_map[2], x, y - m->height);
1387 } 1296 }
1388 1297
1389 /* Simple case - coordinates are within this local 1298 /* Simple case - coordinates are within this local
… …
1403maptile * 1312maptile *
1404maptile::xy_find (sint16 &x, sint16 &y) 1313maptile::xy_find (sint16 &x, sint16 &y)
1405{ 1314{
1406 if (x < 0) 1315 if (x < 0)
1407 { 1316 {
1408 if (!tile_path[3]) 1317 if (!tile_available (3))
1409 return 0; 1318 return 0;
1410 1319
1411 find_and_link (this, 3);
1412 x += tile_map[3]->width; 1320 x += tile_map[3]->width;
1413 return tile_map[3]->xy_find (x, y); 1321 return tile_map[3]->xy_find (x, y);
1414 } 1322 }
1415 1323
1416 if (x >= width) 1324 if (x >= width)
1417 { 1325 {
1418 if (!tile_path[1]) 1326 if (!tile_available (1))
1419 return 0; 1327 return 0;
1420 1328
1421 find_and_link (this, 1);
1422 x -= width; 1329 x -= width;
1423 return tile_map[1]->xy_find (x, y); 1330 return tile_map[1]->xy_find (x, y);
1424 } 1331 }
1425 1332
1426 if (y < 0) 1333 if (y < 0)
1427 { 1334 {
1428 if (!tile_path[0]) 1335 if (!tile_available (0))
1429 return 0; 1336 return 0;
1430 1337
1431 find_and_link (this, 0);
1432 y += tile_map[0]->height; 1338 y += tile_map[0]->height;
1433 return tile_map[0]->xy_find (x, y); 1339 return tile_map[0]->xy_find (x, y);
1434 } 1340 }
1435 1341
1436 if (y >= height) 1342 if (y >= height)
1437 { 1343 {
1438 if (!tile_path[2]) 1344 if (!tile_available (2))
1439 return 0; 1345 return 0;
1440 1346
1441 find_and_link (this, 2);
1442 y -= height; 1347 y -= height;
1443 return tile_map[2]->xy_find (x, y); 1348 return tile_map[2]->xy_find (x, y);
1444 } 1349 }
1445 1350
1446 /* Simple case - coordinates are within this local 1351 /* Simple case - coordinates are within this local
… …
1457adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1362adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1458{ 1363{
1459 if (!map1 || !map2) 1364 if (!map1 || !map2)
1460 return 0; 1365 return 0;
1461 1366
1462 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1367 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1463 //fix: compare paths instead (this is likely faster, too!) 1368 //fix: compare paths instead (this is likely faster, too!)
1464 if (map1 == map2) 1369 if (map1 == map2)
1465 { 1370 {
1466 *dx = 0; 1371 *dx = 0;
1467 *dy = 0; 1372 *dy = 0;
… …
1674} 1579}
1675 1580
1676object * 1581object *
1677maptile::insert (object *op, int x, int y, object *originator, int flags) 1582maptile::insert (object *op, int x, int y, object *originator, int flags)
1678{ 1583{
1679 if (!op->flag [FLAG_REMOVED])
1680 op->remove ();
1681
1682 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1584 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1683} 1585}
1684 1586
1685region * 1587region *
1686maptile::region (int x, int y) const 1588maptile::region (int x, int y) const
… …
1696 1598
1697 return ::region::default_region (); 1599 return ::region::default_region ();
1698} 1600}
1699 1601
1700/* picks a random object from a style map. 1602/* picks a random object from a style map.
1701 * Redone by MSW so it should be faster and not use static
1702 * variables to generate tables.
1703 */ 1603 */
1704object * 1604object *
1705maptile::pick_random_object () const 1605maptile::pick_random_object (rand_gen &gen) const
1706{ 1606{
1707 /* while returning a null object will result in a crash, that 1607 /* while returning a null object will result in a crash, that
1708 * is actually preferable to an infinite loop. That is because 1608 * is actually preferable to an infinite loop. That is because
1709 * most servers will automatically restart in case of crash. 1609 * most servers will automatically restart in case of crash.
1710 * Change the logic on getting the random space - shouldn't make 1610 * Change the logic on getting the random space - shouldn't make
1711 * any difference, but this seems clearer to me. 1611 * any difference, but this seems clearer to me.
1712 */ 1612 */
1713 for (int i = 1000; --i;) 1613 for (int i = 1000; --i;)
1714 { 1614 {
1715 object *pick = at (rndm (width), rndm (height)).bot; 1615 object *pick = at (gen (width), gen (height)).bot;
1716 1616
1717 // do not prefer big monsters just because they are big. 1617 // do not prefer big monsters just because they are big.
1718 if (pick && pick->head_ () == pick) 1618 if (pick && pick->is_head ())
1719 return pick->head_ (); 1619 return pick->head_ ();
1720 } 1620 }
1721 1621
1722 // instead of crashing in the unlikely(?) case, try to return *something* 1622 // instead of crashing in the unlikely(?) case, try to return *something*
1723 return get_archetype ("blocked"); 1623 return archetype::find ("bug");
1724} 1624}
1725 1625
1626void
1627maptile::play_sound (faceidx sound, int x, int y) const
1628{
1629 if (!sound)
1630 return;
1631
1632 for_all_players_on_map (pl, this)
1633 if (client *ns = pl->ns)
1634 {
1635 int dx = x - pl->ob->x;
1636 int dy = y - pl->ob->y;
1637
1638 int distance = idistance (dx, dy);
1639
1640 if (distance <= MAX_SOUND_DISTANCE)
1641 ns->play_sound (sound, dx, dy);
1642 }
1643}
1644

Diff Legend

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