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.87 by root, Thu Feb 15 21:07:48 2007 UTC vs.
Revision 1.112 by root, Thu Jul 12 18:48:20 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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 2 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
26 25
27#include "global.h" 26#include "global.h"
… …
174 * let the player through (inventory checkers for example) 173 * let the player through (inventory checkers for example)
175 */ 174 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 176 return 0;
178 177
179 if (ob->head != NULL)
180 ob = ob->head; 178 ob = ob->head_ ();
181 179
182 /* We basically go through the stack of objects, and if there is 180 /* We basically go through the stack of objects, and if there is
183 * some other object that has NO_PASS or FLAG_ALIVE set, return 181 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 182 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 183 * ob is blocking it, so return 0.
… …
215 else 213 else
216 { 214 {
217 /* Broke apart a big nasty if into several here to make 215 /* Broke apart a big nasty if into several here to make
218 * this more readable. first check - if the space blocks 216 * this more readable. first check - if the space blocks
219 * movement, can't move here. 217 * movement, can't move here.
220 * second - if a monster, can't move there, unles it is a 218 * second - if a monster, can't move there, unless it is a
221 * hidden dm 219 * hidden dm
222 */ 220 */
223 if (OB_MOVE_BLOCK (ob, tmp)) 221 if (OB_MOVE_BLOCK (ob, tmp))
224 return 1; 222 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 223
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 224 if (tmp->flag [FLAG_ALIVE]
225 && tmp->head_ () != ob
226 && tmp != ob
227 && tmp->type != DOOR
228 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
227 return 1; 229 return 1;
228 } 230 }
229 231
230 } 232 }
231 return 0; 233 return 0;
… …
273 275
274 /* don't have object, so don't know what types would block */ 276 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block; 277 return m1->at (sx, sy).move_block;
276 } 278 }
277 279
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
279 { 281 {
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
281 283
282 if (flag & P_OUT_OF_MAP) 284 if (flag & P_OUT_OF_MAP)
283 return P_OUT_OF_MAP; 285 return P_OUT_OF_MAP;
284 if (flag & P_IS_ALIVE) 286 if (flag & P_IS_ALIVE)
285 return P_IS_ALIVE; 287 return P_IS_ALIVE;
… …
344} 346}
345 347
346/* link_multipart_objects go through all the objects on the map looking 348/* link_multipart_objects go through all the objects on the map looking
347 * for objects whose arch says they are multipart yet according to the 349 * for objects whose arch says they are multipart yet according to the
348 * info we have, they only have the head (as would be expected when 350 * info we have, they only have the head (as would be expected when
349 * they are saved). We do have to look for the old maps that did save 351 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 352 */
352void 353void
353maptile::link_multipart_objects () 354maptile::link_multipart_objects ()
354{ 355{
355 if (!spaces) 356 if (!spaces)
356 return; 357 return;
357 358
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 359 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 360 {
361 object *op = ms->bot;
362 while (op)
360 { 363 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 364 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 365 if (op->head_ () == op && !op->more && op->arch->more)
365 {
366 /* If there is nothing more to this object, this for loop
367 * won't do anything.
368 */
369 archetype *at;
370 object *last, *op;
371 for (at = tmp->arch->more, last = tmp;
372 at;
373 at = at->more, last = op)
374 { 366 {
375 op = arch_to_object (at); 367 op->remove ();
368 op->expand_tail ();
376 369
377 /* update x,y coordinates */ 370 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
378 op->x += tmp->x; 371 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
379 op->y += tmp->y; 372 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
380 op->head = tmp;
381 op->map = this;
382 last->more = op;
383 op->name = tmp->name;
384 op->title = tmp->title;
385
386 /* we could link all the parts onto tmp, and then just
387 * call insert_ob_in_map once, but the effect is the same,
388 * as insert_ob_in_map will call itself with each part, and
389 * the coding is simpler to just to it here with each part.
390 */
391 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 373 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
374
375 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
376 // so we have to reset the iteration through the mapspace
392 } 377 }
378 else
379 op = op->above;
393 } 380 }
394
395 tmp = above;
396 } 381 }
397} 382}
398 383
399/* 384/*
400 * Loads (ands parses) the objects into a given map from the specified 385 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 386 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 387 */
404bool 388bool
405maptile::_load_objects (object_thawer &thawer) 389maptile::_load_objects (object_thawer &f)
406{ 390{
407 int unique; 391 for (;;)
408 object *op, *prev = NULL, *last_more = NULL, *otmp;
409
410 op = object::create ();
411 op->map = this; /* To handle buttons correctly */
412
413 while (int i = load_object (thawer, op, 0))
414 { 392 {
415 /* if the archetype for the object is null, means that we 393 coroapi::cede_to_tick_every (100); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 394
417 * or editor will not be able to do anything with it either. 395 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 396 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 397 case KW_arch:
422 continue; 398 if (object *op = object::read (f, this))
423 }
424
425 switch (i)
426 { 399 {
427 case LL_NORMAL: 400 if (op->inv)
401 sum_weight (op);
402
428 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 403 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
404 }
429 405
430 if (op->inv) 406 continue;
431 sum_weight (op);
432 407
433 prev = op, last_more = op;
434 break;
435
436 case LL_MORE: 408 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 409 return true;
438 op->head = prev, last_more->more = op, last_more = op; 410
411 default:
412 if (!f.parse_error ("map file"))
413 return false;
439 break; 414 break;
440 } 415 }
441 416
442 op = object::create (); 417 f.next ();
443 op->map = this;
444 }
445
446 op->destroy ();
447
448#if 0
449 for (i = 0; i < width; i++)
450 for (j = 0; j < height; j++)
451 {
452 unique = 0;
453 /* check for unique items, or unique squares */
454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455 {
456 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457 unique = 1;
458
459 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461 }
462 } 418 }
463#endif
464 419
465 return true; 420 return true;
466} 421}
467 422
468void 423void
469maptile::activate () 424maptile::activate ()
470{ 425{
426 active = true;
427
471 if (!spaces) 428 if (spaces)
472 return;
473
474 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 429 for (mapspace *ms = spaces + size (); ms-- > spaces; )
475 for (object *op = ms->bot; op; op = op->above) 430 for (object *op = ms->bot; op; op = op->above)
476 op->activate_recursive (); 431 op->activate_recursive ();
477} 432}
478 433
479void 434void
480maptile::deactivate () 435maptile::deactivate ()
481{ 436{
437 active = false;
438
482 if (!spaces) 439 if (spaces)
483 return;
484
485 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 440 for (mapspace *ms = spaces + size (); ms-- > spaces; )
486 for (object *op = ms->bot; op; op = op->above) 441 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 442 op->deactivate_recursive ();
488} 443}
489 444
490bool 445bool
491maptile::_save_objects (object_freezer &freezer, int flags) 446maptile::_save_objects (object_freezer &f, int flags)
492{ 447{
493 static int cede_count = 0; 448 coroapi::cede_to_tick ();
494 449
495 if (flags & IO_HEADER) 450 if (flags & IO_HEADER)
496 _save_header (freezer); 451 _save_header (f);
497 452
498 if (!spaces) 453 if (!spaces)
499 return false; 454 return false;
500 455
501 for (int i = 0; i < size (); ++i) 456 for (int i = 0; i < size (); ++i)
502 { 457 {
503#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
504 if (cede_count >= 500)
505 {
506 cede_count = 0;
507 coroapi::cede ();
508 }
509#endif
510
511 int unique = 0; 458 int unique = 0;
512 for (object *op = spaces [i].bot; op; op = op->above) 459 for (object *op = spaces [i].bot; op; op = op->above)
513 { 460 {
514 // count per-object, but cede only when modification-safe
515 cede_count++;
516
517 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
518 unique = 1; 462 unique = 1;
519 463
520 if (!op->can_map_save ()) 464 if (!op->can_map_save ())
521 continue; 465 continue;
522 466
523 if (unique || op->flag [FLAG_UNIQUE]) 467 if (unique || op->flag [FLAG_UNIQUE])
524 { 468 {
525 if (flags & IO_UNIQUES) 469 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1); 470 op->write (f);
527 } 471 }
528 else if (flags & IO_OBJECTS) 472 else if (flags & IO_OBJECTS)
529 save_object (freezer, op, 1); 473 op->write (f);
530 } 474 }
531 } 475 }
476
477 coroapi::cede_to_tick ();
532 478
533 return true; 479 return true;
534} 480}
535 481
536bool 482bool
537maptile::_load_objects (const char *path, bool skip_header) 483maptile::_load_objects (const char *path, bool skip_header)
538{ 484{
539 object_thawer thawer (path); 485 object_thawer f (path);
540 486
541 if (!thawer) 487 if (!f)
542 return false; 488 return false;
489
490 f.next ();
543 491
544 if (skip_header) 492 if (skip_header)
545 for (;;) 493 for (;;)
546 { 494 {
495 keyword kw = f.kw;
496 f.skip ();
547 if (thawer.kw == KW_end) 497 if (kw == KW_end)
548 break; 498 break;
549
550 thawer.skip_kv ();
551 } 499 }
552 500
553 return _load_objects (thawer); 501 return _load_objects (f);
554} 502}
555 503
556bool 504bool
557maptile::_save_objects (const char *path, int flags) 505maptile::_save_objects (const char *path, int flags)
558{ 506{
… …
733bool 681bool
734maptile::_load_header (object_thawer &thawer) 682maptile::_load_header (object_thawer &thawer)
735{ 683{
736 for (;;) 684 for (;;)
737 { 685 {
738 keyword kw = thawer.get_kv (); 686 thawer.next ();
739 687
740 switch (kw) 688 switch (thawer.kw)
741 { 689 {
742 case KW_msg: 690 case KW_msg:
743 thawer.get_ml (KW_endmsg, msg); 691 thawer.get_ml (KW_endmsg, msg);
744 break; 692 break;
745 693
… …
777 case KW_winddir: thawer.get (winddir); break; 725 case KW_winddir: thawer.get (winddir); break;
778 case KW_sky: thawer.get (sky); break; 726 case KW_sky: thawer.get (sky); break;
779 727
780 case KW_per_player: thawer.get (per_player); break; 728 case KW_per_player: thawer.get (per_player); break;
781 case KW_per_party: thawer.get (per_party); break; 729 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break;
782 731
783 case KW_region: default_region = region::find (thawer.get_str ()); break; 732 case KW_region: default_region = region::find (thawer.get_str ()); break;
784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
785 734
786 // old names new names 735 // old names new names
… …
797 case KW_tile_path_1: thawer.get (tile_path [0]); break; 746 case KW_tile_path_1: thawer.get (tile_path [0]); break;
798 case KW_tile_path_2: thawer.get (tile_path [1]); break; 747 case KW_tile_path_2: thawer.get (tile_path [1]); break;
799 case KW_tile_path_3: thawer.get (tile_path [2]); break; 748 case KW_tile_path_3: thawer.get (tile_path [2]); break;
800 case KW_tile_path_4: thawer.get (tile_path [3]); break; 749 case KW_tile_path_4: thawer.get (tile_path [3]); break;
801 750
751 case KW_ERROR:
752 set_key (thawer.kw_str, thawer.value);
753 break;
754
802 case KW_end: 755 case KW_end:
803 return true; 756 return true;
804 757
805 default: 758 default:
806 if (!thawer.parse_error ("map", 0)) 759 if (!thawer.parse_error ("map", 0))
… …
839 object *above = op->above; 792 object *above = op->above;
840 793
841 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 794 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
842 unique = 1; 795 unique = 1;
843 796
844 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 797 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
845 { 798 {
846 op->destroy_inv (false); 799 op->destroy_inv (false);
847 op->destroy (); 800 op->destroy ();
848 } 801 }
849 802
… …
863 if (name) MAP_OUT (name); 816 if (name) MAP_OUT (name);
864 MAP_OUT (swap_time); 817 MAP_OUT (swap_time);
865 MAP_OUT (reset_time); 818 MAP_OUT (reset_time);
866 MAP_OUT (reset_timeout); 819 MAP_OUT (reset_timeout);
867 MAP_OUT (fixed_resettime); 820 MAP_OUT (fixed_resettime);
821 MAP_OUT (no_reset);
868 MAP_OUT (difficulty); 822 MAP_OUT (difficulty);
869 823
870 if (default_region) MAP_OUT2 (region, default_region->name); 824 if (default_region) MAP_OUT2 (region, default_region->name);
871 825
872 if (shopitems) 826 if (shopitems)
… …
934 if (spaces) 888 if (spaces)
935 { 889 {
936 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 890 for (mapspace *ms = spaces + size (); ms-- > spaces; )
937 while (object *op = ms->bot) 891 while (object *op = ms->bot)
938 { 892 {
939 if (op->head)
940 op = op->head; 893 op = op->head_ ();
941
942 op->destroy_inv (false); 894 op->destroy_inv (false);
943 op->destroy (); 895 op->destroy ();
944 } 896 }
945 897
946 sfree (spaces, size ()), spaces = 0; 898 sfree (spaces, size ()), spaces = 0;
… …
985maptile::do_destroy () 937maptile::do_destroy ()
986{ 938{
987 attachable::do_destroy (); 939 attachable::do_destroy ();
988 940
989 clear (); 941 clear ();
942}
943
944/* decay and destroy perishable items in a map */
945void
946maptile::do_decay_objects ()
947{
948 if (!spaces)
949 return;
950
951 for (mapspace *ms = spaces + size (); ms-- > spaces; )
952 for (object *above, *op = ms->bot; op; op = above)
953 {
954 above = op->above;
955
956 bool destroy = 0;
957
958 // do not decay anything above unique floor tiles (yet :)
959 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
960 break;
961
962 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
963 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
964 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
965 || QUERY_FLAG (op, FLAG_UNIQUE)
966 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
967 || QUERY_FLAG (op, FLAG_UNPAID)
968 || op->is_alive ())
969 ; // do not decay
970 else if (op->is_weapon ())
971 {
972 op->stats.dam--;
973 if (op->stats.dam < 0)
974 destroy = 1;
975 }
976 else if (op->is_armor ())
977 {
978 op->stats.ac--;
979 if (op->stats.ac < 0)
980 destroy = 1;
981 }
982 else if (op->type == FOOD)
983 {
984 op->stats.food -= rndm (5, 20);
985 if (op->stats.food < 0)
986 destroy = 1;
987 }
988 else
989 {
990 int mat = op->materials;
991
992 if (mat & M_PAPER
993 || mat & M_LEATHER
994 || mat & M_WOOD
995 || mat & M_ORGANIC
996 || mat & M_CLOTH
997 || mat & M_LIQUID
998 || (mat & M_IRON && rndm (1, 5) == 1)
999 || (mat & M_GLASS && rndm (1, 2) == 1)
1000 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
1001 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
1002 || (mat & M_ICE && temp > 32))
1003 destroy = 1;
1004 }
1005
1006 /* adjust overall chance below */
1007 if (destroy && rndm (0, 1))
1008 op->destroy ();
1009 }
990} 1010}
991 1011
992/* 1012/*
993 * Updates every button on the map (by calling update_button() for them). 1013 * Updates every button on the map (by calling update_button() for them).
994 */ 1014 */
… …
1042 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1062 if (QUERY_FLAG (op, FLAG_GENERATOR))
1043 { 1063 {
1044 total_exp += op->stats.exp; 1064 total_exp += op->stats.exp;
1045 1065
1046 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1066 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1047 total_exp += at->clone.stats.exp * 8; 1067 total_exp += at->stats.exp * 8;
1048 1068
1049 monster_cnt++; 1069 monster_cnt++;
1050 } 1070 }
1051 } 1071 }
1052 1072
… …
1107void 1127void
1108mapspace::update_ () 1128mapspace::update_ ()
1109{ 1129{
1110 object *tmp, *last = 0; 1130 object *tmp, *last = 0;
1111 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1131 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1112 facetile *top, *floor, *middle;
1113 object *top_obj, *floor_obj, *middle_obj;
1114 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1132 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1115 1133
1116 middle = blank_face; 1134 //object *middle = 0;
1117 top = blank_face; 1135 //object *top = 0;
1118 floor = blank_face; 1136 //object *floor = 0;
1119 1137 // this seems to generate better code than using locals, above
1120 middle_obj = 0; 1138 object *&top = faces_obj[0] = 0;
1121 top_obj = 0; 1139 object *&middle = faces_obj[1] = 0;
1122 floor_obj = 0; 1140 object *&floor = faces_obj[2] = 0;
1123 1141
1124 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1142 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1125 { 1143 {
1126 /* This could be made additive I guess (two lights better than 1144 /* This could be made additive I guess (two lights better than
1127 * one). But if so, it shouldn't be a simple additive - 2 1145 * one). But if so, it shouldn't be a simple additive - 2
… …
1140 * Always put the player down for drawing. 1158 * Always put the player down for drawing.
1141 */ 1159 */
1142 if (!tmp->invisible) 1160 if (!tmp->invisible)
1143 { 1161 {
1144 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1162 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1145 {
1146 top = tmp->face;
1147 top_obj = tmp; 1163 top = tmp;
1148 }
1149 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1164 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1150 { 1165 {
1151 /* If we got a floor, that means middle and top were below it, 1166 /* If we got a floor, that means middle and top were below it,
1152 * so should not be visible, so we clear them. 1167 * so should not be visible, so we clear them.
1153 */ 1168 */
1154 middle = blank_face; 1169 middle = 0;
1155 top = blank_face; 1170 top = 0;
1156 floor = tmp->face;
1157 floor_obj = tmp; 1171 floor = tmp;
1158 } 1172 }
1159 /* Flag anywhere have high priority */ 1173 /* Flag anywhere have high priority */
1160 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1174 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1161 { 1175 {
1162 middle = tmp->face;
1163
1164 middle_obj = tmp; 1176 middle = tmp;
1165 anywhere = 1; 1177 anywhere = 1;
1166 } 1178 }
1167 /* Find the highest visible face around. If equal 1179 /* Find the highest visible face around. If equal
1168 * visibilities, we still want the one nearer to the 1180 * visibilities, we still want the one nearer to the
1169 * top 1181 * top
1170 */ 1182 */
1171 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1183 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1172 {
1173 middle = tmp->face;
1174 middle_obj = tmp; 1184 middle = tmp;
1175 }
1176 } 1185 }
1177 1186
1178 if (tmp == tmp->above) 1187 if (tmp == tmp->above)
1179 { 1188 {
1180 LOG (llevError, "Error in structure of map\n"); 1189 LOG (llevError, "Error in structure of map\n");
… …
1215 * middle face. This should not happen, as we already have the 1224 * middle face. This should not happen, as we already have the
1216 * else statement above so middle should not get set. OTOH, it 1225 * else statement above so middle should not get set. OTOH, it
1217 * may be possible for the faces to match but be different objects. 1226 * may be possible for the faces to match but be different objects.
1218 */ 1227 */
1219 if (top == middle) 1228 if (top == middle)
1220 middle = blank_face; 1229 middle = 0;
1221 1230
1222 /* There are three posibilities at this point: 1231 /* There are three posibilities at this point:
1223 * 1) top face is set, need middle to be set. 1232 * 1) top face is set, need middle to be set.
1224 * 2) middle is set, need to set top. 1233 * 2) middle is set, need to set top.
1225 * 3) neither middle or top is set - need to set both. 1234 * 3) neither middle or top is set - need to set both.
… …
1230 /* Once we get to a floor, stop, since we already have a floor object */ 1239 /* Once we get to a floor, stop, since we already have a floor object */
1231 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1240 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1232 break; 1241 break;
1233 1242
1234 /* If two top faces are already set, quit processing */ 1243 /* If two top faces are already set, quit processing */
1235 if ((top != blank_face) && (middle != blank_face)) 1244 if (top && middle)
1236 break; 1245 break;
1237 1246
1238 /* Only show visible faces */ 1247 /* Only show visible faces */
1239 if (!tmp->invisible) 1248 if (!tmp->invisible)
1240 { 1249 {
1241 /* Fill in top if needed */ 1250 /* Fill in top if needed */
1242 if (top == blank_face) 1251 if (!top)
1243 { 1252 {
1244 top = tmp->face;
1245 top_obj = tmp; 1253 top = tmp;
1246 if (top == middle) 1254 if (top == middle)
1247 middle = blank_face; 1255 middle = 0;
1248 } 1256 }
1249 else 1257 else
1250 { 1258 {
1251 /* top is already set - we should only get here if 1259 /* top is already set - we should only get here if
1252 * middle is not set 1260 * middle is not set
1253 * 1261 *
1254 * Set the middle face and break out, since there is nothing 1262 * Set the middle face and break out, since there is nothing
1255 * more to fill in. We don't check visiblity here, since 1263 * more to fill in. We don't check visiblity here, since
1256 * 1264 *
1257 */ 1265 */
1258 if (tmp->face != top) 1266 if (tmp != top)
1259 { 1267 {
1260 middle = tmp->face;
1261 middle_obj = tmp; 1268 middle = tmp;
1262 break; 1269 break;
1263 } 1270 }
1264 } 1271 }
1265 } 1272 }
1266 } 1273 }
1267 1274
1268 if (middle == floor) 1275 if (middle == floor)
1269 middle = blank_face; 1276 middle = 0;
1270 1277
1271 if (top == middle) 1278 if (top == middle)
1272 middle = blank_face; 1279 middle = 0;
1273 1280
1274 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1281#if 0
1275 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1282 faces_obj [0] = top;
1276 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1283 faces_obj [1] = middle;
1284 faces_obj [2] = floor;
1285#endif
1277} 1286}
1278 1287
1279uint64 1288uint64
1280mapspace::volume () const 1289mapspace::volume () const
1281{ 1290{
… …
1701 return default_region; 1710 return default_region;
1702 1711
1703 return ::region::default_region (); 1712 return ::region::default_region ();
1704} 1713}
1705 1714
1715/* 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 */
1719object *
1720maptile::pick_random_object () const
1721{
1722 /* while returning a null object will result in a crash, that
1723 * is actually preferable to an infinite loop. That is because
1724 * most servers will automatically restart in case of crash.
1725 * Change the logic on getting the random space - shouldn't make
1726 * any difference, but this seems clearer to me.
1727 */
1728 for (int i = 1000; --i;)
1729 {
1730 object *pick = at (rndm (width), rndm (height)).bot;
1706 1731
1732 // do not prefer big monsters just because they are big.
1733 if (pick && pick->head_ () == pick)
1734 return pick->head_ ();
1735 }
1736
1737 // instead of crashing in the unlikely(?) case, try to return *something*
1738 return get_archetype ("blocked");
1739}
1740

Diff Legend

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