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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.69 by root, Mon Dec 18 03:00:02 2006 UTC vs.
Revision 1.79 by root, Sat Dec 23 06:30:49 2006 UTC

… …
352 op = op->env; 352 op = op->env;
353 return op; 353 return op;
354} 354}
355 355
356/* 356/*
357 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
358 * a better check. We basically keeping traversing up until we can't
359 * or find a player.
360 */
361
362object *
363is_player_inv (object *op)
364{
365 for (; op != NULL && op->type != PLAYER; op = op->env)
366 if (op->env == op)
367 op->env = NULL;
368 return op;
369}
370
371/*
372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373 * Some error messages. 358 * Some error messages.
374 * The result of the dump is stored in the static global errmsg array. 359 * The result of the dump is stored in the static global errmsg array.
375 */ 360 */
376 361
… …
482 } 467 }
483 468
484 op->key_values = 0; 469 op->key_values = 0;
485} 470}
486 471
487void object::clear ()
488{
489 attachable_base::clear ();
490
491 free_key_values (this);
492
493 owner = 0;
494 name = 0;
495 name_pl = 0;
496 title = 0;
497 race = 0;
498 slaying = 0;
499 skill = 0;
500 msg = 0;
501 lore = 0;
502 custom_name = 0;
503 materialname = 0;
504 contr = 0;
505 below = 0;
506 above = 0;
507 inv = 0;
508 container = 0;
509 env = 0;
510 more = 0;
511 head = 0;
512 map = 0;
513 active_next = 0;
514 active_prev = 0;
515
516 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
517
518 SET_FLAG (this, FLAG_REMOVED);
519
520 /* What is not cleared is next, prev, and count */
521
522 expmul = 1.0;
523 face = blank_face;
524
525 if (settings.casting_time)
526 casting_time = -1;
527}
528
529/* 472/*
530 * copy_to first frees everything allocated by the dst object, 473 * copy_to first frees everything allocated by the dst object,
531 * and then copies the contents of itself into the second 474 * and then copies the contents of itself into the second
532 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
533 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
… …
539{ 482{
540 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
541 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
542 485
543 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
544 *(object_pod *)dst = *this;
545 487
546 if (self || cb) 488 if (self || cb)
547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 489 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
548 490
549 if (is_freed) 491 if (is_freed)
… …
709 op->active_next = NULL; 651 op->active_next = NULL;
710 op->active_prev = NULL; 652 op->active_prev = NULL;
711} 653}
712 654
713/* 655/*
714 * update_object() updates the array which represents the map. 656 * update_object() updates the the map.
715 * It takes into account invisible objects (and represent squares covered 657 * It takes into account invisible objects (and represent squares covered
716 * by invisible objects by whatever is below them (unless it's another 658 * by invisible objects by whatever is below them (unless it's another
717 * invisible object, etc...) 659 * invisible object, etc...)
718 * If the object being updated is beneath a player, the look-window 660 * If the object being updated is beneath a player, the look-window
719 * of that player is updated (this might be a suboptimal way of 661 * of that player is updated (this might be a suboptimal way of
720 * updating that window, though, since update_object() is called _often_) 662 * updating that window, though, since update_object() is called _often_)
721 * 663 *
722 * action is a hint of what the caller believes need to be done. 664 * action is a hint of what the caller believes need to be done.
723 * For example, if the only thing that has changed is the face (due to
724 * an animation), we don't need to call update_position until that actually
725 * comes into view of a player. OTOH, many other things, like addition/removal
726 * of walls or living creatures may need us to update the flags now.
727 * current action are: 665 * current action are:
728 * UP_OBJ_INSERT: op was inserted 666 * UP_OBJ_INSERT: op was inserted
729 * UP_OBJ_REMOVE: op was removed 667 * UP_OBJ_REMOVE: op was removed
730 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 668 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731 * as that is easier than trying to look at what may have changed. 669 * as that is easier than trying to look at what may have changed.
732 * UP_OBJ_FACE: only the objects face has changed. 670 * UP_OBJ_FACE: only the objects face has changed.
733 */ 671 */
734
735void 672void
736update_object (object *op, int action) 673update_object (object *op, int action)
737{ 674{
738 int update_now = 0, flags;
739 MoveType move_on, move_off, move_block, move_slow; 675 MoveType move_on, move_off, move_block, move_slow;
740 676
741 if (op == NULL) 677 if (op == NULL)
742 { 678 {
743 /* this should never happen */ 679 /* this should never happen */
744 LOG (llevDebug, "update_object() called for NULL object.\n"); 680 LOG (llevDebug, "update_object() called for NULL object.\n");
745 return; 681 return;
746 } 682 }
747 683
748 if (op->env != NULL) 684 if (op->env)
749 { 685 {
750 /* Animation is currently handled by client, so nothing 686 /* Animation is currently handled by client, so nothing
751 * to do in this case. 687 * to do in this case.
752 */ 688 */
753 return; 689 return;
… …
767 abort (); 703 abort ();
768#endif 704#endif
769 return; 705 return;
770 } 706 }
771 707
772 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 708 mapspace &m = op->ms ();
773 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778 709
710 if (m.flags_ & P_NEED_UPDATE)
711 /* nop */;
779 if (action == UP_OBJ_INSERT) 712 else if (action == UP_OBJ_INSERT)
780 { 713 {
714 // this is likely overkill, TODO: revisit (schmorp)
781 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 715 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782 update_now = 1;
783
784 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 716 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785 update_now = 1; 717 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786 718 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
719 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 720 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788 update_now = 1;
789
790 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791 update_now = 1;
792
793 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794 update_now = 1;
795
796 if ((move_on | op->move_on) != move_on) 721 || (m.move_on | op->move_on ) != m.move_on
797 update_now = 1;
798
799 if ((move_off | op->move_off) != move_off) 722 || (m.move_off | op->move_off ) != m.move_off
800 update_now = 1; 723 || (m.move_slow | op->move_slow) != m.move_slow
801
802 /* This isn't perfect, but I don't expect a lot of objects to 724 /* This isn't perfect, but I don't expect a lot of objects to
803 * to have move_allow right now. 725 * to have move_allow right now.
804 */ 726 */
805 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 727 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806 update_now = 1; 728 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807 729 m.flags_ = P_NEED_UPDATE;
808 if ((move_slow | op->move_slow) != move_slow)
809 update_now = 1;
810 } 730 }
811
812 /* if the object is being removed, we can't make intelligent 731 /* if the object is being removed, we can't make intelligent
813 * decisions, because remove_ob can't really pass the object 732 * decisions, because remove_ob can't really pass the object
814 * that is being removed. 733 * that is being removed.
815 */ 734 */
816 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 735 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
817 update_now = 1; 736 m.flags_ = P_NEED_UPDATE;
818 else if (action == UP_OBJ_FACE) 737 else if (action == UP_OBJ_FACE)
819 /* Nothing to do for that case */ ; 738 /* Nothing to do for that case */ ;
820 else 739 else
821 LOG (llevError, "update_object called with invalid action: %d\n", action); 740 LOG (llevError, "update_object called with invalid action: %d\n", action);
822 741
823 if (update_now)
824 {
825 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
826 update_position (op->map, op->x, op->y);
827 }
828
829 if (op->more != NULL) 742 if (op->more)
830 update_object (op->more, action); 743 update_object (op->more, action);
831} 744}
832 745
833object::vector object::mortals; 746object::vector object::mortals;
834object::vector object::objects; // not yet used 747object::vector object::objects; // not yet used
… …
1055 968
1056 /* NO_FIX_PLAYER is set when a great many changes are being 969 /* NO_FIX_PLAYER is set when a great many changes are being
1057 * made to players inventory. If set, avoiding the call 970 * made to players inventory. If set, avoiding the call
1058 * to save cpu time. 971 * to save cpu time.
1059 */ 972 */
1060 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 973 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1061 fix_player (otmp); 974 otmp->update_stats ();
1062 975
1063 if (above != NULL) 976 if (above != NULL)
1064 above->below = below; 977 above->below = below;
1065 else 978 else
1066 env->inv = below; 979 env->inv = below;
… …
1085 998
1086 /* link the object above us */ 999 /* link the object above us */
1087 if (above) 1000 if (above)
1088 above->below = below; 1001 above->below = below;
1089 else 1002 else
1090 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ 1003 map->at (x, y).top = below; /* we were top, set new top */
1091 1004
1092 /* Relink the object below us, if there is one */ 1005 /* Relink the object below us, if there is one */
1093 if (below) 1006 if (below)
1094 below->above = above; 1007 below->above = above;
1095 else 1008 else
… …
1107 dump = dump_object (GET_MAP_OB (map, x, y)); 1020 dump = dump_object (GET_MAP_OB (map, x, y));
1108 LOG (llevError, "%s\n", dump); 1021 LOG (llevError, "%s\n", dump);
1109 free (dump); 1022 free (dump);
1110 } 1023 }
1111 1024
1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */ 1025 map->at (x, y).bottom = above; /* goes on above it. */
1113 } 1026 }
1114 1027
1115 above = 0; 1028 above = 0;
1116 below = 0; 1029 below = 0;
1117 1030
… …
1136 { 1049 {
1137 CLEAR_FLAG (this, FLAG_APPLIED); 1050 CLEAR_FLAG (this, FLAG_APPLIED);
1138 tmp->container = 0; 1051 tmp->container = 0;
1139 } 1052 }
1140 1053
1141 tmp->contr->socket->update_look = 1; 1054 tmp->contr->ns->floorbox_update ();
1142 } 1055 }
1143 1056
1144 /* See if player moving off should effect something */ 1057 /* See if player moving off should effect something */
1145 if (check_walk_off 1058 if (check_walk_off
1146 && ((move_type & tmp->move_off) 1059 && ((move_type & tmp->move_off)
… …
1160 last = tmp; 1073 last = tmp;
1161 } 1074 }
1162 1075
1163 /* last == NULL of there are no objects on this space */ 1076 /* last == NULL of there are no objects on this space */
1164 if (!last) 1077 if (!last)
1165 { 1078 map->at (x, y).flags_ = P_NEED_UPDATE;
1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1167 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1168 * those out anyways, and if there are any flags set right now, they won't
1169 * be correct anyways.
1170 */
1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1172 update_position (map, x, y);
1173 }
1174 else 1079 else
1175 update_object (last, UP_OBJ_REMOVE); 1080 update_object (last, UP_OBJ_REMOVE);
1176 1081
1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1082 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1178 update_all_los (map, x, y); 1083 update_all_los (map, x, y);
… …
1368 op->below = originator->below; 1273 op->below = originator->below;
1369 1274
1370 if (op->below) 1275 if (op->below)
1371 op->below->above = op; 1276 op->below->above = op;
1372 else 1277 else
1373 SET_MAP_OB (op->map, op->x, op->y, op); 1278 op->ms ().bottom = op;
1374 1279
1375 /* since *below* originator, no need to update top */ 1280 /* since *below* originator, no need to update top */
1376 originator->below = op; 1281 originator->below = op;
1377 } 1282 }
1378 else 1283 else
… …
1424 * If INS_ON_TOP is used, don't do this processing 1329 * If INS_ON_TOP is used, don't do this processing
1425 * Need to find the object that in fact blocks view, otherwise 1330 * Need to find the object that in fact blocks view, otherwise
1426 * stacking is a bit odd. 1331 * stacking is a bit odd.
1427 */ 1332 */
1428 if (!(flag & INS_ON_TOP) && 1333 if (!(flag & INS_ON_TOP) &&
1429 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1334 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1430 { 1335 {
1431 for (last = top; last != floor; last = last->below) 1336 for (last = top; last != floor; last = last->below)
1432 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1337 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433 break; 1338 break;
1434 /* Check to see if we found the object that blocks view, 1339 /* Check to see if we found the object that blocks view,
… …
1457 1362
1458 if (op->above) 1363 if (op->above)
1459 op->above->below = op; 1364 op->above->below = op;
1460 1365
1461 op->below = NULL; 1366 op->below = NULL;
1462 SET_MAP_OB (op->map, op->x, op->y, op); 1367 op->ms ().bottom = op;
1463 } 1368 }
1464 else 1369 else
1465 { /* get inserted into the stack above top */ 1370 { /* get inserted into the stack above top */
1466 op->above = top->above; 1371 op->above = top->above;
1467 1372
… …
1471 op->below = top; 1376 op->below = top;
1472 top->above = op; 1377 top->above = op;
1473 } 1378 }
1474 1379
1475 if (op->above == NULL) 1380 if (op->above == NULL)
1476 SET_MAP_TOP (op->map, op->x, op->y, op); 1381 op->ms ().top = op;
1477 } /* else not INS_BELOW_ORIGINATOR */ 1382 } /* else not INS_BELOW_ORIGINATOR */
1478 1383
1479 if (op->type == PLAYER) 1384 if (op->type == PLAYER)
1480 op->contr->do_los = 1; 1385 op->contr->do_los = 1;
1481 1386
1482 /* If we have a floor, we know the player, if any, will be above 1387 /* If we have a floor, we know the player, if any, will be above
1483 * it, so save a few ticks and start from there. 1388 * it, so save a few ticks and start from there.
1484 */ 1389 */
1485 if (!(flag & INS_MAP_LOAD)) 1390 if (!(flag & INS_MAP_LOAD))
1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1391 if (object *pl = op->ms ().player ())
1487 if (tmp->type == PLAYER) 1392 pl->contr->ns->floorbox_update ();
1488 tmp->contr->socket->update_look = 1;
1489 1393
1490 /* If this object glows, it may affect lighting conditions that are 1394 /* If this object glows, it may affect lighting conditions that are
1491 * visible to others on this map. But update_all_los is really 1395 * visible to others on this map. But update_all_los is really
1492 * an inefficient way to do this, as it means los for all players 1396 * an inefficient way to do this, as it means los for all players
1493 * on the map will get recalculated. The players could very well 1397 * on the map will get recalculated. The players could very well
… …
1501 1405
1502 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1406 /* updates flags (blocked, alive, no magic, etc) for this map space */
1503 update_object (op, UP_OBJ_INSERT); 1407 update_object (op, UP_OBJ_INSERT);
1504 1408
1505 /* Don't know if moving this to the end will break anything. However, 1409 /* Don't know if moving this to the end will break anything. However,
1506 * we want to have update_look set above before calling this. 1410 * we want to have floorbox_update called before calling this.
1507 * 1411 *
1508 * check_move_on() must be after this because code called from 1412 * check_move_on() must be after this because code called from
1509 * check_move_on() depends on correct map flags (so functions like 1413 * check_move_on() depends on correct map flags (so functions like
1510 * blocked() and wall() work properly), and these flags are updated by 1414 * blocked() and wall() work properly), and these flags are updated by
1511 * update_object(). 1415 * update_object().
… …
1527 1431
1528 return op; 1432 return op;
1529} 1433}
1530 1434
1531/* this function inserts an object in the map, but if it 1435/* this function inserts an object in the map, but if it
1532 * finds an object of its own type, it'll remove that one first. 1436 * finds an object of its own type, it'll remove that one first.
1533 * op is the object to insert it under: supplies x and the map. 1437 * op is the object to insert it under: supplies x and the map.
1534 */ 1438 */
1535void 1439void
1536replace_insert_ob_in_map (const char *arch_string, object *op) 1440replace_insert_ob_in_map (const char *arch_string, object *op)
1537{ 1441{
1538 object * 1442 object *tmp, *tmp1;
1539 tmp;
1540 object *
1541 tmp1;
1542 1443
1543 /* first search for itself and remove any old instances */ 1444 /* first search for itself and remove any old instances */
1544 1445
1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1446 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1447 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
… …
1614 if (i > op->nrof) 1515 if (i > op->nrof)
1615 i = op->nrof; 1516 i = op->nrof;
1616 1517
1617 if (QUERY_FLAG (op, FLAG_REMOVED)) 1518 if (QUERY_FLAG (op, FLAG_REMOVED))
1618 op->nrof -= i; 1519 op->nrof -= i;
1619 else if (op->env != NULL) 1520 else if (op->env)
1620 { 1521 {
1621 /* is this object in the players inventory, or sub container 1522 /* is this object in the players inventory, or sub container
1622 * therein? 1523 * therein?
1623 */ 1524 */
1624 tmp = is_player_inv (op->env); 1525 tmp = op->in_player ();
1625 /* nope. Is this a container the player has opened? 1526 /* nope. Is this a container the player has opened?
1626 * If so, set tmp to that player. 1527 * If so, set tmp to that player.
1627 * IMO, searching through all the players will mostly 1528 * IMO, searching through all the players will mostly
1628 * likely be quicker than following op->env to the map, 1529 * likely be quicker than following op->env to the map,
1629 * and then searching the map for a player. 1530 * and then searching the map for a player.
1630 */ 1531 */
1631 if (!tmp) 1532 if (!tmp)
1632 { 1533 {
1633 for (pl = first_player; pl; pl = pl->next) 1534 for (pl = first_player; pl; pl = pl->next)
1634 if (pl->ob->container == op->env) 1535 if (pl->ob->container == op->env)
1536 {
1537 tmp = pl->ob;
1635 break; 1538 break;
1636 if (pl) 1539 }
1637 tmp = pl->ob;
1638 else
1639 tmp = NULL;
1640 } 1540 }
1641 1541
1642 if (i < op->nrof) 1542 if (i < op->nrof)
1643 { 1543 {
1644 sub_weight (op->env, op->weight * i); 1544 sub_weight (op->env, op->weight * i);
1645 op->nrof -= i; 1545 op->nrof -= i;
1646 if (tmp) 1546 if (tmp)
1647 {
1648 esrv_send_item (tmp, op); 1547 esrv_send_item (tmp, op);
1649 }
1650 } 1548 }
1651 else 1549 else
1652 { 1550 {
1653 op->remove (); 1551 op->remove ();
1654 op->nrof = 0; 1552 op->nrof = 0;
1655 if (tmp) 1553 if (tmp)
1656 {
1657 esrv_del_item (tmp->contr, op->count); 1554 esrv_del_item (tmp->contr, op->count);
1658 }
1659 } 1555 }
1660 } 1556 }
1661 else 1557 else
1662 { 1558 {
1663 object *above = op->above; 1559 object *above = op->above;
… …
1669 op->remove (); 1565 op->remove ();
1670 op->nrof = 0; 1566 op->nrof = 0;
1671 } 1567 }
1672 1568
1673 /* Since we just removed op, op->above is null */ 1569 /* Since we just removed op, op->above is null */
1674 for (tmp = above; tmp != NULL; tmp = tmp->above) 1570 for (tmp = above; tmp; tmp = tmp->above)
1675 if (tmp->type == PLAYER) 1571 if (tmp->type == PLAYER)
1676 { 1572 {
1677 if (op->nrof) 1573 if (op->nrof)
1678 esrv_send_item (tmp, op); 1574 esrv_send_item (tmp, op);
1679 else 1575 else
… …
1684 if (op->nrof) 1580 if (op->nrof)
1685 return op; 1581 return op;
1686 else 1582 else
1687 { 1583 {
1688 op->destroy (); 1584 op->destroy ();
1689 return NULL; 1585 return 0;
1690 } 1586 }
1691} 1587}
1692 1588
1693/* 1589/*
1694 * add_weight(object, weight) adds the specified weight to an object, 1590 * add_weight(object, weight) adds the specified weight to an object,
… …
1782 add_weight (this, op->weight * op->nrof); 1678 add_weight (this, op->weight * op->nrof);
1783 } 1679 }
1784 else 1680 else
1785 add_weight (this, (op->weight + op->carrying)); 1681 add_weight (this, (op->weight + op->carrying));
1786 1682
1787 otmp = is_player_inv (this); 1683 otmp = this->in_player ();
1788 if (otmp && otmp->contr) 1684 if (otmp && otmp->contr)
1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1685 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1790 fix_player (otmp); 1686 otmp->update_stats ();
1791 1687
1792 op->map = NULL; 1688 op->map = 0;
1793 op->env = this; 1689 op->env = this;
1794 op->above = NULL; 1690 op->above = 0;
1795 op->below = NULL; 1691 op->below = 0;
1796 op->x = 0, op->y = 0; 1692 op->x = 0, op->y = 0;
1797 1693
1798 /* reset the light list and los of the players on the map */ 1694 /* reset the light list and los of the players on the map */
1799 if ((op->glow_radius != 0) && map) 1695 if ((op->glow_radius != 0) && map)
1800 { 1696 {
… …
2137 * if the space being examined only has a wall to the north and empty 2033 * if the space being examined only has a wall to the north and empty
2138 * spaces in all the other directions, this will reduce the search space 2034 * spaces in all the other directions, this will reduce the search space
2139 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
2140 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2141 */ 2037 */
2142 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2038 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2143 stop = maxfree[i]; 2039 stop = maxfree[i];
2144 } 2040 }
2041
2145 if (!index) 2042 if (!index)
2146 return -1; 2043 return -1;
2044
2147 return altern[RANDOM () % index]; 2045 return altern[RANDOM () % index];
2148} 2046}
2149 2047
2150/* 2048/*
2151 * find_first_free_spot(archetype, maptile, x, y) works like 2049 * find_first_free_spot(archetype, maptile, x, y) works like
… …
2259 mp = m; 2157 mp = m;
2260 nx = x + freearr_x[i]; 2158 nx = x + freearr_x[i];
2261 ny = y + freearr_y[i]; 2159 ny = y + freearr_y[i];
2262 2160
2263 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2161 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2162
2264 if (mflags & P_OUT_OF_MAP) 2163 if (mflags & P_OUT_OF_MAP)
2265 {
2266 max = maxfree[i]; 2164 max = maxfree[i];
2267 }
2268 else 2165 else
2269 { 2166 {
2270 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2167 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2271 2168
2272 if ((move_type & blocked) == move_type) 2169 if ((move_type & blocked) == move_type)
2273 {
2274 max = maxfree[i]; 2170 max = maxfree[i];
2275 }
2276 else if (mflags & P_IS_ALIVE) 2171 else if (mflags & P_IS_ALIVE)
2277 { 2172 {
2278 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2173 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2279 {
2280 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2174 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2281 {
2282 break; 2175 break;
2283 } 2176
2284 }
2285 if (tmp) 2177 if (tmp)
2286 {
2287 return freedir[i]; 2178 return freedir[i];
2288 }
2289 } 2179 }
2290 } 2180 }
2291 } 2181 }
2182
2292 return 0; 2183 return 0;
2293} 2184}
2294 2185
2295/* 2186/*
2296 * distance(object 1, object 2) will return the square of the 2187 * distance(object 1, object 2) will return the square of the
… …
2298 */ 2189 */
2299 2190
2300int 2191int
2301distance (const object *ob1, const object *ob2) 2192distance (const object *ob1, const object *ob2)
2302{ 2193{
2303 int 2194 int i;
2304 i;
2305 2195
2306 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2196 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2307 return i; 2197 return i;
2308} 2198}
2309 2199
… …
2314 */ 2204 */
2315 2205
2316int 2206int
2317find_dir_2 (int x, int y) 2207find_dir_2 (int x, int y)
2318{ 2208{
2319 int 2209 int q;
2320 q;
2321 2210
2322 if (y) 2211 if (y)
2323 q = x * 100 / y; 2212 q = x * 100 / y;
2324 else if (x) 2213 else if (x)
2325 q = -300 * x; 2214 q = -300 * x;
… …
2451 * find a path to that monster that we found. If not, 2340 * find a path to that monster that we found. If not,
2452 * we don't bother going toward it. Returns 1 if we 2341 * we don't bother going toward it. Returns 1 if we
2453 * can see a direct way to get it 2342 * can see a direct way to get it
2454 * Modified to be map tile aware -.MSW 2343 * Modified to be map tile aware -.MSW
2455 */ 2344 */
2456
2457
2458int 2345int
2459can_see_monsterP (maptile *m, int x, int y, int dir) 2346can_see_monsterP (maptile *m, int x, int y, int dir)
2460{ 2347{
2461 sint16 dx, dy; 2348 sint16 dx, dy;
2462 int
2463 mflags; 2349 int mflags;
2464 2350
2465 if (dir < 0) 2351 if (dir < 0)
2466 return 0; /* exit condition: invalid direction */ 2352 return 0; /* exit condition: invalid direction */
2467 2353
2468 dx = x + freearr_x[dir]; 2354 dx = x + freearr_x[dir];
… …
2481 return 0; 2367 return 0;
2482 2368
2483 /* yes, can see. */ 2369 /* yes, can see. */
2484 if (dir < 9) 2370 if (dir < 9)
2485 return 1; 2371 return 1;
2372
2486 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2373 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2487 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2374 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2375 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2488} 2376}
2489
2490
2491 2377
2492/* 2378/*
2493 * can_pick(picker, item): finds out if an object is possible to be 2379 * can_pick(picker, item): finds out if an object is possible to be
2494 * picked up by the picker. Returnes 1 if it can be 2380 * picked up by the picker. Returnes 1 if it can be
2495 * picked up, otherwise 0. 2381 * picked up, otherwise 0.
… …
2506 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2392 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2507 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2393 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2508 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2394 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2509} 2395}
2510 2396
2511
2512/* 2397/*
2513 * create clone from object to another 2398 * create clone from object to another
2514 */ 2399 */
2515object * 2400object *
2516object_create_clone (object *asrc) 2401object_create_clone (object *asrc)
… …
2535 { 2420 {
2536 dst = tmp; 2421 dst = tmp;
2537 tmp->head = 0; 2422 tmp->head = 0;
2538 } 2423 }
2539 else 2424 else
2540 {
2541 tmp->head = dst; 2425 tmp->head = dst;
2542 }
2543 2426
2544 tmp->more = 0; 2427 tmp->more = 0;
2545 2428
2546 if (prev) 2429 if (prev)
2547 prev->more = tmp; 2430 prev->more = tmp;

Diff Legend

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