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.111 by elmex, Thu Jul 12 18:28:09 2007 UTC vs.
Revision 1.144 by root, Mon Jul 14 16:42: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 ();
357 }
404 } 358 }
405 359
406 continue; 360 continue;
407 361
408 case KW_EOF: 362 case KW_EOF:
… …
421} 375}
422 376
423void 377void
424maptile::activate () 378maptile::activate ()
425{ 379{
426 active = true;
427
428 if (spaces) 380 if (spaces)
429 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 381 for (mapspace *ms = spaces + size (); ms-- > spaces; )
430 for (object *op = ms->bot; op; op = op->above) 382 for (object *op = ms->bot; op; op = op->above)
431 op->activate_recursive (); 383 op->activate_recursive ();
432} 384}
433 385
434void 386void
435maptile::deactivate () 387maptile::deactivate ()
436{ 388{
437 active = false;
438
439 if (spaces) 389 if (spaces)
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 390 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 391 for (object *op = ms->bot; op; op = op->above)
442 op->deactivate_recursive (); 392 op->deactivate_recursive ();
443} 393}
… …
453 if (!spaces) 403 if (!spaces)
454 return false; 404 return false;
455 405
456 for (int i = 0; i < size (); ++i) 406 for (int i = 0; i < size (); ++i)
457 { 407 {
458 int unique = 0; 408 bool unique = 0;
409
459 for (object *op = spaces [i].bot; op; op = op->above) 410 for (object *op = spaces [i].bot; op; op = op->above)
460 { 411 {
461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 412 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
462 unique = 1;
463 413
464 if (!op->can_map_save ()) 414 if (expect_false (!op->can_map_save ()))
465 continue; 415 continue;
466 416
467 if (unique || op->flag [FLAG_UNIQUE]) 417 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
468 { 418 {
469 if (flags & IO_UNIQUES) 419 if (flags & IO_UNIQUES)
470 op->write (f); 420 op->write (f);
471 } 421 }
472 else if (flags & IO_OBJECTS) 422 else if (expect_true (flags & IO_OBJECTS))
473 op->write (f); 423 op->write (f);
474 } 424 }
475 } 425 }
476 426
477 coroapi::cede_to_tick (); 427 coroapi::cede_to_tick ();
478 428
479 return true; 429 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} 430}
503 431
504bool 432bool
505maptile::_save_objects (const char *path, int flags) 433maptile::_save_objects (const char *path, int flags)
506{ 434{
… …
681bool 609bool
682maptile::_load_header (object_thawer &thawer) 610maptile::_load_header (object_thawer &thawer)
683{ 611{
684 for (;;) 612 for (;;)
685 { 613 {
686 thawer.next ();
687
688 switch (thawer.kw) 614 switch (thawer.kw)
689 { 615 {
690 case KW_msg: 616 case KW_msg:
691 thawer.get_ml (KW_endmsg, msg); 617 thawer.get_ml (KW_endmsg, msg);
692 break; 618 break;
… …
726 case KW_sky: thawer.get (sky); break; 652 case KW_sky: thawer.get (sky); break;
727 653
728 case KW_per_player: thawer.get (per_player); break; 654 case KW_per_player: thawer.get (per_player); break;
729 case KW_per_party: thawer.get (per_party); break; 655 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break; 656 case KW_no_reset: thawer.get (no_reset); break;
657 case KW_no_drop: thawer.get (no_drop); break;
731 658
732 case KW_region: default_region = region::find (thawer.get_str ()); break; 659 case KW_region: default_region = region::find (thawer.get_str ()); break;
733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 660 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
734 661
735 // old names new names 662 // old names new names
… …
746 case KW_tile_path_1: thawer.get (tile_path [0]); break; 673 case KW_tile_path_1: thawer.get (tile_path [0]); break;
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 674 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 675 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 676 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 677
678 case KW_ERROR:
679 set_key_text (thawer.kw_str, thawer.value);
680 break;
681
751 case KW_end: 682 case KW_end:
683 thawer.next ();
752 return true; 684 return true;
753 685
754 default: 686 default:
755 if (!thawer.parse_error ("map", 0)) 687 if (!thawer.parse_error ("map", 0))
756 return false; 688 return false;
757 break; 689 break;
758 } 690 }
691
692 thawer.next ();
759 } 693 }
760 694
761 abort (); 695 abort ();
762}
763
764bool
765maptile::_load_header (const char *path)
766{
767 object_thawer thawer (path);
768
769 if (!thawer)
770 return false;
771
772 return _load_header (thawer);
773} 696}
774 697
775/****************************************************************************** 698/******************************************************************************
776 * This is the start of unique map handling code 699 * This is the start of unique map handling code
777 *****************************************************************************/ 700 *****************************************************************************/
… …
813 MAP_OUT (swap_time); 736 MAP_OUT (swap_time);
814 MAP_OUT (reset_time); 737 MAP_OUT (reset_time);
815 MAP_OUT (reset_timeout); 738 MAP_OUT (reset_timeout);
816 MAP_OUT (fixed_resettime); 739 MAP_OUT (fixed_resettime);
817 MAP_OUT (no_reset); 740 MAP_OUT (no_reset);
741 MAP_OUT (no_drop);
818 MAP_OUT (difficulty); 742 MAP_OUT (difficulty);
819 743
820 if (default_region) MAP_OUT2 (region, default_region->name); 744 if (default_region) MAP_OUT2 (region, default_region->name);
821 745
822 if (shopitems) 746 if (shopitems)
… …
876 * Remove and free all objects in the given map. 800 * Remove and free all objects in the given map.
877 */ 801 */
878void 802void
879maptile::clear () 803maptile::clear ()
880{ 804{
881 sfree (regions, size ()), regions = 0;
882 free (regionmap), regionmap = 0;
883
884 if (spaces) 805 if (spaces)
885 { 806 {
886 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 807 for (mapspace *ms = spaces + size (); ms-- > spaces; )
887 while (object *op = ms->bot) 808 while (object *op = ms->bot)
888 { 809 {
810 // manually remove, as to not trigger anything
811 if (ms->bot = op->above)
812 ms->bot->below = 0;
813
814 op->flag [FLAG_REMOVED] = true;
815
889 op = op->head_ (); 816 object *head = op->head_ ();
817 if (op == head)
818 {
890 op->destroy_inv (false); 819 op->destroy_inv (false);
891 op->destroy (); 820 op->destroy ();
821 }
822 else if (head->map != op->map)
823 {
824 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
825 head->destroy ();
826 }
892 } 827 }
893 828
894 sfree (spaces, size ()), spaces = 0; 829 sfree0 (spaces, size ());
895 } 830 }
896 831
897 if (buttons) 832 if (buttons)
898 free_objectlinkpt (buttons), buttons = 0; 833 free_objectlinkpt (buttons), buttons = 0;
834
835 sfree0 (regions, size ());
836 delete [] regionmap; regionmap = 0;
899} 837}
900 838
901void 839void
902maptile::clear_header () 840maptile::clear_header ()
903{ 841{
… …
955 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 893 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
956 break; 894 break;
957 895
958 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 896 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
959 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 897 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
960 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
961 || QUERY_FLAG (op, FLAG_UNIQUE) 898 || QUERY_FLAG (op, FLAG_UNIQUE)
962 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 899 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
963 || QUERY_FLAG (op, FLAG_UNPAID) 900 || QUERY_FLAG (op, FLAG_UNPAID)
964 || op->is_alive ()) 901 || op->is_alive ())
965 ; // do not decay 902 ; // do not decay
… …
1057 994
1058 if (QUERY_FLAG (op, FLAG_GENERATOR)) 995 if (QUERY_FLAG (op, FLAG_GENERATOR))
1059 { 996 {
1060 total_exp += op->stats.exp; 997 total_exp += op->stats.exp;
1061 998
1062 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 999 if (archetype *at = op->other_arch)
1000 {
1063 total_exp += at->stats.exp * 8; 1001 total_exp += at->stats.exp * 8;
1064
1065 monster_cnt++; 1002 monster_cnt++;
1003 }
1004
1005 for (object *inv = op->inv; inv; inv = inv->below)
1006 {
1007 total_exp += op->stats.exp * 8;
1008 monster_cnt++;
1009 }
1066 } 1010 }
1067 } 1011 }
1068 1012
1069 avgexp = (double) total_exp / monster_cnt; 1013 avgexp = (double) total_exp / monster_cnt;
1070 1014
… …
1109 else 1053 else
1110 darkness = new_level; 1054 darkness = new_level;
1111 1055
1112 /* All clients need to get re-updated for the change */ 1056 /* All clients need to get re-updated for the change */
1113 update_all_map_los (this); 1057 update_all_map_los (this);
1058
1114 return 1; 1059 return 1;
1115} 1060}
1116 1061
1117/* 1062/*
1118 * This function updates various attributes about a specific space 1063 * This function updates various attributes about a specific space
… …
1121 * through, etc) 1066 * through, etc)
1122 */ 1067 */
1123void 1068void
1124mapspace::update_ () 1069mapspace::update_ ()
1125{ 1070{
1126 object *tmp, *last = 0; 1071 object *last = 0;
1127 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1072 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1128 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1073 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1129 1074
1130 //object *middle = 0; 1075 //object *middle = 0;
1131 //object *top = 0; 1076 //object *top = 0;
… …
1133 // this seems to generate better code than using locals, above 1078 // this seems to generate better code than using locals, above
1134 object *&top = faces_obj[0] = 0; 1079 object *&top = faces_obj[0] = 0;
1135 object *&middle = faces_obj[1] = 0; 1080 object *&middle = faces_obj[1] = 0;
1136 object *&floor = faces_obj[2] = 0; 1081 object *&floor = faces_obj[2] = 0;
1137 1082
1138 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1083 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1139 { 1084 {
1140 /* This could be made additive I guess (two lights better than 1085 /* This could be made additive I guess (two lights better than
1141 * one). But if so, it shouldn't be a simple additive - 2 1086 * one). But if so, it shouldn't be a simple additive - 2
1142 * light bulbs do not illuminate twice as far as once since 1087 * light bulbs do not illuminate twice as far as once since
1143 * it is a dissapation factor that is cubed. 1088 * it is a dissapation factor that is cubed.
1144 */ 1089 */
1145 if (tmp->glow_radius > light)
1146 light = tmp->glow_radius; 1090 light = max (light, tmp->glow_radius);
1147 1091
1148 /* This call is needed in order to update objects the player 1092 /* This call is needed in order to update objects the player
1149 * is standing in that have animations (ie, grass, fire, etc). 1093 * is standing in that have animations (ie, grass, fire, etc).
1150 * However, it also causes the look window to be re-drawn 1094 * However, it also causes the look window to be re-drawn
1151 * 3 times each time the player moves, because many of the 1095 * 3 times each time the player moves, because many of the
… …
1170 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1114 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1171 { 1115 {
1172 middle = tmp; 1116 middle = tmp;
1173 anywhere = 1; 1117 anywhere = 1;
1174 } 1118 }
1119
1175 /* Find the highest visible face around. If equal 1120 /* Find the highest visible face around. If equal
1176 * visibilities, we still want the one nearer to the 1121 * visibilities, we still want the one nearer to the
1177 * top 1122 * top
1178 */ 1123 */
1179 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1124 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1228 * 1) top face is set, need middle to be set. 1173 * 1) top face is set, need middle to be set.
1229 * 2) middle is set, need to set top. 1174 * 2) middle is set, need to set top.
1230 * 3) neither middle or top is set - need to set both. 1175 * 3) neither middle or top is set - need to set both.
1231 */ 1176 */
1232 1177
1233 for (tmp = last; tmp; tmp = tmp->below) 1178 for (object *tmp = last; tmp; tmp = tmp->below)
1234 { 1179 {
1235 /* Once we get to a floor, stop, since we already have a floor object */ 1180 /* Once we get to a floor, stop, since we already have a floor object */
1236 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1181 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1237 break; 1182 break;
1238 1183
… …
1290 vol += op->volume (); 1235 vol += op->volume ();
1291 1236
1292 return vol; 1237 return vol;
1293} 1238}
1294 1239
1295/* this updates the orig_map->tile_map[tile_num] value after finding 1240bool
1296 * the map. It also takes care of linking back the freshly found 1241maptile::tile_available (int dir, bool load)
1297 * maps tile_map values if it tiles back to this one. It returns
1298 * the value of orig_map->tile_map[tile_num].
1299 */
1300static inline maptile *
1301find_and_link (maptile *orig_map, int tile_num)
1302{ 1242{
1303 maptile *mp = orig_map->tile_map [tile_num]; 1243 if (!tile_path[dir])
1244 return 0;
1304 1245
1305 if (!mp) 1246 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1306 { 1247 return 1;
1307 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1308 1248
1309 if (!mp) 1249 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1310 { 1250 return 1;
1311 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1312 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1313 &orig_map->tile_path[tile_num], &orig_map->path);
1314 mp = new maptile (1, 1);
1315 mp->alloc ();
1316 mp->in_memory = MAP_IN_MEMORY;
1317 }
1318 }
1319 1251
1320 int dest_tile = (tile_num + 2) % 4;
1321
1322 orig_map->tile_map [tile_num] = mp;
1323
1324 // optimisation: back-link map to origin map if euclidean
1325 //TODO: non-euclidean maps MUST GO
1326 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1327 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1328
1329 return mp; 1252 return 0;
1330}
1331
1332static inline void
1333load_and_link (maptile *orig_map, int tile_num)
1334{
1335 find_and_link (orig_map, tile_num)->load_sync ();
1336} 1253}
1337 1254
1338/* this returns TRUE if the coordinates (x,y) are out of 1255/* this returns TRUE if the coordinates (x,y) are out of
1339 * map m. This function also takes into account any 1256 * map m. This function also takes into account any
1340 * tiling considerations, loading adjacant maps as needed. 1257 * tiling considerations, loading adjacant maps as needed.
… …
1353 if (!m) 1270 if (!m)
1354 return 0; 1271 return 0;
1355 1272
1356 if (x < 0) 1273 if (x < 0)
1357 { 1274 {
1358 if (!m->tile_path[3]) 1275 if (!m->tile_available (3))
1359 return 1; 1276 return 1;
1360 1277
1361 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1362 find_and_link (m, 3);
1363
1364 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1278 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1365 } 1279 }
1366 1280
1367 if (x >= m->width) 1281 if (x >= m->width)
1368 { 1282 {
1369 if (!m->tile_path[1]) 1283 if (!m->tile_available (1))
1370 return 1; 1284 return 1;
1371 1285
1372 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1373 find_and_link (m, 1);
1374
1375 return out_of_map (m->tile_map[1], x - m->width, y); 1286 return out_of_map (m->tile_map[1], x - m->width, y);
1376 } 1287 }
1377 1288
1378 if (y < 0) 1289 if (y < 0)
1379 { 1290 {
1380 if (!m->tile_path[0]) 1291 if (!m->tile_available (0))
1381 return 1; 1292 return 1;
1382 1293
1383 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1384 find_and_link (m, 0);
1385
1386 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1294 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1387 } 1295 }
1388 1296
1389 if (y >= m->height) 1297 if (y >= m->height)
1390 { 1298 {
1391 if (!m->tile_path[2]) 1299 if (!m->tile_available (2))
1392 return 1; 1300 return 1;
1393
1394 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1395 find_and_link (m, 2);
1396 1301
1397 return out_of_map (m->tile_map[2], x, y - m->height); 1302 return out_of_map (m->tile_map[2], x, y - m->height);
1398 } 1303 }
1399 1304
1400 /* Simple case - coordinates are within this local 1305 /* Simple case - coordinates are within this local
… …
1414maptile * 1319maptile *
1415maptile::xy_find (sint16 &x, sint16 &y) 1320maptile::xy_find (sint16 &x, sint16 &y)
1416{ 1321{
1417 if (x < 0) 1322 if (x < 0)
1418 { 1323 {
1419 if (!tile_path[3]) 1324 if (!tile_available (3))
1420 return 0; 1325 return 0;
1421 1326
1422 find_and_link (this, 3);
1423 x += tile_map[3]->width; 1327 x += tile_map[3]->width;
1424 return tile_map[3]->xy_find (x, y); 1328 return tile_map[3]->xy_find (x, y);
1425 } 1329 }
1426 1330
1427 if (x >= width) 1331 if (x >= width)
1428 { 1332 {
1429 if (!tile_path[1]) 1333 if (!tile_available (1))
1430 return 0; 1334 return 0;
1431 1335
1432 find_and_link (this, 1);
1433 x -= width; 1336 x -= width;
1434 return tile_map[1]->xy_find (x, y); 1337 return tile_map[1]->xy_find (x, y);
1435 } 1338 }
1436 1339
1437 if (y < 0) 1340 if (y < 0)
1438 { 1341 {
1439 if (!tile_path[0]) 1342 if (!tile_available (0))
1440 return 0; 1343 return 0;
1441 1344
1442 find_and_link (this, 0);
1443 y += tile_map[0]->height; 1345 y += tile_map[0]->height;
1444 return tile_map[0]->xy_find (x, y); 1346 return tile_map[0]->xy_find (x, y);
1445 } 1347 }
1446 1348
1447 if (y >= height) 1349 if (y >= height)
1448 { 1350 {
1449 if (!tile_path[2]) 1351 if (!tile_available (2))
1450 return 0; 1352 return 0;
1451 1353
1452 find_and_link (this, 2);
1453 y -= height; 1354 y -= height;
1454 return tile_map[2]->xy_find (x, y); 1355 return tile_map[2]->xy_find (x, y);
1455 } 1356 }
1456 1357
1457 /* Simple case - coordinates are within this local 1358 /* Simple case - coordinates are within this local
… …
1468adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1369adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1469{ 1370{
1470 if (!map1 || !map2) 1371 if (!map1 || !map2)
1471 return 0; 1372 return 0;
1472 1373
1473 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1374 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1474 //fix: compare paths instead (this is likely faster, too!) 1375 //fix: compare paths instead (this is likely faster, too!)
1475 if (map1 == map2) 1376 if (map1 == map2)
1476 { 1377 {
1477 *dx = 0; 1378 *dx = 0;
1478 *dy = 0; 1379 *dy = 0;
… …
1685} 1586}
1686 1587
1687object * 1588object *
1688maptile::insert (object *op, int x, int y, object *originator, int flags) 1589maptile::insert (object *op, int x, int y, object *originator, int flags)
1689{ 1590{
1690 if (!op->flag [FLAG_REMOVED])
1691 op->remove ();
1692
1693 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1591 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1694} 1592}
1695 1593
1696region * 1594region *
1697maptile::region (int x, int y) const 1595maptile::region (int x, int y) const
… …
1707 1605
1708 return ::region::default_region (); 1606 return ::region::default_region ();
1709} 1607}
1710 1608
1711/* picks a random object from a style map. 1609/* picks a random object from a style map.
1712 * Redone by MSW so it should be faster and not use static
1713 * variables to generate tables.
1714 */ 1610 */
1715object * 1611object *
1716maptile::pick_random_object () const 1612maptile::pick_random_object (rand_gen &gen) const
1717{ 1613{
1718 /* while returning a null object will result in a crash, that 1614 /* while returning a null object will result in a crash, that
1719 * is actually preferable to an infinite loop. That is because 1615 * is actually preferable to an infinite loop. That is because
1720 * most servers will automatically restart in case of crash. 1616 * most servers will automatically restart in case of crash.
1721 * Change the logic on getting the random space - shouldn't make 1617 * Change the logic on getting the random space - shouldn't make
1722 * any difference, but this seems clearer to me. 1618 * any difference, but this seems clearer to me.
1723 */ 1619 */
1724 for (int i = 1000; --i;) 1620 for (int i = 1000; --i;)
1725 { 1621 {
1726 object *pick = at (rndm (width), rndm (height)).bot; 1622 object *pick = at (gen (width), gen (height)).bot;
1727 1623
1728 // do not prefer big monsters just because they are big. 1624 // do not prefer big monsters just because they are big.
1729 if (pick && pick->head_ () == pick) 1625 if (pick && pick->is_head ())
1730 return pick->head_ (); 1626 return pick->head_ ();
1731 } 1627 }
1732 1628
1733 // instead of crashing in the unlikely(?) case, try to return *something* 1629 // instead of crashing in the unlikely(?) case, try to return *something*
1734 return get_archetype ("blocked"); 1630 return archetype::find ("bug");
1735} 1631}
1736 1632
1633void
1634maptile::play_sound (faceidx sound, int x, int y) const
1635{
1636 if (!sound)
1637 return;
1638
1639 for_all_players (pl)
1640 if (pl->ob->map == this)
1641 if (client *ns = pl->ns)
1642 {
1643 int dx = x - pl->ob->x;
1644 int dy = y - pl->ob->y;
1645
1646 int distance = idistance (dx, dy);
1647
1648 if (distance <= MAX_SOUND_DISTANCE)
1649 ns->play_sound (sound, dx, dy);
1650 }
1651}
1652

Diff Legend

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