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.85 by root, Wed Feb 7 23:50:01 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 05:00:17 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 for (object *op = ms->bot; op; op = op->above)
360 { 361 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 362 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 363 if (op->head_ () == op && !op->more && op->arch->more)
365 { 364 {
366 /* If there is nothing more to this object, this for loop 365 op->remove ();
367 * won't do anything. 366 op->expand_tail ();
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 {
375 op = arch_to_object (at);
376
377 /* update x,y coordinates */
378 op->x += tmp->x;
379 op->y += tmp->y;
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); 367 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
392 }
393 } 368 }
394
395 tmp = above;
396 } 369 }
397} 370}
398 371
399/* 372/*
400 * Loads (ands parses) the objects into a given map from the specified 373 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 374 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 375 */
404bool 376bool
405maptile::_load_objects (object_thawer &thawer) 377maptile::_load_objects (object_thawer &f)
406{ 378{
407 int unique; 379 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 { 380 {
415 /* if the archetype for the object is null, means that we 381 coroapi::cede_to_tick_every (100); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 382
417 * or editor will not be able to do anything with it either. 383 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 384 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 385 case KW_arch:
422 continue; 386 if (object *op = object::read (f, this))
423 }
424
425 switch (i)
426 { 387 {
427 case LL_NORMAL: 388 if (op->inv)
389 sum_weight (op);
390
428 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 391 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
392 }
429 393
430 if (op->inv) 394 continue;
431 sum_weight (op);
432 395
433 prev = op, last_more = op;
434 break;
435
436 case LL_MORE: 396 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 397 return true;
438 op->head = prev, last_more->more = op, last_more = op; 398
399 default:
400 if (!f.parse_error ("map file"))
401 return false;
439 break; 402 break;
440 } 403 }
441 404
442 op = object::create (); 405 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 } 406 }
463#endif
464 407
465 return true; 408 return true;
466} 409}
467 410
468void 411void
469maptile::activate () 412maptile::activate ()
470{ 413{
414 active = true;
415
471 if (!spaces) 416 if (spaces)
472 return;
473
474 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 417 for (mapspace *ms = spaces + size (); ms-- > spaces; )
475 for (object *op = ms->bot; op; op = op->above) 418 for (object *op = ms->bot; op; op = op->above)
476 op->activate_recursive (); 419 op->activate_recursive ();
477} 420}
478 421
479void 422void
480maptile::deactivate () 423maptile::deactivate ()
481{ 424{
425 active = false;
426
482 if (!spaces) 427 if (spaces)
483 return;
484
485 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 428 for (mapspace *ms = spaces + size (); ms-- > spaces; )
486 for (object *op = ms->bot; op; op = op->above) 429 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 430 op->deactivate_recursive ();
488} 431}
489 432
490bool 433bool
491maptile::_save_objects (object_freezer &freezer, int flags) 434maptile::_save_objects (object_freezer &f, int flags)
492{ 435{
493 static int cede_count = 0; 436 coroapi::cede_to_tick ();
494 437
495 if (flags & IO_HEADER) 438 if (flags & IO_HEADER)
496 _save_header (freezer); 439 _save_header (f);
497 440
498 if (!spaces) 441 if (!spaces)
499 return false; 442 return false;
500 443
501 for (int i = 0; i < size (); ++i) 444 for (int i = 0; i < size (); ++i)
502 { 445 {
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; 446 int unique = 0;
512 for (object *op = spaces [i].bot; op; op = op->above) 447 for (object *op = spaces [i].bot; op; op = op->above)
513 { 448 {
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]) 449 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
518 unique = 1; 450 unique = 1;
519 451
520 if (!op->can_map_save ()) 452 if (!op->can_map_save ())
521 continue; 453 continue;
522 454
523 if (unique || op->flag [FLAG_UNIQUE]) 455 if (unique || op->flag [FLAG_UNIQUE])
524 { 456 {
525 if (flags & IO_UNIQUES) 457 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1); 458 op->write (f);
527 } 459 }
528 else if (flags & IO_OBJECTS) 460 else if (flags & IO_OBJECTS)
529 save_object (freezer, op, 1); 461 op->write (f);
530 } 462 }
531 } 463 }
464
465 coroapi::cede_to_tick ();
532 466
533 return true; 467 return true;
534} 468}
535 469
536bool 470bool
537maptile::_load_objects (const char *path, bool skip_header) 471maptile::_load_objects (const char *path, bool skip_header)
538{ 472{
539 object_thawer thawer (path); 473 object_thawer f (path);
540 474
541 if (!thawer) 475 if (!f)
542 return false; 476 return false;
477
478 f.next ();
543 479
544 if (skip_header) 480 if (skip_header)
545 for (;;) 481 for (;;)
546 { 482 {
547 keyword kw = thawer.get_kv (); 483 keyword kw = f.kw;
548 484 f.skip ();
549 if (kw == KW_end) 485 if (kw == KW_end)
550 break; 486 break;
551
552 thawer.skip_kv (kw);
553 } 487 }
554 488
555 return _load_objects (thawer); 489 return _load_objects (f);
556} 490}
557 491
558bool 492bool
559maptile::_save_objects (const char *path, int flags) 493maptile::_save_objects (const char *path, int flags)
560{ 494{
… …
735bool 669bool
736maptile::_load_header (object_thawer &thawer) 670maptile::_load_header (object_thawer &thawer)
737{ 671{
738 for (;;) 672 for (;;)
739 { 673 {
740 keyword kw = thawer.get_kv (); 674 thawer.next ();
741 675
742 switch (kw) 676 switch (thawer.kw)
743 { 677 {
744 case KW_msg: 678 case KW_msg:
745 thawer.get_ml (KW_endmsg, msg); 679 thawer.get_ml (KW_endmsg, msg);
746 break; 680 break;
747 681
… …
779 case KW_winddir: thawer.get (winddir); break; 713 case KW_winddir: thawer.get (winddir); break;
780 case KW_sky: thawer.get (sky); break; 714 case KW_sky: thawer.get (sky); break;
781 715
782 case KW_per_player: thawer.get (per_player); break; 716 case KW_per_player: thawer.get (per_player); break;
783 case KW_per_party: thawer.get (per_party); break; 717 case KW_per_party: thawer.get (per_party); break;
718 case KW_no_reset: thawer.get (no_reset); break;
784 719
785 case KW_region: default_region = region::find (thawer.get_str ()); break; 720 case KW_region: default_region = region::find (thawer.get_str ()); break;
786 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
787 722
788 // old names new names 723 // old names new names
… …
803 738
804 case KW_end: 739 case KW_end:
805 return true; 740 return true;
806 741
807 default: 742 default:
808 if (!thawer.parse_error (kw, "map", 0)) 743 if (!thawer.parse_error ("map", 0))
809 return false; 744 return false;
810 break; 745 break;
811 } 746 }
812 } 747 }
813 748
… …
841 object *above = op->above; 776 object *above = op->above;
842 777
843 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 778 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
844 unique = 1; 779 unique = 1;
845 780
846 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
847 { 782 {
848 op->destroy_inv (false); 783 op->destroy_inv (false);
849 op->destroy (); 784 op->destroy ();
850 } 785 }
851 786
… …
865 if (name) MAP_OUT (name); 800 if (name) MAP_OUT (name);
866 MAP_OUT (swap_time); 801 MAP_OUT (swap_time);
867 MAP_OUT (reset_time); 802 MAP_OUT (reset_time);
868 MAP_OUT (reset_timeout); 803 MAP_OUT (reset_timeout);
869 MAP_OUT (fixed_resettime); 804 MAP_OUT (fixed_resettime);
805 MAP_OUT (no_reset);
870 MAP_OUT (difficulty); 806 MAP_OUT (difficulty);
871 807
872 if (default_region) MAP_OUT2 (region, default_region->name); 808 if (default_region) MAP_OUT2 (region, default_region->name);
873 809
874 if (shopitems) 810 if (shopitems)
… …
936 if (spaces) 872 if (spaces)
937 { 873 {
938 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 874 for (mapspace *ms = spaces + size (); ms-- > spaces; )
939 while (object *op = ms->bot) 875 while (object *op = ms->bot)
940 { 876 {
941 if (op->head)
942 op = op->head; 877 op = op->head_ ();
943
944 op->destroy_inv (false); 878 op->destroy_inv (false);
945 op->destroy (); 879 op->destroy ();
946 } 880 }
947 881
948 sfree (spaces, size ()), spaces = 0; 882 sfree (spaces, size ()), spaces = 0;
… …
987maptile::do_destroy () 921maptile::do_destroy ()
988{ 922{
989 attachable::do_destroy (); 923 attachable::do_destroy ();
990 924
991 clear (); 925 clear ();
926}
927
928/* decay and destroy perishable items in a map */
929void
930maptile::do_decay_objects ()
931{
932 if (!spaces)
933 return;
934
935 for (mapspace *ms = spaces + size (); ms-- > spaces; )
936 for (object *above, *op = ms->bot; op; op = above)
937 {
938 above = op->above;
939
940 bool destroy = 0;
941
942 // do not decay anything above unique floor tiles (yet :)
943 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
944 break;
945
946 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
947 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
948 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
949 || QUERY_FLAG (op, FLAG_UNIQUE)
950 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
951 || QUERY_FLAG (op, FLAG_UNPAID)
952 || op->is_alive ())
953 ; // do not decay
954 else if (op->is_weapon ())
955 {
956 op->stats.dam--;
957 if (op->stats.dam < 0)
958 destroy = 1;
959 }
960 else if (op->is_armor ())
961 {
962 op->stats.ac--;
963 if (op->stats.ac < 0)
964 destroy = 1;
965 }
966 else if (op->type == FOOD)
967 {
968 op->stats.food -= rndm (5, 20);
969 if (op->stats.food < 0)
970 destroy = 1;
971 }
972 else
973 {
974 int mat = op->materials;
975
976 if (mat & M_PAPER
977 || mat & M_LEATHER
978 || mat & M_WOOD
979 || mat & M_ORGANIC
980 || mat & M_CLOTH
981 || mat & M_LIQUID
982 || (mat & M_IRON && rndm (1, 5) == 1)
983 || (mat & M_GLASS && rndm (1, 2) == 1)
984 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
985 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
986 || (mat & M_ICE && temp > 32))
987 destroy = 1;
988 }
989
990 /* adjust overall chance below */
991 if (destroy && rndm (0, 1))
992 op->destroy ();
993 }
992} 994}
993 995
994/* 996/*
995 * Updates every button on the map (by calling update_button() for them). 997 * Updates every button on the map (by calling update_button() for them).
996 */ 998 */
… …
1044 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1046 if (QUERY_FLAG (op, FLAG_GENERATOR))
1045 { 1047 {
1046 total_exp += op->stats.exp; 1048 total_exp += op->stats.exp;
1047 1049
1048 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1049 total_exp += at->clone.stats.exp * 8; 1051 total_exp += at->stats.exp * 8;
1050 1052
1051 monster_cnt++; 1053 monster_cnt++;
1052 } 1054 }
1053 } 1055 }
1054 1056
… …
1109void 1111void
1110mapspace::update_ () 1112mapspace::update_ ()
1111{ 1113{
1112 object *tmp, *last = 0; 1114 object *tmp, *last = 0;
1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 facetile *top, *floor, *middle;
1115 object *top_obj, *floor_obj, *middle_obj;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1117
1118 middle = blank_face; 1118 //object *middle = 0;
1119 top = blank_face; 1119 //object *top = 0;
1120 floor = blank_face; 1120 //object *floor = 0;
1121 1121 // this seems to generate better code than using locals, above
1122 middle_obj = 0; 1122 object *&top = faces_obj[0] = 0;
1123 top_obj = 0; 1123 object *&middle = faces_obj[1] = 0;
1124 floor_obj = 0; 1124 object *&floor = faces_obj[2] = 0;
1125 1125
1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1126 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1127 { 1127 {
1128 /* This could be made additive I guess (two lights better than 1128 /* This could be made additive I guess (two lights better than
1129 * one). But if so, it shouldn't be a simple additive - 2 1129 * one). But if so, it shouldn't be a simple additive - 2
… …
1142 * Always put the player down for drawing. 1142 * Always put the player down for drawing.
1143 */ 1143 */
1144 if (!tmp->invisible) 1144 if (!tmp->invisible)
1145 { 1145 {
1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1146 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1147 {
1148 top = tmp->face;
1149 top_obj = tmp; 1147 top = tmp;
1150 }
1151 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1148 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1152 { 1149 {
1153 /* If we got a floor, that means middle and top were below it, 1150 /* If we got a floor, that means middle and top were below it,
1154 * so should not be visible, so we clear them. 1151 * so should not be visible, so we clear them.
1155 */ 1152 */
1156 middle = blank_face; 1153 middle = 0;
1157 top = blank_face; 1154 top = 0;
1158 floor = tmp->face;
1159 floor_obj = tmp; 1155 floor = tmp;
1160 } 1156 }
1161 /* Flag anywhere have high priority */ 1157 /* Flag anywhere have high priority */
1162 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1158 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1163 { 1159 {
1164 middle = tmp->face;
1165
1166 middle_obj = tmp; 1160 middle = tmp;
1167 anywhere = 1; 1161 anywhere = 1;
1168 } 1162 }
1169 /* Find the highest visible face around. If equal 1163 /* Find the highest visible face around. If equal
1170 * visibilities, we still want the one nearer to the 1164 * visibilities, we still want the one nearer to the
1171 * top 1165 * top
1172 */ 1166 */
1173 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1167 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1174 {
1175 middle = tmp->face;
1176 middle_obj = tmp; 1168 middle = tmp;
1177 }
1178 } 1169 }
1179 1170
1180 if (tmp == tmp->above) 1171 if (tmp == tmp->above)
1181 { 1172 {
1182 LOG (llevError, "Error in structure of map\n"); 1173 LOG (llevError, "Error in structure of map\n");
… …
1217 * middle face. This should not happen, as we already have the 1208 * middle face. This should not happen, as we already have the
1218 * else statement above so middle should not get set. OTOH, it 1209 * else statement above so middle should not get set. OTOH, it
1219 * may be possible for the faces to match but be different objects. 1210 * may be possible for the faces to match but be different objects.
1220 */ 1211 */
1221 if (top == middle) 1212 if (top == middle)
1222 middle = blank_face; 1213 middle = 0;
1223 1214
1224 /* There are three posibilities at this point: 1215 /* There are three posibilities at this point:
1225 * 1) top face is set, need middle to be set. 1216 * 1) top face is set, need middle to be set.
1226 * 2) middle is set, need to set top. 1217 * 2) middle is set, need to set top.
1227 * 3) neither middle or top is set - need to set both. 1218 * 3) neither middle or top is set - need to set both.
… …
1232 /* Once we get to a floor, stop, since we already have a floor object */ 1223 /* Once we get to a floor, stop, since we already have a floor object */
1233 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1224 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1234 break; 1225 break;
1235 1226
1236 /* If two top faces are already set, quit processing */ 1227 /* If two top faces are already set, quit processing */
1237 if ((top != blank_face) && (middle != blank_face)) 1228 if (top && middle)
1238 break; 1229 break;
1239 1230
1240 /* Only show visible faces */ 1231 /* Only show visible faces */
1241 if (!tmp->invisible) 1232 if (!tmp->invisible)
1242 { 1233 {
1243 /* Fill in top if needed */ 1234 /* Fill in top if needed */
1244 if (top == blank_face) 1235 if (!top)
1245 { 1236 {
1246 top = tmp->face;
1247 top_obj = tmp; 1237 top = tmp;
1248 if (top == middle) 1238 if (top == middle)
1249 middle = blank_face; 1239 middle = 0;
1250 } 1240 }
1251 else 1241 else
1252 { 1242 {
1253 /* top is already set - we should only get here if 1243 /* top is already set - we should only get here if
1254 * middle is not set 1244 * middle is not set
1255 * 1245 *
1256 * Set the middle face and break out, since there is nothing 1246 * Set the middle face and break out, since there is nothing
1257 * more to fill in. We don't check visiblity here, since 1247 * more to fill in. We don't check visiblity here, since
1258 * 1248 *
1259 */ 1249 */
1260 if (tmp->face != top) 1250 if (tmp != top)
1261 { 1251 {
1262 middle = tmp->face;
1263 middle_obj = tmp; 1252 middle = tmp;
1264 break; 1253 break;
1265 } 1254 }
1266 } 1255 }
1267 } 1256 }
1268 } 1257 }
1269 1258
1270 if (middle == floor) 1259 if (middle == floor)
1271 middle = blank_face; 1260 middle = 0;
1272 1261
1273 if (top == middle) 1262 if (top == middle)
1274 middle = blank_face; 1263 middle = 0;
1275 1264
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1265#if 0
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1266 faces_obj [0] = top;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1267 faces_obj [1] = middle;
1268 faces_obj [2] = floor;
1269#endif
1279} 1270}
1280 1271
1281uint64 1272uint64
1282mapspace::volume () const 1273mapspace::volume () const
1283{ 1274{
… …
1581get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1582{ 1573{
1583 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1574 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1584 { 1575 {
1585 /* be conservative and fill in _some_ data */ 1576 /* be conservative and fill in _some_ data */
1586 retval->distance = 100000; 1577 retval->distance = 10000;
1587 retval->distance_x = 32767; 1578 retval->distance_x = 10000;
1588 retval->distance_y = 32767; 1579 retval->distance_y = 10000;
1589 retval->direction = 0; 1580 retval->direction = 0;
1590 retval->part = 0; 1581 retval->part = 0;
1591 } 1582 }
1592 else 1583 else
1593 { 1584 {
… …
1598 1589
1599 best = op1; 1590 best = op1;
1600 /* If this is multipart, find the closest part now */ 1591 /* If this is multipart, find the closest part now */
1601 if (!(flags & 0x1) && op1->more) 1592 if (!(flags & 0x1) && op1->more)
1602 { 1593 {
1603 object *tmp;
1604 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1594 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1605 1595
1606 /* we just take the offset of the piece to head to figure 1596 /* we just take the offset of the piece to head to figure
1607 * distance instead of doing all that work above again 1597 * distance instead of doing all that work above again
1608 * since the distance fields we set above are positive in the 1598 * since the distance fields we set above are positive in the
1609 * same axis as is used for multipart objects, the simply arithmetic 1599 * same axis as is used for multipart objects, the simply arithmetic
1610 * below works. 1600 * below works.
1611 */ 1601 */
1612 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1602 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1613 { 1603 {
1614 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1604 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1615 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1605 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1616 if (tmpi < best_distance) 1606 if (tmpi < best_distance)
1617 { 1607 {
… …
1626 retval->distance_y += op1->y - best->y; 1616 retval->distance_y += op1->y - best->y;
1627 } 1617 }
1628 } 1618 }
1629 1619
1630 retval->part = best; 1620 retval->part = best;
1631 retval->distance = idistance (retval->distance_x, retval->distance_y); 1621 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1632 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1622 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1633 } 1623 }
1634} 1624}
1635 1625
1636/* this is basically the same as get_rangevector above, but instead of 1626/* this is basically the same as get_rangevector above, but instead of
… …
1704 return default_region; 1694 return default_region;
1705 1695
1706 return ::region::default_region (); 1696 return ::region::default_region ();
1707} 1697}
1708 1698
1699/* picks a random object from a style map.
1700 * Redone by MSW so it should be faster and not use static
1701 * variables to generate tables.
1702 */
1703object *
1704maptile::pick_random_object () const
1705{
1706 /* while returning a null object will result in a crash, that
1707 * is actually preferable to an infinite loop. That is because
1708 * most servers will automatically restart in case of crash.
1709 * Change the logic on getting the random space - shouldn't make
1710 * any difference, but this seems clearer to me.
1711 */
1712 for (int i = 1000; --i;)
1713 {
1714 object *pick = at (rndm (width), rndm (height)).bot;
1709 1715
1716 // do not prefer big monsters just because they are big.
1717 if (pick && pick->head_ () == pick)
1718 return pick->head_ ();
1719 }
1720
1721 // instead of crashing in the unlikely(?) case, try to return *something*
1722 return get_archetype ("blocked");
1723}
1724

Diff Legend

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