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.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC

… …
141 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
143 */ 143 */
144 144
145 /* For each field in wants, */ 145 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 147 {
148 key_value *has_field; 148 key_value *has_field;
149 149
150 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 222
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 225
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 227 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 228 || ob1->name != ob2->name
229 || ob1->title != ob2->title 229 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 230 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 231 || ob1->weight != ob2->weight
… …
364{ 364{
365 if (!op) 365 if (!op)
366 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
367 367
368 object_freezer freezer; 368 object_freezer freezer;
369 save_object (freezer, op, 3); 369 save_object (freezer, op, 1);
370 return freezer.as_string (); 370 return freezer.as_string ();
371} 371}
372 372
373/* 373/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
… …
467 } 467 }
468 468
469 op->key_values = 0; 469 op->key_values = 0;
470} 470}
471 471
472void object::clear ()
473{
474 attachable_base::clear ();
475
476 free_key_values (this);
477
478 owner = 0;
479 name = 0;
480 name_pl = 0;
481 title = 0;
482 race = 0;
483 slaying = 0;
484 skill = 0;
485 msg = 0;
486 lore = 0;
487 custom_name = 0;
488 materialname = 0;
489 contr = 0;
490 below = 0;
491 above = 0;
492 inv = 0;
493 container = 0;
494 env = 0;
495 more = 0;
496 head = 0;
497 map = 0;
498 active_next = 0;
499 active_prev = 0;
500
501 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503 SET_FLAG (this, FLAG_REMOVED);
504
505 /* What is not cleared is next, prev, and count */
506
507 expmul = 1.0;
508 face = blank_face;
509
510 if (settings.casting_time)
511 casting_time = -1;
512}
513
514/* 472/*
515 * copy_to first frees everything allocated by the dst object, 473 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second 474 * and then copies the contents of itself into the second
517 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
518 * 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,
… …
524{ 482{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527 485
528 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533 487
534 if (is_freed) 488 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
536 490
537 if (is_removed) 491 if (is_removed)
… …
568 tail = new_link; 522 tail = new_link;
569 } 523 }
570 } 524 }
571 } 525 }
572 526
573 update_ob_speed (dst); 527 dst->set_speed (dst->speed);
574} 528}
575 529
576object * 530object *
577object::clone () 531object::clone ()
578{ 532{
… …
600 * Updates the speed of an object. If the speed changes from 0 to another 554 * Updates the speed of an object. If the speed changes from 0 to another
601 * value, or vice versa, then add/remove the object from the active list. 555 * value, or vice versa, then add/remove the object from the active list.
602 * This function needs to be called whenever the speed of an object changes. 556 * This function needs to be called whenever the speed of an object changes.
603 */ 557 */
604void 558void
605update_ob_speed (object *op) 559object::set_speed (float speed)
606{ 560{
607 extern int arch_init; 561 extern int arch_init;
608 562
609 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
610 * since they never really need to be updated. 564 * since they never really need to be updated.
611 */ 565 */
612 566 if (flag [FLAG_FREED] && speed)
613 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614 { 567 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0; 569 speed = 0;
620#endif
621 } 570 }
571
572 this->speed = speed;
622 573
623 if (arch_init) 574 if (arch_init)
624 return; 575 return;
625 576
626 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 577 if (FABS (speed) > MIN_ACTIVE_SPEED)
627 { 578 {
628 /* If already on active list, don't do anything */ 579 /* If already on active list, don't do anything */
629 if (op->active_next || op->active_prev || op == active_objects) 580 if (active_next || active_prev || this == active_objects)
630 return; 581 return;
631 582
632 /* process_events() expects us to insert the object at the beginning 583 /* process_events() expects us to insert the object at the beginning
633 * of the list. */ 584 * of the list. */
634 op->active_next = active_objects; 585 active_next = active_objects;
635 586
636 if (op->active_next != NULL) 587 if (active_next)
637 op->active_next->active_prev = op; 588 active_next->active_prev = this;
638 589
639 active_objects = op; 590 active_objects = this;
640 } 591 }
641 else 592 else
642 { 593 {
643 /* If not on the active list, nothing needs to be done */ 594 /* If not on the active list, nothing needs to be done */
644 if (!op->active_next && !op->active_prev && op != active_objects) 595 if (!active_next && !active_prev && this != active_objects)
645 return; 596 return;
646 597
647 if (op->active_prev == NULL) 598 if (!active_prev)
648 { 599 {
649 active_objects = op->active_next; 600 active_objects = active_next;
650 601
651 if (op->active_next != NULL) 602 if (active_next)
652 op->active_next->active_prev = NULL; 603 active_next->active_prev = 0;
653 } 604 }
654 else 605 else
655 { 606 {
656 op->active_prev->active_next = op->active_next; 607 active_prev->active_next = active_next;
657 608
658 if (op->active_next) 609 if (active_next)
659 op->active_next->active_prev = op->active_prev; 610 active_next->active_prev = active_prev;
660 } 611 }
661 612
662 op->active_next = NULL; 613 active_next = 0;
663 op->active_prev = NULL; 614 active_prev = 0;
664 } 615 }
665} 616}
666 617
667/* This function removes object 'op' from the list of active 618/* This function removes object 'op' from the list of active
668 * objects. 619 * objects.
… …
737 */ 688 */
738 if (!op->map || op->map->in_memory == MAP_SAVING) 689 if (!op->map || op->map->in_memory == MAP_SAVING)
739 return; 690 return;
740 691
741 /* make sure the object is within map boundaries */ 692 /* make sure the object is within map boundaries */
742 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 693 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743 { 694 {
744 LOG (llevError, "update_object() called for object out of map!\n"); 695 LOG (llevError, "update_object() called for object out of map!\n");
745#ifdef MANY_CORES 696#ifdef MANY_CORES
746 abort (); 697 abort ();
747#endif 698#endif
748 return; 699 return;
749 } 700 }
750 701
751 mapspace &m = op->map->at (op->x, op->y); 702 mapspace &m = op->ms ();
752 703
753 if (m.flags_ & P_NEED_UPDATE) 704 if (m.flags_ & P_NEED_UPDATE)
754 /* nop */; 705 /* nop */;
755 else if (action == UP_OBJ_INSERT) 706 else if (action == UP_OBJ_INSERT)
756 { 707 {
… …
784 735
785 if (op->more) 736 if (op->more)
786 update_object (op->more, action); 737 update_object (op->more, action);
787} 738}
788 739
789object::vector object::mortals;
790object::vector object::objects; // not yet used 740object::vector object::objects; // not yet used
791object *object::first; 741object *object::first;
792
793void object::free_mortals ()
794{
795 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796 if ((*i)->refcnt)
797 ++i; // further delay freeing
798 else
799 {
800 delete *i;
801 mortals.erase (i);
802 }
803}
804 742
805object::object () 743object::object ()
806{ 744{
807 SET_FLAG (this, FLAG_REMOVED); 745 SET_FLAG (this, FLAG_REMOVED);
808 746
… …
847 object *op = new object; 785 object *op = new object;
848 op->link (); 786 op->link ();
849 return op; 787 return op;
850} 788}
851 789
852/* 790void
853 * free_object() frees everything allocated by an object, removes 791object::do_destroy ()
854 * it from the list of used objects, and puts it on the list of
855 * free objects. The IS_FREED() flag is set in the object.
856 * The object must have been removed by remove_ob() first for
857 * this function to succeed.
858 *
859 * If destroy_inventory is set, free inventory as well. Else drop items in
860 * inventory to the ground.
861 */
862void object::destroy (bool destroy_inventory)
863{ 792{
864 if (QUERY_FLAG (this, FLAG_FREED)) 793 attachable::do_destroy ();
794
795 if (flag [FLAG_IS_LINKED])
796 remove_button_link (this);
797
798 if (flag [FLAG_FRIENDLY])
799 remove_friendly_object (this);
800
801 if (!flag [FLAG_REMOVED])
802 remove ();
803
804 if (flag [FLAG_FREED])
865 return; 805 return;
866 806
867 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 807 flag [FLAG_FREED] = 1;
868 remove_friendly_object (this);
869 808
870 if (!QUERY_FLAG (this, FLAG_REMOVED))
871 remove ();
872
873 SET_FLAG (this, FLAG_FREED);
874
875 if (more)
876 {
877 more->destroy (destroy_inventory);
878 more = 0;
879 }
880
881 if (inv) 809 while (inv)
882 { 810 inv->destroy ();
883 /* Only if the space blocks everything do we not process -
884 * if some form of movement is allowed, let objects
885 * drop on that space.
886 */
887 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888 {
889 object *op = inv;
890 811
891 while (op) 812 set_speed (0);
892 { 813 unlink ();
893 object *tmp = op->below;
894 op->destroy (destroy_inventory);
895 op = tmp;
896 }
897 }
898 else
899 { /* Put objects in inventory onto this space */
900 object *op = inv;
901
902 while (op)
903 {
904 object *tmp = op->below;
905
906 op->remove ();
907
908 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910 op->destroy ();
911 else
912 {
913 op->x = x;
914 op->y = y;
915 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916 }
917
918 op = tmp;
919 }
920 }
921 }
922 814
923 // hack to ensure that freed objects still have a valid map 815 // hack to ensure that freed objects still have a valid map
924 { 816 {
925 static maptile *freed_map; // freed objects are moved here to avoid crashes 817 static maptile *freed_map; // freed objects are moved here to avoid crashes
926 818
… …
938 map = freed_map; 830 map = freed_map;
939 x = 1; 831 x = 1;
940 y = 1; 832 y = 1;
941 } 833 }
942 834
835 head = 0;
836
837 if (more)
838 {
839 more->destroy ();
840 more = 0;
841 }
842
943 // clear those pointers that likely might have circular references to us 843 // clear those pointers that likely might have circular references to us
944 owner = 0; 844 owner = 0;
945 enemy = 0; 845 enemy = 0;
946 attacked_by = 0; 846 attacked_by = 0;
947 847
948 // only relevant for players(?), but make sure of it anyways 848 // only relevant for players(?), but make sure of it anyways
949 contr = 0; 849 contr = 0;
850}
950 851
951 /* Remove object from the active list */ 852/*
952 speed = 0; 853 * Remove and free all objects in the inventory of the given object.
953 update_ob_speed (this); 854 * object.c ?
855 */
856void
857object::destroy_inv (bool drop_to_ground)
858{
859 /* Only if the space blocks everything do we not process -
860 * if some form of movement is allowed, let objects
861 * drop on that space.
862 */
863 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
864 {
865 while (inv)
866 inv->destroy ();
867 }
868 else
869 { /* Put objects in inventory onto this space */
870 while (inv)
871 {
872 object *op = inv;
954 873
955 unlink (); 874 if (op->flag [FLAG_STARTEQUIP]
875 || op->flag [FLAG_NO_DROP]
876 || op->type == RUNE
877 || op->type == TRAP
878 || op->flag [FLAG_IS_A_TEMPLATE])
879 op->destroy ();
880 else
881 {
882 op->remove ();
883 op->x = x;
884 op->y = y;
885 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
886 }
887 }
888 }
889}
956 890
957 mortals.push_back (this); 891void
892object::destroy (bool destroy_inventory)
893{
894 if (destroyed ())
895 return;
896
897 if (destroy_inventory)
898 destroy_inv (true);
899
900 attachable::destroy ();
958} 901}
959 902
960/* 903/*
961 * sub_weight() recursively (outwards) subtracts a number from the 904 * sub_weight() recursively (outwards) subtracts a number from the
962 * weight of an object (and what is carried by it's environment(s)). 905 * weight of an object (and what is carried by it's environment(s)).
… …
986object::remove () 929object::remove ()
987{ 930{
988 object *tmp, *last = 0; 931 object *tmp, *last = 0;
989 object *otmp; 932 object *otmp;
990 933
991 int check_walk_off;
992
993 if (QUERY_FLAG (this, FLAG_REMOVED)) 934 if (QUERY_FLAG (this, FLAG_REMOVED))
994 return; 935 return;
995 936
996 SET_FLAG (this, FLAG_REMOVED); 937 SET_FLAG (this, FLAG_REMOVED);
938 INVOKE_OBJECT (REMOVE, this);
997 939
998 if (more) 940 if (more)
999 more->remove (); 941 more->remove ();
1000 942
1001 /* 943 /*
… …
1012 /* NO_FIX_PLAYER is set when a great many changes are being 954 /* NO_FIX_PLAYER is set when a great many changes are being
1013 * made to players inventory. If set, avoiding the call 955 * made to players inventory. If set, avoiding the call
1014 * to save cpu time. 956 * to save cpu time.
1015 */ 957 */
1016 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 958 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017 fix_player (otmp); 959 otmp->update_stats ();
1018 960
1019 if (above != NULL) 961 if (above != NULL)
1020 above->below = below; 962 above->below = below;
1021 else 963 else
1022 env->inv = below; 964 env->inv = below;
… …
1063 dump = dump_object (GET_MAP_OB (map, x, y)); 1005 dump = dump_object (GET_MAP_OB (map, x, y));
1064 LOG (llevError, "%s\n", dump); 1006 LOG (llevError, "%s\n", dump);
1065 free (dump); 1007 free (dump);
1066 } 1008 }
1067 1009
1068 map->at (x, y).bottom = above; /* goes on above it. */ 1010 map->at (x, y).bot = above; /* goes on above it. */
1069 } 1011 }
1070 1012
1071 above = 0; 1013 above = 0;
1072 below = 0; 1014 below = 0;
1073 1015
1074 if (map->in_memory == MAP_SAVING) 1016 if (map->in_memory == MAP_SAVING)
1075 return; 1017 return;
1076 1018
1077 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1019 int check_walk_off = !flag [FLAG_NO_APPLY];
1078 1020
1079 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1021 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1080 { 1022 {
1081 /* No point updating the players look faces if he is the object 1023 /* No point updating the players look faces if he is the object
1082 * being removed. 1024 * being removed.
… …
1088 * removed (most likely destroyed), update the player view 1030 * removed (most likely destroyed), update the player view
1089 * appropriately. 1031 * appropriately.
1090 */ 1032 */
1091 if (tmp->container == this) 1033 if (tmp->container == this)
1092 { 1034 {
1093 CLEAR_FLAG (this, FLAG_APPLIED); 1035 flag [FLAG_APPLIED] = 0;
1094 tmp->container = 0; 1036 tmp->container = 0;
1095 } 1037 }
1096 1038
1039 if (tmp->contr->ns)
1097 tmp->contr->socket->floorbox_update (); 1040 tmp->contr->ns->floorbox_update ();
1098 } 1041 }
1099 1042
1100 /* See if player moving off should effect something */ 1043 /* See if player moving off should effect something */
1101 if (check_walk_off 1044 if (check_walk_off
1102 && ((move_type & tmp->move_off) 1045 && ((move_type & tmp->move_off)
… …
1120 if (!last) 1063 if (!last)
1121 map->at (x, y).flags_ = P_NEED_UPDATE; 1064 map->at (x, y).flags_ = P_NEED_UPDATE;
1122 else 1065 else
1123 update_object (last, UP_OBJ_REMOVE); 1066 update_object (last, UP_OBJ_REMOVE);
1124 1067
1125 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1068 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126 update_all_los (map, x, y); 1069 update_all_los (map, x, y);
1127 } 1070 }
1128} 1071}
1129 1072
1130/* 1073/*
… …
1139merge_ob (object *op, object *top) 1082merge_ob (object *op, object *top)
1140{ 1083{
1141 if (!op->nrof) 1084 if (!op->nrof)
1142 return 0; 1085 return 0;
1143 1086
1144 if (top == NULL) 1087 if (top)
1145 for (top = op; top != NULL && top->above != NULL; top = top->above); 1088 for (top = op; top && top->above; top = top->above)
1089 ;
1146 1090
1147 for (; top != NULL; top = top->below) 1091 for (; top; top = top->below)
1148 { 1092 {
1149 if (top == op) 1093 if (top == op)
1150 continue; 1094 continue;
1151 1095
1152 if (object::can_merge (op, top)) 1096 if (object::can_merge (op, top))
… …
1202 * Return value: 1146 * Return value:
1203 * new object if 'op' was merged with other object 1147 * new object if 'op' was merged with other object
1204 * NULL if 'op' was destroyed 1148 * NULL if 'op' was destroyed
1205 * just 'op' otherwise 1149 * just 'op' otherwise
1206 */ 1150 */
1207
1208object * 1151object *
1209insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1152insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210{ 1153{
1211 object *tmp, *top, *floor = NULL; 1154 object *tmp, *top, *floor = NULL;
1212 sint16 x, y; 1155 sint16 x, y;
… …
1246 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1189 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247 free (dump); 1190 free (dump);
1248 return op; 1191 return op;
1249 } 1192 }
1250 1193
1251 if (op->more != NULL) 1194 if (op->more)
1252 { 1195 {
1253 /* The part may be on a different map. */ 1196 /* The part may be on a different map. */
1254 1197
1255 object *more = op->more; 1198 object *more = op->more;
1256 1199
… …
1272 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1215 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273 { 1216 {
1274 if (!op->head) 1217 if (!op->head)
1275 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1218 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276 1219
1277 return NULL; 1220 return 0;
1278 } 1221 }
1279 } 1222 }
1280 1223
1281 CLEAR_FLAG (op, FLAG_REMOVED); 1224 CLEAR_FLAG (op, FLAG_REMOVED);
1282 1225
… …
1316 op->below = originator->below; 1259 op->below = originator->below;
1317 1260
1318 if (op->below) 1261 if (op->below)
1319 op->below->above = op; 1262 op->below->above = op;
1320 else 1263 else
1321 op->map->at (op->x, op->y).bottom = op; 1264 op->ms ().bot = op;
1322 1265
1323 /* since *below* originator, no need to update top */ 1266 /* since *below* originator, no need to update top */
1324 originator->below = op; 1267 originator->below = op;
1325 } 1268 }
1326 else 1269 else
… …
1405 1348
1406 if (op->above) 1349 if (op->above)
1407 op->above->below = op; 1350 op->above->below = op;
1408 1351
1409 op->below = NULL; 1352 op->below = NULL;
1410 op->map->at (op->x, op->y).bottom = op; 1353 op->ms ().bot = op;
1411 } 1354 }
1412 else 1355 else
1413 { /* get inserted into the stack above top */ 1356 { /* get inserted into the stack above top */
1414 op->above = top->above; 1357 op->above = top->above;
1415 1358
… …
1419 op->below = top; 1362 op->below = top;
1420 top->above = op; 1363 top->above = op;
1421 } 1364 }
1422 1365
1423 if (op->above == NULL) 1366 if (op->above == NULL)
1424 op->map->at (op->x, op->y).top = op; 1367 op->ms ().top = op;
1425 } /* else not INS_BELOW_ORIGINATOR */ 1368 } /* else not INS_BELOW_ORIGINATOR */
1426 1369
1427 if (op->type == PLAYER) 1370 if (op->type == PLAYER)
1428 op->contr->do_los = 1; 1371 op->contr->do_los = 1;
1429 1372
1430 /* If we have a floor, we know the player, if any, will be above 1373 /* If we have a floor, we know the player, if any, will be above
1431 * it, so save a few ticks and start from there. 1374 * it, so save a few ticks and start from there.
1432 */ 1375 */
1433 if (!(flag & INS_MAP_LOAD)) 1376 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = op->map->at (op->x, op->y).player ()) 1377 if (object *pl = op->ms ().player ())
1378 if (pl->contr->ns)
1435 pl->contr->socket->floorbox_update (); 1379 pl->contr->ns->floorbox_update ();
1436 1380
1437 /* If this object glows, it may affect lighting conditions that are 1381 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1382 * visible to others on this map. But update_all_los is really
1439 * an inefficient way to do this, as it means los for all players 1383 * an inefficient way to do this, as it means los for all players
1440 * on the map will get recalculated. The players could very well 1384 * on the map will get recalculated. The players could very well
1441 * be far away from this change and not affected in any way - 1385 * be far away from this change and not affected in any way -
1442 * this should get redone to only look for players within range, 1386 * this should get redone to only look for players within range,
1443 * or just updating the P_NEED_UPDATE for spaces within this area 1387 * or just updating the P_NEED_UPDATE for spaces within this area
1444 * of effect may be sufficient. 1388 * of effect may be sufficient.
1445 */ 1389 */
1446 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1390 if (op->map->darkness && (op->glow_radius != 0))
1447 update_all_los (op->map, op->x, op->y); 1391 update_all_los (op->map, op->x, op->y);
1448 1392
1449 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1393 /* updates flags (blocked, alive, no magic, etc) for this map space */
1450 update_object (op, UP_OBJ_INSERT); 1394 update_object (op, UP_OBJ_INSERT);
1395
1396 INVOKE_OBJECT (INSERT, op);
1451 1397
1452 /* Don't know if moving this to the end will break anything. However, 1398 /* Don't know if moving this to the end will break anything. However,
1453 * we want to have floorbox_update called before calling this. 1399 * we want to have floorbox_update called before calling this.
1454 * 1400 *
1455 * check_move_on() must be after this because code called from 1401 * check_move_on() must be after this because code called from
… …
1460 1406
1461 /* if this is not the head or flag has been passed, don't check walk on status */ 1407 /* if this is not the head or flag has been passed, don't check walk on status */
1462 if (!(flag & INS_NO_WALK_ON) && !op->head) 1408 if (!(flag & INS_NO_WALK_ON) && !op->head)
1463 { 1409 {
1464 if (check_move_on (op, originator)) 1410 if (check_move_on (op, originator))
1465 return NULL; 1411 return 0;
1466 1412
1467 /* If we are a multi part object, lets work our way through the check 1413 /* If we are a multi part object, lets work our way through the check
1468 * walk on's. 1414 * walk on's.
1469 */ 1415 */
1470 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1416 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1471 if (check_move_on (tmp, originator)) 1417 if (check_move_on (tmp, originator))
1472 return NULL; 1418 return 0;
1473 } 1419 }
1474 1420
1475 return op; 1421 return op;
1476} 1422}
1477 1423
… …
1548 1494
1549object * 1495object *
1550decrease_ob_nr (object *op, uint32 i) 1496decrease_ob_nr (object *op, uint32 i)
1551{ 1497{
1552 object *tmp; 1498 object *tmp;
1553 player *pl;
1554 1499
1555 if (i == 0) /* objects with op->nrof require this check */ 1500 if (i == 0) /* objects with op->nrof require this check */
1556 return op; 1501 return op;
1557 1502
1558 if (i > op->nrof) 1503 if (i > op->nrof)
… …
1571 * IMO, searching through all the players will mostly 1516 * IMO, searching through all the players will mostly
1572 * likely be quicker than following op->env to the map, 1517 * likely be quicker than following op->env to the map,
1573 * and then searching the map for a player. 1518 * and then searching the map for a player.
1574 */ 1519 */
1575 if (!tmp) 1520 if (!tmp)
1576 { 1521 for_all_players (pl)
1577 for (pl = first_player; pl; pl = pl->next)
1578 if (pl->ob->container == op->env) 1522 if (pl->ob->container == op->env)
1579 { 1523 {
1580 tmp = pl->ob; 1524 tmp = pl->ob;
1581 break; 1525 break;
1582 } 1526 }
1583 }
1584 1527
1585 if (i < op->nrof) 1528 if (i < op->nrof)
1586 { 1529 {
1587 sub_weight (op->env, op->weight * i); 1530 sub_weight (op->env, op->weight * i);
1588 op->nrof -= i; 1531 op->nrof -= i;
… …
1724 add_weight (this, (op->weight + op->carrying)); 1667 add_weight (this, (op->weight + op->carrying));
1725 1668
1726 otmp = this->in_player (); 1669 otmp = this->in_player ();
1727 if (otmp && otmp->contr) 1670 if (otmp && otmp->contr)
1728 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1671 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729 fix_player (otmp); 1672 otmp->update_stats ();
1730 1673
1731 op->map = 0; 1674 op->map = 0;
1732 op->env = this; 1675 op->env = this;
1733 op->above = 0; 1676 op->above = 0;
1734 op->below = 0; 1677 op->below = 0;
… …
1738 if ((op->glow_radius != 0) && map) 1681 if ((op->glow_radius != 0) && map)
1739 { 1682 {
1740#ifdef DEBUG_LIGHTS 1683#ifdef DEBUG_LIGHTS
1741 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1684 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742#endif /* DEBUG_LIGHTS */ 1685#endif /* DEBUG_LIGHTS */
1743 if (MAP_DARKNESS (map)) 1686 if (map->darkness)
1744 update_all_los (map, x, y); 1687 update_all_los (map, x, y);
1745 } 1688 }
1746 1689
1747 /* Client has no idea of ordering so lets not bother ordering it here. 1690 /* Client has no idea of ordering so lets not bother ordering it here.
1748 * It sure simplifies this function... 1691 * It sure simplifies this function...
… …
1753 { 1696 {
1754 op->below = inv; 1697 op->below = inv;
1755 op->below->above = op; 1698 op->below->above = op;
1756 inv = op; 1699 inv = op;
1757 } 1700 }
1701
1702 INVOKE_OBJECT (INSERT, this);
1758 1703
1759 return op; 1704 return op;
1760} 1705}
1761 1706
1762/* 1707/*
… …
1814 1759
1815 /* The objects have to be checked from top to bottom. 1760 /* The objects have to be checked from top to bottom.
1816 * Hence, we first go to the top: 1761 * Hence, we first go to the top:
1817 */ 1762 */
1818 1763
1819 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1764 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1820 { 1765 {
1821 /* Trim the search when we find the first other spell effect 1766 /* Trim the search when we find the first other spell effect
1822 * this helps performance so that if a space has 50 spell objects, 1767 * this helps performance so that if a space has 50 spell objects,
1823 * we don't need to check all of them. 1768 * we don't need to check all of them.
1824 */ 1769 */
… …
1879/* 1824/*
1880 * present_arch(arch, map, x, y) searches for any objects with 1825 * present_arch(arch, map, x, y) searches for any objects with
1881 * a matching archetype at the given map and coordinates. 1826 * a matching archetype at the given map and coordinates.
1882 * The first matching object is returned, or NULL if none. 1827 * The first matching object is returned, or NULL if none.
1883 */ 1828 */
1884
1885object * 1829object *
1886present_arch (const archetype *at, maptile *m, int x, int y) 1830present_arch (const archetype *at, maptile *m, int x, int y)
1887{ 1831{
1888 object *
1889 tmp;
1890
1891 if (m == NULL || out_of_map (m, x, y)) 1832 if (m == NULL || out_of_map (m, x, y))
1892 { 1833 {
1893 LOG (llevError, "Present_arch called outside map.\n"); 1834 LOG (llevError, "Present_arch called outside map.\n");
1894 return NULL; 1835 return NULL;
1895 } 1836 }
1837
1896 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1838 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1897 if (tmp->arch == at) 1839 if (tmp->arch == at)
1898 return tmp; 1840 return tmp;
1841
1899 return NULL; 1842 return NULL;
1900} 1843}
1901 1844
1902/* 1845/*
1903 * present(type, map, x, y) searches for any objects with 1846 * present(type, map, x, y) searches for any objects with
1904 * a matching type variable at the given map and coordinates. 1847 * a matching type variable at the given map and coordinates.
1905 * The first matching object is returned, or NULL if none. 1848 * The first matching object is returned, or NULL if none.
1906 */ 1849 */
1907
1908object * 1850object *
1909present (unsigned char type, maptile *m, int x, int y) 1851present (unsigned char type, maptile *m, int x, int y)
1910{ 1852{
1911 object *
1912 tmp;
1913
1914 if (out_of_map (m, x, y)) 1853 if (out_of_map (m, x, y))
1915 { 1854 {
1916 LOG (llevError, "Present called outside map.\n"); 1855 LOG (llevError, "Present called outside map.\n");
1917 return NULL; 1856 return NULL;
1918 } 1857 }
1858
1919 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1859 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1920 if (tmp->type == type) 1860 if (tmp->type == type)
1921 return tmp; 1861 return tmp;
1862
1922 return NULL; 1863 return NULL;
1923} 1864}
1924 1865
1925/* 1866/*
1926 * present_in_ob(type, object) searches for any objects with 1867 * present_in_ob(type, object) searches for any objects with
1927 * a matching type variable in the inventory of the given object. 1868 * a matching type variable in the inventory of the given object.
1928 * The first matching object is returned, or NULL if none. 1869 * The first matching object is returned, or NULL if none.
1929 */ 1870 */
1930
1931object * 1871object *
1932present_in_ob (unsigned char type, const object *op) 1872present_in_ob (unsigned char type, const object *op)
1933{ 1873{
1934 object *
1935 tmp;
1936
1937 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1874 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938 if (tmp->type == type) 1875 if (tmp->type == type)
1939 return tmp; 1876 return tmp;
1877
1940 return NULL; 1878 return NULL;
1941} 1879}
1942 1880
1943/* 1881/*
1944 * present_in_ob (type, str, object) searches for any objects with 1882 * present_in_ob (type, str, object) searches for any objects with
… …
1952 * str is the string to match against. Note that we match against 1890 * str is the string to match against. Note that we match against
1953 * the object name, not the archetype name. this is so that the 1891 * the object name, not the archetype name. this is so that the
1954 * spell code can use one object type (force), but change it's name 1892 * spell code can use one object type (force), but change it's name
1955 * to be unique. 1893 * to be unique.
1956 */ 1894 */
1957
1958object * 1895object *
1959present_in_ob_by_name (int type, const char *str, const object *op) 1896present_in_ob_by_name (int type, const char *str, const object *op)
1960{ 1897{
1961 object *
1962 tmp;
1963
1964 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1898 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 {
1966 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1899 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967 return tmp; 1900 return tmp;
1968 } 1901
1969 return NULL; 1902 return 0;
1970} 1903}
1971 1904
1972/* 1905/*
1973 * present_arch_in_ob(archetype, object) searches for any objects with 1906 * present_arch_in_ob(archetype, object) searches for any objects with
1974 * a matching archetype in the inventory of the given object. 1907 * a matching archetype in the inventory of the given object.
1975 * The first matching object is returned, or NULL if none. 1908 * The first matching object is returned, or NULL if none.
1976 */ 1909 */
1977
1978object * 1910object *
1979present_arch_in_ob (const archetype *at, const object *op) 1911present_arch_in_ob (const archetype *at, const object *op)
1980{ 1912{
1981 object *
1982 tmp;
1983
1984 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1913 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985 if (tmp->arch == at) 1914 if (tmp->arch == at)
1986 return tmp; 1915 return tmp;
1916
1987 return NULL; 1917 return NULL;
1988} 1918}
1989 1919
1990/* 1920/*
1991 * activate recursively a flag on an object inventory 1921 * activate recursively a flag on an object inventory
1992 */ 1922 */
1993void 1923void
1994flag_inv (object *op, int flag) 1924flag_inv (object *op, int flag)
1995{ 1925{
1996 object *
1997 tmp;
1998
1999 if (op->inv) 1926 if (op->inv)
2000 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1927 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001 { 1928 {
2002 SET_FLAG (tmp, flag); 1929 SET_FLAG (tmp, flag);
2003 flag_inv (tmp, flag); 1930 flag_inv (tmp, flag);
2004 } 1931 }
2005} /* 1932}
1933
1934/*
2006 * desactivate recursively a flag on an object inventory 1935 * deactivate recursively a flag on an object inventory
2007 */ 1936 */
2008void 1937void
2009unflag_inv (object *op, int flag) 1938unflag_inv (object *op, int flag)
2010{ 1939{
2011 object *
2012 tmp;
2013
2014 if (op->inv) 1940 if (op->inv)
2015 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1941 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016 { 1942 {
2017 CLEAR_FLAG (tmp, flag); 1943 CLEAR_FLAG (tmp, flag);
2018 unflag_inv (tmp, flag); 1944 unflag_inv (tmp, flag);
2019 } 1945 }
2020} 1946}
… …
2023 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1949 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024 * all it's inventory (recursively). 1950 * all it's inventory (recursively).
2025 * If checksums are used, a player will get set_cheat called for 1951 * If checksums are used, a player will get set_cheat called for
2026 * him/her-self and all object carried by a call to this function. 1952 * him/her-self and all object carried by a call to this function.
2027 */ 1953 */
2028
2029void 1954void
2030set_cheat (object *op) 1955set_cheat (object *op)
2031{ 1956{
2032 SET_FLAG (op, FLAG_WAS_WIZ); 1957 SET_FLAG (op, FLAG_WAS_WIZ);
2033 flag_inv (op, FLAG_WAS_WIZ); 1958 flag_inv (op, FLAG_WAS_WIZ);
… …
2052 * because arch_blocked (now ob_blocked) needs to know the movement type 1977 * because arch_blocked (now ob_blocked) needs to know the movement type
2053 * to know if the space in question will block the object. We can't use 1978 * to know if the space in question will block the object. We can't use
2054 * the archetype because that isn't correct if the monster has been 1979 * the archetype because that isn't correct if the monster has been
2055 * customized, changed states, etc. 1980 * customized, changed states, etc.
2056 */ 1981 */
2057
2058int 1982int
2059find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1983find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060{ 1984{
2061 int
2062 i,
2063 index = 0, flag; 1985 int index = 0, flag;
2064 static int
2065 altern[SIZEOFFREE]; 1986 int altern[SIZEOFFREE];
2066 1987
2067 for (i = start; i < stop; i++) 1988 for (int i = start; i < stop; i++)
2068 { 1989 {
2069 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1990 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2070 if (!flag) 1991 if (!flag)
2071 altern[index++] = i; 1992 altern [index++] = i;
2072 1993
2073 /* Basically, if we find a wall on a space, we cut down the search size. 1994 /* Basically, if we find a wall on a space, we cut down the search size.
2074 * In this way, we won't return spaces that are on another side of a wall. 1995 * In this way, we won't return spaces that are on another side of a wall.
2075 * This mostly work, but it cuts down the search size in all directions - 1996 * This mostly work, but it cuts down the search size in all directions -
2076 * if the space being examined only has a wall to the north and empty 1997 * if the space being examined only has a wall to the north and empty
… …
2092 * find_first_free_spot(archetype, maptile, x, y) works like 2013 * find_first_free_spot(archetype, maptile, x, y) works like
2093 * find_free_spot(), but it will search max number of squares. 2014 * find_free_spot(), but it will search max number of squares.
2094 * But it will return the first available spot, not a random choice. 2015 * But it will return the first available spot, not a random choice.
2095 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2016 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2096 */ 2017 */
2097
2098int 2018int
2099find_first_free_spot (const object *ob, maptile *m, int x, int y) 2019find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100{ 2020{
2101 int
2102 i;
2103
2104 for (i = 0; i < SIZEOFFREE; i++) 2021 for (int i = 0; i < SIZEOFFREE; i++)
2105 {
2106 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2022 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2107 return i; 2023 return i;
2108 } 2024
2109 return -1; 2025 return -1;
2110} 2026}
2111 2027
2112/* 2028/*
2113 * The function permute(arr, begin, end) randomly reorders the array 2029 * The function permute(arr, begin, end) randomly reorders the array
2114 * arr[begin..end-1]. 2030 * arr[begin..end-1].
2031 * now uses a fisher-yates shuffle, old permute was broken
2115 */ 2032 */
2116static void 2033static void
2117permute (int *arr, int begin, int end) 2034permute (int *arr, int begin, int end)
2118{ 2035{
2119 int 2036 arr += begin;
2120 i,
2121 j,
2122 tmp,
2123 len;
2124
2125 len = end - begin; 2037 end -= begin;
2126 for (i = begin; i < end; i++)
2127 {
2128 j = begin + RANDOM () % len;
2129 2038
2130 tmp = arr[i]; 2039 while (--end)
2131 arr[i] = arr[j]; 2040 swap (arr [end], arr [RANDOM () % (end + 1)]);
2132 arr[j] = tmp;
2133 }
2134} 2041}
2135 2042
2136/* new function to make monster searching more efficient, and effective! 2043/* new function to make monster searching more efficient, and effective!
2137 * This basically returns a randomized array (in the passed pointer) of 2044 * This basically returns a randomized array (in the passed pointer) of
2138 * the spaces to find monsters. In this way, it won't always look for 2045 * the spaces to find monsters. In this way, it won't always look for
… …
2141 * the 3x3 area will be searched, just not in a predictable order. 2048 * the 3x3 area will be searched, just not in a predictable order.
2142 */ 2049 */
2143void 2050void
2144get_search_arr (int *search_arr) 2051get_search_arr (int *search_arr)
2145{ 2052{
2146 int 2053 int i;
2147 i;
2148 2054
2149 for (i = 0; i < SIZEOFFREE; i++) 2055 for (i = 0; i < SIZEOFFREE; i++)
2150 {
2151 search_arr[i] = i; 2056 search_arr[i] = i;
2152 }
2153 2057
2154 permute (search_arr, 1, SIZEOFFREE1 + 1); 2058 permute (search_arr, 1, SIZEOFFREE1 + 1);
2155 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2059 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2060 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157} 2061}
… …
2166 * Perhaps incorrectly, but I'm making the assumption that exclude 2070 * Perhaps incorrectly, but I'm making the assumption that exclude
2167 * is actually want is going to try and move there. We need this info 2071 * is actually want is going to try and move there. We need this info
2168 * because we have to know what movement the thing looking to move 2072 * because we have to know what movement the thing looking to move
2169 * there is capable of. 2073 * there is capable of.
2170 */ 2074 */
2171
2172int 2075int
2173find_dir (maptile *m, int x, int y, object *exclude) 2076find_dir (maptile *m, int x, int y, object *exclude)
2174{ 2077{
2175 int
2176 i,
2177 max = SIZEOFFREE, mflags; 2078 int i, max = SIZEOFFREE, mflags;
2178 2079
2179 sint16 nx, ny; 2080 sint16 nx, ny;
2180 object * 2081 object *tmp;
2181 tmp;
2182 maptile * 2082 maptile *mp;
2183 mp;
2184 2083
2185 MoveType blocked, move_type; 2084 MoveType blocked, move_type;
2186 2085
2187 if (exclude && exclude->head) 2086 if (exclude && exclude->head)
2188 { 2087 {
… …
2205 2104
2206 if (mflags & P_OUT_OF_MAP) 2105 if (mflags & P_OUT_OF_MAP)
2207 max = maxfree[i]; 2106 max = maxfree[i];
2208 else 2107 else
2209 { 2108 {
2210 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2109 mapspace &ms = mp->at (nx, ny);
2110
2111 blocked = ms.move_block;
2211 2112
2212 if ((move_type & blocked) == move_type) 2113 if ((move_type & blocked) == move_type)
2213 max = maxfree[i]; 2114 max = maxfree[i];
2214 else if (mflags & P_IS_ALIVE) 2115 else if (mflags & P_IS_ALIVE)
2215 { 2116 {
2216 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2117 for (tmp = ms.bot; tmp; tmp = tmp->above)
2217 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2118 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2119 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2218 break; 2120 break;
2219 2121
2220 if (tmp) 2122 if (tmp)
2221 return freedir[i]; 2123 return freedir[i];
2222 } 2124 }
… …
2228 2130
2229/* 2131/*
2230 * distance(object 1, object 2) will return the square of the 2132 * distance(object 1, object 2) will return the square of the
2231 * distance between the two given objects. 2133 * distance between the two given objects.
2232 */ 2134 */
2233
2234int 2135int
2235distance (const object *ob1, const object *ob2) 2136distance (const object *ob1, const object *ob2)
2236{ 2137{
2237 int i;
2238
2239 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2138 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240 return i;
2241} 2139}
2242 2140
2243/* 2141/*
2244 * find_dir_2(delta-x,delta-y) will return a direction in which 2142 * find_dir_2(delta-x,delta-y) will return a direction in which
2245 * an object which has subtracted the x and y coordinates of another 2143 * an object which has subtracted the x and y coordinates of another
2246 * object, needs to travel toward it. 2144 * object, needs to travel toward it.
2247 */ 2145 */
2248
2249int 2146int
2250find_dir_2 (int x, int y) 2147find_dir_2 (int x, int y)
2251{ 2148{
2252 int q; 2149 int q;
2253 2150
… …
2292int 2189int
2293absdir (int d) 2190absdir (int d)
2294{ 2191{
2295 while (d < 1) 2192 while (d < 1)
2296 d += 8; 2193 d += 8;
2194
2297 while (d > 8) 2195 while (d > 8)
2298 d -= 8; 2196 d -= 8;
2197
2299 return d; 2198 return d;
2300} 2199}
2301 2200
2302/* 2201/*
2303 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2202 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2305 */ 2204 */
2306 2205
2307int 2206int
2308dirdiff (int dir1, int dir2) 2207dirdiff (int dir1, int dir2)
2309{ 2208{
2310 int 2209 int d;
2311 d;
2312 2210
2313 d = abs (dir1 - dir2); 2211 d = abs (dir1 - dir2);
2314 if (d > 4) 2212 if (d > 4)
2315 d = 8 - d; 2213 d = 8 - d;
2214
2316 return d; 2215 return d;
2317} 2216}
2318 2217
2319/* peterm: 2218/* peterm:
2320 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2219 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2323 * This basically means that if direction is 15, then it could either go 2222 * This basically means that if direction is 15, then it could either go
2324 * direction 4, 14, or 16 to get back to where we are. 2223 * direction 4, 14, or 16 to get back to where we are.
2325 * Moved from spell_util.c to object.c with the other related direction 2224 * Moved from spell_util.c to object.c with the other related direction
2326 * functions. 2225 * functions.
2327 */ 2226 */
2328
2329int
2330 reduction_dir[SIZEOFFREE][3] = { 2227int reduction_dir[SIZEOFFREE][3] = {
2331 {0, 0, 0}, /* 0 */ 2228 {0, 0, 0}, /* 0 */
2332 {0, 0, 0}, /* 1 */ 2229 {0, 0, 0}, /* 1 */
2333 {0, 0, 0}, /* 2 */ 2230 {0, 0, 0}, /* 2 */
2334 {0, 0, 0}, /* 3 */ 2231 {0, 0, 0}, /* 3 */
2335 {0, 0, 0}, /* 4 */ 2232 {0, 0, 0}, /* 4 */
… …
2485/* Basically, we save the content of the string to a temp file, then call */ 2382/* Basically, we save the content of the string to a temp file, then call */
2486/* load_object on it. I admit it is a highly inefficient way to make things, */ 2383/* load_object on it. I admit it is a highly inefficient way to make things, */
2487/* but it was simple to make and allows reusing the load_object function. */ 2384/* but it was simple to make and allows reusing the load_object function. */
2488/* Remember not to use load_object_str in a time-critical situation. */ 2385/* Remember not to use load_object_str in a time-critical situation. */
2489/* Also remember that multiparts objects are not supported for now. */ 2386/* Also remember that multiparts objects are not supported for now. */
2490
2491object * 2387object *
2492load_object_str (const char *obstr) 2388load_object_str (const char *obstr)
2493{ 2389{
2494 object *op; 2390 object *op;
2495 char filename[MAX_BUF]; 2391 char filename[MAX_BUF];
… …
2525 * returns NULL if no match. 2421 * returns NULL if no match.
2526 */ 2422 */
2527object * 2423object *
2528find_obj_by_type_subtype (const object *who, int type, int subtype) 2424find_obj_by_type_subtype (const object *who, int type, int subtype)
2529{ 2425{
2530 object *tmp;
2531
2532 for (tmp = who->inv; tmp; tmp = tmp->below) 2426 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533 if (tmp->type == type && tmp->subtype == subtype) 2427 if (tmp->type == type && tmp->subtype == subtype)
2534 return tmp; 2428 return tmp;
2535 2429
2536 return NULL; 2430 return 0;
2537} 2431}
2538 2432
2539/* If ob has a field named key, return the link from the list, 2433/* If ob has a field named key, return the link from the list,
2540 * otherwise return NULL. 2434 * otherwise return NULL.
2541 * 2435 *
… …
2543 * do the desired thing. 2437 * do the desired thing.
2544 */ 2438 */
2545key_value * 2439key_value *
2546get_ob_key_link (const object *ob, const char *key) 2440get_ob_key_link (const object *ob, const char *key)
2547{ 2441{
2548 key_value *link;
2549
2550 for (link = ob->key_values; link != NULL; link = link->next) 2442 for (key_value *link = ob->key_values; link; link = link->next)
2551 if (link->key == key) 2443 if (link->key == key)
2552 return link; 2444 return link;
2553 2445
2554 return NULL; 2446 return 0;
2555} 2447}
2556 2448
2557/* 2449/*
2558 * Returns the value of op has an extra_field for key, or NULL. 2450 * Returns the value of op has an extra_field for key, or NULL.
2559 * 2451 *
… …
2599 * Returns TRUE on success. 2491 * Returns TRUE on success.
2600 */ 2492 */
2601int 2493int
2602set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2494set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603{ 2495{
2604 key_value *
2605 field = NULL, *last = NULL; 2496 key_value *field = NULL, *last = NULL;
2606 2497
2607 for (field = op->key_values; field != NULL; field = field->next) 2498 for (field = op->key_values; field != NULL; field = field->next)
2608 { 2499 {
2609 if (field->key != canonical_key) 2500 if (field->key != canonical_key)
2610 { 2501 {
… …
2638 /* IF we get here, key doesn't exist */ 2529 /* IF we get here, key doesn't exist */
2639 2530
2640 /* No field, we'll have to add it. */ 2531 /* No field, we'll have to add it. */
2641 2532
2642 if (!add_key) 2533 if (!add_key)
2643 {
2644 return FALSE; 2534 return FALSE;
2645 } 2535
2646 /* There isn't any good reason to store a null 2536 /* There isn't any good reason to store a null
2647 * value in the key/value list. If the archetype has 2537 * value in the key/value list. If the archetype has
2648 * this key, then we should also have it, so shouldn't 2538 * this key, then we should also have it, so shouldn't
2649 * be here. If user wants to store empty strings, 2539 * be here. If user wants to store empty strings,
2650 * should pass in "" 2540 * should pass in ""

Diff Legend

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