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.112 by root, Thu Jul 12 18:48:20 2007 UTC vs.
Revision 1.147 by root, Mon Sep 29 10:20:48 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 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 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h" 27#include "loader.h"
30
31#include "path.h" 28#include "path.h"
32
33/*
34 * This makes a path absolute outside the world of Crossfire.
35 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
36 * and returns the pointer to a static array containing the result.
37 * it really should be called create_mapname
38 */
39const char *
40create_pathname (const char *name)
41{
42 static char buf[8192];
43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
44 return buf;
45}
46
47/*
48 * This function checks if a file with the given path exists.
49 * -1 is returned if it fails, otherwise the mode of the file
50 * is returned.
51 * It tries out all the compression suffixes listed in the uncomp[] array.
52 *
53 * If prepend_dir is set, then we call create_pathname (which prepends
54 * libdir & mapdir). Otherwise, we assume the name given is fully
55 * complete.
56 * Only the editor actually cares about the writablity of this -
57 * the rest of the code only cares that the file is readable.
58 * when the editor goes away, the call to stat should probably be
59 * replaced by an access instead (similar to the windows one, but
60 * that seems to be missing the prepend_dir processing
61 */
62int
63check_path (const char *name, int prepend_dir)
64{
65 char buf[MAX_BUF];
66
67 char *endbuf;
68 struct stat statbuf;
69 int mode = 0;
70
71 if (prepend_dir)
72 assign (buf, create_pathname (name));
73 else
74 assign (buf, name);
75
76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through
79 * all the names.
80 */
81 endbuf = buf + strlen (buf);
82
83 if (stat (buf, &statbuf))
84 return -1;
85 if (!S_ISREG (statbuf.st_mode))
86 return (-1);
87
88 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
89 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
90 mode |= 4;
91
92 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
93 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
94 mode |= 2;
95
96 return (mode);
97}
98 29
99/* This rolls up wall, blocks_magic, blocks_view, etc, all into 30/* This rolls up wall, blocks_magic, blocks_view, etc, all into
100 * one function that just returns a P_.. value (see map.h) 31 * one function that just returns a P_.. value (see map.h)
101 * it will also do map translation for tiled maps, returning 32 * it will also do map translation for tiled maps, returning
102 * new values into newmap, nx, and ny. Any and all of those 33 * new values into newmap, nx, and ny. Any and all of those
… …
232 } 163 }
233 return 0; 164 return 0;
234} 165}
235 166
236/* 167/*
237 * Returns true if the given object can't fit in the given spot. 168 * Returns qthe blocking object if the given object can't fit in the given
238 * This is meant for multi space objects - for single space objecs, 169 * spot. This is meant for multi space objects - for single space objecs,
239 * just calling get_map_blocked and checking that against movement type 170 * just calling get_map_blocked and checking that against movement type
240 * of object. This function goes through all the parts of the 171 * of object. This function goes through all the parts of the multipart
241 * multipart object and makes sure they can be inserted. 172 * object and makes sure they can be inserted.
242 * 173 *
243 * While this doesn't call out of map, the get_map_flags does. 174 * While this doesn't call out of map, the get_map_flags does.
244 * 175 *
245 * This function has been used to deprecate arch_out_of_map - 176 * This function has been used to deprecate arch_out_of_map -
246 * this function also does that check, and since in most cases, 177 * this function also does that check, and since in most cases,
… …
257 * 188 *
258 * Note this used to be arch_blocked, but with new movement 189 * Note this used to be arch_blocked, but with new movement
259 * code, we need to have actual object to check its move_type 190 * code, we need to have actual object to check its move_type
260 * against the move_block values. 191 * against the move_block values.
261 */ 192 */
262int 193bool
263ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 194object::blocked (maptile *m, int x, int y) const
264{ 195{
265 archetype *tmp; 196 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
266 int flag;
267 maptile *m1;
268 sint16 sx, sy;
269
270 if (!ob)
271 {
272 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
273 if (flag & P_OUT_OF_MAP)
274 return P_OUT_OF_MAP;
275
276 /* don't have object, so don't know what types would block */
277 return m1->at (sx, sy).move_block;
278 } 197 {
198 mapxy pos (m, x + tmp->x, y + tmp->y);
279 199
280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 200 if (!pos.normalise ())
281 { 201 return 1;
282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
283 202
284 if (flag & P_OUT_OF_MAP) 203 mapspace &ms = *pos;
285 return P_OUT_OF_MAP; 204
286 if (flag & P_IS_ALIVE) 205 if (ms.flags () & P_IS_ALIVE)
287 return P_IS_ALIVE; 206 return 1;
288 207
289 mapspace &ms = m1->at (sx, sy); 208 /* However, often ob doesn't have any move type
290 209 * (signifying non-moving objects)
291 /* find_first_free_spot() calls this function. However, often
292 * ob doesn't have any move type (when used to place exits)
293 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 210 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
294 */ 211 */
295
296 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 212 if (!move_type && ms.move_block != MOVE_ALL)
297 continue; 213 continue;
298 214
299 /* Note it is intentional that we check ob - the movement type of the 215 /* Note it is intentional that we check ob - the movement type of the
300 * head of the object should correspond for the entire object. 216 * head of the object should correspond for the entire object.
301 */ 217 */
302 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 218 if (ms.blocks (move_type))
303 return P_NO_PASS; 219 return 1;
304 } 220 }
305 221
306 return 0; 222 return 0;
307} 223}
308 224
… …
326 242
327 insert_ob_in_ob (tmp, container); 243 insert_ob_in_ob (tmp, container);
328 tmp = next; 244 tmp = next;
329 } 245 }
330 246
331 /* sum_weight will go through and calculate what all the containers are 247 // go through and calculate what all the containers are carrying.
332 * carrying. 248 //TODO: remove
333 */ 249 container->update_weight ();
334 sum_weight (container);
335} 250}
336 251
337void 252void
338maptile::set_object_flag (int flag, int value) 253maptile::set_object_flag (int flag, int value)
339{ 254{
… …
341 return; 256 return;
342 257
343 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 258 for (mapspace *ms = spaces + size (); ms-- > spaces; )
344 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 259 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
345 tmp->flag [flag] = value; 260 tmp->flag [flag] = value;
261}
262
263void
264maptile::post_load_original ()
265{
266 if (!spaces)
267 return;
268
269 set_object_flag (FLAG_OBJ_ORIGINAL);
270
271 for (mapspace *ms = spaces + size (); ms-- > spaces; )
272 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273 INVOKE_OBJECT (RESET, tmp);
346} 274}
347 275
348/* link_multipart_objects go through all the objects on the map looking 276/* link_multipart_objects go through all the objects on the map looking
349 * for objects whose arch says they are multipart yet according to the 277 * for objects whose arch says they are multipart yet according to the
350 * info we have, they only have the head (as would be expected when 278 * info we have, they only have the head (as would be expected when
… …
388bool 316bool
389maptile::_load_objects (object_thawer &f) 317maptile::_load_objects (object_thawer &f)
390{ 318{
391 for (;;) 319 for (;;)
392 { 320 {
393 coroapi::cede_to_tick_every (100); // cede once in a while 321 coroapi::cede_to_tick (); // cede once in a while
394 322
395 switch (f.kw) 323 switch (f.kw)
396 { 324 {
397 case KW_arch: 325 case KW_arch:
398 if (object *op = object::read (f, this)) 326 if (object *op = object::read (f, this))
399 { 327 {
328 // TODO: why?
400 if (op->inv) 329 if (op->inv)
401 sum_weight (op); 330 op->update_weight ();
402 331
403 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 332 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
333 {
334 // we insert manually because
335 // a) its way faster
336 // b) we remove manually, too, and there are good reasons for that
337 // c) its correct
338 mapspace &ms = at (op->x, op->y);
339
340 op->flag [FLAG_REMOVED] = false;
341
342 op->above = 0;
343 op->below = ms.top;
344
345 if (ms.top)
346 ms.top->above = op;
347 else
348 ms.bot = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy_inv (false); // be explicit about dropping
357 op->destroy (true);
358 }
404 } 359 }
405 360
406 continue; 361 continue;
407 362
408 case KW_EOF: 363 case KW_EOF:
… …
421} 376}
422 377
423void 378void
424maptile::activate () 379maptile::activate ()
425{ 380{
426 active = true;
427
428 if (spaces) 381 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
431 op->activate_recursive (); 384 op->activate_recursive ();
432} 385}
433 386
434void 387void
435maptile::deactivate () 388maptile::deactivate ()
436{ 389{
437 active = false;
438
439 if (spaces) 390 if (spaces)
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 391 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 392 for (object *op = ms->bot; op; op = op->above)
442 op->deactivate_recursive (); 393 op->deactivate_recursive ();
443} 394}
… …
453 if (!spaces) 404 if (!spaces)
454 return false; 405 return false;
455 406
456 for (int i = 0; i < size (); ++i) 407 for (int i = 0; i < size (); ++i)
457 { 408 {
458 int unique = 0; 409 bool unique = 0;
410
459 for (object *op = spaces [i].bot; op; op = op->above) 411 for (object *op = spaces [i].bot; op; op = op->above)
460 { 412 {
461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 413 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
462 unique = 1;
463 414
464 if (!op->can_map_save ()) 415 if (expect_false (!op->can_map_save ()))
465 continue; 416 continue;
466 417
467 if (unique || op->flag [FLAG_UNIQUE]) 418 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
468 { 419 {
469 if (flags & IO_UNIQUES) 420 if (flags & IO_UNIQUES)
470 op->write (f); 421 op->write (f);
471 } 422 }
472 else if (flags & IO_OBJECTS) 423 else if (expect_true (flags & IO_OBJECTS))
473 op->write (f); 424 op->write (f);
474 } 425 }
475 } 426 }
476 427
477 coroapi::cede_to_tick (); 428 coroapi::cede_to_tick ();
478 429
479 return true; 430 return true;
480}
481
482bool
483maptile::_load_objects (const char *path, bool skip_header)
484{
485 object_thawer f (path);
486
487 if (!f)
488 return false;
489
490 f.next ();
491
492 if (skip_header)
493 for (;;)
494 {
495 keyword kw = f.kw;
496 f.skip ();
497 if (kw == KW_end)
498 break;
499 }
500
501 return _load_objects (f);
502} 431}
503 432
504bool 433bool
505maptile::_save_objects (const char *path, int flags) 434maptile::_save_objects (const char *path, int flags)
506{ 435{
… …
681bool 610bool
682maptile::_load_header (object_thawer &thawer) 611maptile::_load_header (object_thawer &thawer)
683{ 612{
684 for (;;) 613 for (;;)
685 { 614 {
686 thawer.next ();
687
688 switch (thawer.kw) 615 switch (thawer.kw)
689 { 616 {
690 case KW_msg: 617 case KW_msg:
691 thawer.get_ml (KW_endmsg, msg); 618 thawer.get_ml (KW_endmsg, msg);
692 break; 619 break;
… …
726 case KW_sky: thawer.get (sky); break; 653 case KW_sky: thawer.get (sky); break;
727 654
728 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
729 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break; 657 case KW_no_reset: thawer.get (no_reset); break;
658 case KW_no_drop: thawer.get (no_drop); break;
731 659
732 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: default_region = region::find (thawer.get_str ()); break;
733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
734 662
735 // old names new names 663 // old names new names
… …
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 678
751 case KW_ERROR: 679 case KW_ERROR:
752 set_key (thawer.kw_str, thawer.value); 680 set_key_text (thawer.kw_str, thawer.value);
753 break; 681 break;
754 682
755 case KW_end: 683 case KW_end:
684 thawer.next ();
756 return true; 685 return true;
757 686
758 default: 687 default:
759 if (!thawer.parse_error ("map", 0)) 688 if (!thawer.parse_error ("map", 0))
760 return false; 689 return false;
761 break; 690 break;
762 } 691 }
692
693 thawer.next ();
763 } 694 }
764 695
765 abort (); 696 abort ();
766}
767
768bool
769maptile::_load_header (const char *path)
770{
771 object_thawer thawer (path);
772
773 if (!thawer)
774 return false;
775
776 return _load_header (thawer);
777} 697}
778 698
779/****************************************************************************** 699/******************************************************************************
780 * This is the start of unique map handling code 700 * This is the start of unique map handling code
781 *****************************************************************************/ 701 *****************************************************************************/
… …
795 unique = 1; 715 unique = 1;
796 716
797 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 717 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
798 { 718 {
799 op->destroy_inv (false); 719 op->destroy_inv (false);
800 op->destroy (); 720 op->destroy (true);
801 } 721 }
802 722
803 op = above; 723 op = above;
804 } 724 }
805 } 725 }
… …
817 MAP_OUT (swap_time); 737 MAP_OUT (swap_time);
818 MAP_OUT (reset_time); 738 MAP_OUT (reset_time);
819 MAP_OUT (reset_timeout); 739 MAP_OUT (reset_timeout);
820 MAP_OUT (fixed_resettime); 740 MAP_OUT (fixed_resettime);
821 MAP_OUT (no_reset); 741 MAP_OUT (no_reset);
742 MAP_OUT (no_drop);
822 MAP_OUT (difficulty); 743 MAP_OUT (difficulty);
823 744
824 if (default_region) MAP_OUT2 (region, default_region->name); 745 if (default_region) MAP_OUT2 (region, default_region->name);
825 746
826 if (shopitems) 747 if (shopitems)
… …
880 * Remove and free all objects in the given map. 801 * Remove and free all objects in the given map.
881 */ 802 */
882void 803void
883maptile::clear () 804maptile::clear ()
884{ 805{
885 sfree (regions, size ()), regions = 0;
886 free (regionmap), regionmap = 0;
887
888 if (spaces) 806 if (spaces)
889 { 807 {
890 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 808 for (mapspace *ms = spaces + size (); ms-- > spaces; )
891 while (object *op = ms->bot) 809 while (object *op = ms->bot)
892 { 810 {
811 // manually remove, as to not trigger anything
812 if (ms->bot = op->above)
813 ms->bot->below = 0;
814
815 op->flag [FLAG_REMOVED] = true;
816
893 op = op->head_ (); 817 object *head = op->head_ ();
818 if (op == head)
819 {
894 op->destroy_inv (false); 820 op->destroy_inv (false);
895 op->destroy (); 821 op->destroy (true);
822 }
823 else if (head->map != op->map)
824 {
825 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
826 head->destroy (true);
827 }
896 } 828 }
897 829
898 sfree (spaces, size ()), spaces = 0; 830 sfree0 (spaces, size ());
899 } 831 }
900 832
901 if (buttons) 833 if (buttons)
902 free_objectlinkpt (buttons), buttons = 0; 834 free_objectlinkpt (buttons), buttons = 0;
835
836 sfree0 (regions, size ());
837 delete [] regionmap; regionmap = 0;
903} 838}
904 839
905void 840void
906maptile::clear_header () 841maptile::clear_header ()
907{ 842{
… …
959 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 894 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
960 break; 895 break;
961 896
962 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 897 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
963 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 898 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
964 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
965 || QUERY_FLAG (op, FLAG_UNIQUE) 899 || QUERY_FLAG (op, FLAG_UNIQUE)
966 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
967 || QUERY_FLAG (op, FLAG_UNPAID) 901 || QUERY_FLAG (op, FLAG_UNPAID)
968 || op->is_alive ()) 902 || op->is_alive ())
969 ; // do not decay 903 ; // do not decay
… …
1003 destroy = 1; 937 destroy = 1;
1004 } 938 }
1005 939
1006 /* adjust overall chance below */ 940 /* adjust overall chance below */
1007 if (destroy && rndm (0, 1)) 941 if (destroy && rndm (0, 1))
1008 op->destroy (); 942 op->destroy (true);
1009 } 943 }
1010} 944}
1011 945
1012/* 946/*
1013 * Updates every button on the map (by calling update_button() for them). 947 * Updates every button on the map (by calling update_button() for them).
… …
1061 995
1062 if (QUERY_FLAG (op, FLAG_GENERATOR)) 996 if (QUERY_FLAG (op, FLAG_GENERATOR))
1063 { 997 {
1064 total_exp += op->stats.exp; 998 total_exp += op->stats.exp;
1065 999
1066 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1000 if (archetype *at = op->other_arch)
1001 {
1067 total_exp += at->stats.exp * 8; 1002 total_exp += at->stats.exp * 8;
1068
1069 monster_cnt++; 1003 monster_cnt++;
1004 }
1005
1006 for (object *inv = op->inv; inv; inv = inv->below)
1007 {
1008 total_exp += op->stats.exp * 8;
1009 monster_cnt++;
1010 }
1070 } 1011 }
1071 } 1012 }
1072 1013
1073 avgexp = (double) total_exp / monster_cnt; 1014 avgexp = (double) total_exp / monster_cnt;
1074 1015
… …
1113 else 1054 else
1114 darkness = new_level; 1055 darkness = new_level;
1115 1056
1116 /* All clients need to get re-updated for the change */ 1057 /* All clients need to get re-updated for the change */
1117 update_all_map_los (this); 1058 update_all_map_los (this);
1059
1118 return 1; 1060 return 1;
1119} 1061}
1120 1062
1121/* 1063/*
1122 * This function updates various attributes about a specific space 1064 * This function updates various attributes about a specific space
… …
1125 * through, etc) 1067 * through, etc)
1126 */ 1068 */
1127void 1069void
1128mapspace::update_ () 1070mapspace::update_ ()
1129{ 1071{
1130 object *tmp, *last = 0; 1072 object *last = 0;
1131 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1073 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1132 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1074 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1133 1075
1134 //object *middle = 0; 1076 //object *middle = 0;
1135 //object *top = 0; 1077 //object *top = 0;
… …
1137 // this seems to generate better code than using locals, above 1079 // this seems to generate better code than using locals, above
1138 object *&top = faces_obj[0] = 0; 1080 object *&top = faces_obj[0] = 0;
1139 object *&middle = faces_obj[1] = 0; 1081 object *&middle = faces_obj[1] = 0;
1140 object *&floor = faces_obj[2] = 0; 1082 object *&floor = faces_obj[2] = 0;
1141 1083
1142 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1084 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1143 { 1085 {
1144 /* This could be made additive I guess (two lights better than 1086 /* This could be made additive I guess (two lights better than
1145 * one). But if so, it shouldn't be a simple additive - 2 1087 * one). But if so, it shouldn't be a simple additive - 2
1146 * light bulbs do not illuminate twice as far as once since 1088 * light bulbs do not illuminate twice as far as once since
1147 * it is a dissapation factor that is cubed. 1089 * it is a dissapation factor that is cubed.
1148 */ 1090 */
1149 if (tmp->glow_radius > light)
1150 light = tmp->glow_radius; 1091 light = max (light, tmp->glow_radius);
1151 1092
1152 /* This call is needed in order to update objects the player 1093 /* This call is needed in order to update objects the player
1153 * is standing in that have animations (ie, grass, fire, etc). 1094 * is standing in that have animations (ie, grass, fire, etc).
1154 * However, it also causes the look window to be re-drawn 1095 * However, it also causes the look window to be re-drawn
1155 * 3 times each time the player moves, because many of the 1096 * 3 times each time the player moves, because many of the
… …
1174 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1115 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1175 { 1116 {
1176 middle = tmp; 1117 middle = tmp;
1177 anywhere = 1; 1118 anywhere = 1;
1178 } 1119 }
1120
1179 /* Find the highest visible face around. If equal 1121 /* Find the highest visible face around. If equal
1180 * visibilities, we still want the one nearer to the 1122 * visibilities, we still want the one nearer to the
1181 * top 1123 * top
1182 */ 1124 */
1183 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1125 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1232 * 1) top face is set, need middle to be set. 1174 * 1) top face is set, need middle to be set.
1233 * 2) middle is set, need to set top. 1175 * 2) middle is set, need to set top.
1234 * 3) neither middle or top is set - need to set both. 1176 * 3) neither middle or top is set - need to set both.
1235 */ 1177 */
1236 1178
1237 for (tmp = last; tmp; tmp = tmp->below) 1179 for (object *tmp = last; tmp; tmp = tmp->below)
1238 { 1180 {
1239 /* Once we get to a floor, stop, since we already have a floor object */ 1181 /* Once we get to a floor, stop, since we already have a floor object */
1240 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1182 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1241 break; 1183 break;
1242 1184
… …
1294 vol += op->volume (); 1236 vol += op->volume ();
1295 1237
1296 return vol; 1238 return vol;
1297} 1239}
1298 1240
1299/* this updates the orig_map->tile_map[tile_num] value after finding 1241bool
1300 * the map. It also takes care of linking back the freshly found 1242maptile::tile_available (int dir, bool load)
1301 * maps tile_map values if it tiles back to this one. It returns
1302 * the value of orig_map->tile_map[tile_num].
1303 */
1304static inline maptile *
1305find_and_link (maptile *orig_map, int tile_num)
1306{ 1243{
1307 maptile *mp = orig_map->tile_map [tile_num]; 1244 if (!tile_path[dir])
1245 return 0;
1308 1246
1309 if (!mp) 1247 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1310 { 1248 return 1;
1311 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1312 1249
1313 if (!mp) 1250 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1314 { 1251 return 1;
1315 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1316 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1317 &orig_map->tile_path[tile_num], &orig_map->path);
1318 mp = new maptile (1, 1);
1319 mp->alloc ();
1320 mp->in_memory = MAP_IN_MEMORY;
1321 }
1322 }
1323 1252
1324 int dest_tile = (tile_num + 2) % 4;
1325
1326 orig_map->tile_map [tile_num] = mp;
1327
1328 // optimisation: back-link map to origin map if euclidean
1329 //TODO: non-euclidean maps MUST GO
1330 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1331 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1332
1333 return mp; 1253 return 0;
1334}
1335
1336static inline void
1337load_and_link (maptile *orig_map, int tile_num)
1338{
1339 find_and_link (orig_map, tile_num)->load_sync ();
1340} 1254}
1341 1255
1342/* this returns TRUE if the coordinates (x,y) are out of 1256/* this returns TRUE if the coordinates (x,y) are out of
1343 * map m. This function also takes into account any 1257 * map m. This function also takes into account any
1344 * tiling considerations, loading adjacant maps as needed. 1258 * tiling considerations, loading adjacant maps as needed.
… …
1357 if (!m) 1271 if (!m)
1358 return 0; 1272 return 0;
1359 1273
1360 if (x < 0) 1274 if (x < 0)
1361 { 1275 {
1362 if (!m->tile_path[3]) 1276 if (!m->tile_available (3))
1363 return 1; 1277 return 1;
1364 1278
1365 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1366 find_and_link (m, 3);
1367
1368 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1279 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1369 } 1280 }
1370 1281
1371 if (x >= m->width) 1282 if (x >= m->width)
1372 { 1283 {
1373 if (!m->tile_path[1]) 1284 if (!m->tile_available (1))
1374 return 1; 1285 return 1;
1375 1286
1376 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1377 find_and_link (m, 1);
1378
1379 return out_of_map (m->tile_map[1], x - m->width, y); 1287 return out_of_map (m->tile_map[1], x - m->width, y);
1380 } 1288 }
1381 1289
1382 if (y < 0) 1290 if (y < 0)
1383 { 1291 {
1384 if (!m->tile_path[0]) 1292 if (!m->tile_available (0))
1385 return 1; 1293 return 1;
1386 1294
1387 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1388 find_and_link (m, 0);
1389
1390 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1295 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1391 } 1296 }
1392 1297
1393 if (y >= m->height) 1298 if (y >= m->height)
1394 { 1299 {
1395 if (!m->tile_path[2]) 1300 if (!m->tile_available (2))
1396 return 1; 1301 return 1;
1397
1398 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1399 find_and_link (m, 2);
1400 1302
1401 return out_of_map (m->tile_map[2], x, y - m->height); 1303 return out_of_map (m->tile_map[2], x, y - m->height);
1402 } 1304 }
1403 1305
1404 /* Simple case - coordinates are within this local 1306 /* Simple case - coordinates are within this local
… …
1418maptile * 1320maptile *
1419maptile::xy_find (sint16 &x, sint16 &y) 1321maptile::xy_find (sint16 &x, sint16 &y)
1420{ 1322{
1421 if (x < 0) 1323 if (x < 0)
1422 { 1324 {
1423 if (!tile_path[3]) 1325 if (!tile_available (3))
1424 return 0; 1326 return 0;
1425 1327
1426 find_and_link (this, 3);
1427 x += tile_map[3]->width; 1328 x += tile_map[3]->width;
1428 return tile_map[3]->xy_find (x, y); 1329 return tile_map[3]->xy_find (x, y);
1429 } 1330 }
1430 1331
1431 if (x >= width) 1332 if (x >= width)
1432 { 1333 {
1433 if (!tile_path[1]) 1334 if (!tile_available (1))
1434 return 0; 1335 return 0;
1435 1336
1436 find_and_link (this, 1);
1437 x -= width; 1337 x -= width;
1438 return tile_map[1]->xy_find (x, y); 1338 return tile_map[1]->xy_find (x, y);
1439 } 1339 }
1440 1340
1441 if (y < 0) 1341 if (y < 0)
1442 { 1342 {
1443 if (!tile_path[0]) 1343 if (!tile_available (0))
1444 return 0; 1344 return 0;
1445 1345
1446 find_and_link (this, 0);
1447 y += tile_map[0]->height; 1346 y += tile_map[0]->height;
1448 return tile_map[0]->xy_find (x, y); 1347 return tile_map[0]->xy_find (x, y);
1449 } 1348 }
1450 1349
1451 if (y >= height) 1350 if (y >= height)
1452 { 1351 {
1453 if (!tile_path[2]) 1352 if (!tile_available (2))
1454 return 0; 1353 return 0;
1455 1354
1456 find_and_link (this, 2);
1457 y -= height; 1355 y -= height;
1458 return tile_map[2]->xy_find (x, y); 1356 return tile_map[2]->xy_find (x, y);
1459 } 1357 }
1460 1358
1461 /* Simple case - coordinates are within this local 1359 /* Simple case - coordinates are within this local
… …
1472adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1370adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1473{ 1371{
1474 if (!map1 || !map2) 1372 if (!map1 || !map2)
1475 return 0; 1373 return 0;
1476 1374
1477 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1375 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1478 //fix: compare paths instead (this is likely faster, too!) 1376 //fix: compare paths instead (this is likely faster, too!)
1479 if (map1 == map2) 1377 if (map1 == map2)
1480 { 1378 {
1481 *dx = 0; 1379 *dx = 0;
1482 *dy = 0; 1380 *dy = 0;
… …
1689} 1587}
1690 1588
1691object * 1589object *
1692maptile::insert (object *op, int x, int y, object *originator, int flags) 1590maptile::insert (object *op, int x, int y, object *originator, int flags)
1693{ 1591{
1694 if (!op->flag [FLAG_REMOVED])
1695 op->remove ();
1696
1697 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1592 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1698} 1593}
1699 1594
1700region * 1595region *
1701maptile::region (int x, int y) const 1596maptile::region (int x, int y) const
… …
1711 1606
1712 return ::region::default_region (); 1607 return ::region::default_region ();
1713} 1608}
1714 1609
1715/* picks a random object from a style map. 1610/* picks a random object from a style map.
1716 * Redone by MSW so it should be faster and not use static
1717 * variables to generate tables.
1718 */ 1611 */
1719object * 1612object *
1720maptile::pick_random_object () const 1613maptile::pick_random_object (rand_gen &gen) const
1721{ 1614{
1722 /* while returning a null object will result in a crash, that 1615 /* while returning a null object will result in a crash, that
1723 * is actually preferable to an infinite loop. That is because 1616 * is actually preferable to an infinite loop. That is because
1724 * most servers will automatically restart in case of crash. 1617 * most servers will automatically restart in case of crash.
1725 * Change the logic on getting the random space - shouldn't make 1618 * Change the logic on getting the random space - shouldn't make
1726 * any difference, but this seems clearer to me. 1619 * any difference, but this seems clearer to me.
1727 */ 1620 */
1728 for (int i = 1000; --i;) 1621 for (int i = 1000; --i;)
1729 { 1622 {
1730 object *pick = at (rndm (width), rndm (height)).bot; 1623 object *pick = at (gen (width), gen (height)).bot;
1731 1624
1732 // do not prefer big monsters just because they are big. 1625 // do not prefer big monsters just because they are big.
1733 if (pick && pick->head_ () == pick) 1626 if (pick && pick->is_head ())
1734 return pick->head_ (); 1627 return pick->head_ ();
1735 } 1628 }
1736 1629
1737 // instead of crashing in the unlikely(?) case, try to return *something* 1630 // instead of crashing in the unlikely(?) case, try to return *something*
1738 return get_archetype ("blocked"); 1631 return archetype::find ("bug");
1739} 1632}
1740 1633
1634void
1635maptile::play_sound (faceidx sound, int x, int y) const
1636{
1637 if (!sound)
1638 return;
1639
1640 for_all_players (pl)
1641 if (pl->ob->map == this)
1642 if (client *ns = pl->ns)
1643 {
1644 int dx = x - pl->ob->x;
1645 int dy = y - pl->ob->y;
1646
1647 int distance = idistance (dx, dy);
1648
1649 if (distance <= MAX_SOUND_DISTANCE)
1650 ns->play_sound (sound, dx, dy);
1651 }
1652}
1653

Diff Legend

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