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.53 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 2006 UTC

… …
104 _exit (1); 104 _exit (1);
105 } 105 }
106 106
107 uuid.seq = uid; 107 uuid.seq = uid;
108 write_uuid (); 108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 110 fclose (fp);
111} 111}
112 112
113UUID 113UUID
114gen_uuid () 114gen_uuid ()
… …
412 */ 412 */
413 413
414object * 414object *
415find_object (tag_t i) 415find_object (tag_t i)
416{ 416{
417 object *op;
418
419 for (op = object::first; op != NULL; op = op->next) 417 for (object *op = object::first; op; op = op->next)
420 if (op->count == i) 418 if (op->count == i)
421 break; 419 return op;
422 420
423 return op; 421 return 0;
424} 422}
425 423
426/* 424/*
427 * Returns the first object which has a name equal to the argument. 425 * Returns the first object which has a name equal to the argument.
428 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
555 553
556 op2->clone (op); 554 op2->clone (op);
557 555
558 if (is_freed) 556 if (is_freed)
559 SET_FLAG (op, FLAG_FREED); 557 SET_FLAG (op, FLAG_FREED);
558
560 if (is_removed) 559 if (is_removed)
561 SET_FLAG (op, FLAG_REMOVED); 560 SET_FLAG (op, FLAG_REMOVED);
562 561
563 if (op2->speed < 0) 562 if (op2->speed < 0)
564 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
… …
806 update_now = 1; 805 update_now = 1;
807 806
808 if ((move_slow | op->move_slow) != move_slow) 807 if ((move_slow | op->move_slow) != move_slow)
809 update_now = 1; 808 update_now = 1;
810 } 809 }
810
811 /* if the object is being removed, we can't make intelligent 811 /* if the object is being removed, we can't make intelligent
812 * decisions, because remove_ob can't really pass the object 812 * decisions, because remove_ob can't really pass the object
813 * that is being removed. 813 * that is being removed.
814 */ 814 */
815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
841 else 841 else
842 { 842 {
843 delete *i; 843 delete *i;
844 mortals.erase (i); 844 mortals.erase (i);
845 } 845 }
846
847 static int lastmortals = 0;//D
848
849 if (mortals.size() != lastmortals && lastmortals > 100)//D
850 {
851 lastmortals = mortals.size ();//D
852 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853 }
854} 846}
855 847
856object::object () 848object::object ()
857{ 849{
858 SET_FLAG (this, FLAG_REMOVED); 850 SET_FLAG (this, FLAG_REMOVED);
… …
917 909
918 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 910 if (QUERY_FLAG (this, FLAG_FRIENDLY))
919 remove_friendly_object (this); 911 remove_friendly_object (this);
920 912
921 if (!QUERY_FLAG (this, FLAG_REMOVED)) 913 if (!QUERY_FLAG (this, FLAG_REMOVED))
922 remove_ob (this); 914 remove ();
923 915
924 SET_FLAG (this, FLAG_FREED); 916 SET_FLAG (this, FLAG_FREED);
925 917
926 if (more) 918 if (more)
927 { 919 {
… …
952 944
953 while (op) 945 while (op)
954 { 946 {
955 object *tmp = op->below; 947 object *tmp = op->below;
956 948
957 remove_ob (op); 949 op->remove ();
958 950
959 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 951 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
960 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 952 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
961 free_object (op); 953 op->destroy (0);
962 else 954 else
963 { 955 {
964 op->x = x; 956 op->x = x;
965 op->y = y; 957 op->y = y;
966 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 958 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
969 op = tmp; 961 op = tmp;
970 } 962 }
971 } 963 }
972 } 964 }
973 965
966 // hack to ensure that freed objects still have a valid map
967 {
968 static maptile *freed_map; // freed objects are moved here to avoid crashes
969
970 if (!freed_map)
971 {
972 freed_map = new maptile;
973
974 freed_map->name = "/internal/freed_objects_map";
975 freed_map->width = 3;
976 freed_map->height = 3;
977
978 freed_map->allocate ();
979 }
980
981 map = freed_map;
982 x = 1;
983 y = 1;
984 }
985
974 // clear those pointers that likely might have circular references to us 986 // clear those pointers that likely might have circular references to us
975 owner = 0; 987 owner = 0;
976 enemy = 0; 988 enemy = 0;
977 attacked_by = 0; 989 attacked_by = 0;
978 990
… …
990 1002
991/* 1003/*
992 * sub_weight() recursively (outwards) subtracts a number from the 1004 * sub_weight() recursively (outwards) subtracts a number from the
993 * weight of an object (and what is carried by it's environment(s)). 1005 * weight of an object (and what is carried by it's environment(s)).
994 */ 1006 */
995
996void 1007void
997sub_weight (object *op, signed long weight) 1008sub_weight (object *op, signed long weight)
998{ 1009{
999 while (op != NULL) 1010 while (op != NULL)
1000 { 1011 {
… …
1004 op->carrying -= weight; 1015 op->carrying -= weight;
1005 op = op->env; 1016 op = op->env;
1006 } 1017 }
1007} 1018}
1008 1019
1009/* remove_ob(op): 1020/* op->remove ():
1010 * This function removes the object op from the linked list of objects 1021 * This function removes the object op from the linked list of objects
1011 * which it is currently tied to. When this function is done, the 1022 * which it is currently tied to. When this function is done, the
1012 * object will have no environment. If the object previously had an 1023 * object will have no environment. If the object previously had an
1013 * environment, the x and y coordinates will be updated to 1024 * environment, the x and y coordinates will be updated to
1014 * the previous environment. 1025 * the previous environment.
1015 * Beware: This function is called from the editor as well! 1026 * Beware: This function is called from the editor as well!
1016 */ 1027 */
1017
1018void 1028void
1019remove_ob (object *op) 1029object::remove ()
1020{ 1030{
1021 object *tmp, *last = 0; 1031 object *tmp, *last = 0;
1022 object *otmp; 1032 object *otmp;
1023 1033
1024 int check_walk_off; 1034 int check_walk_off;
1025 maptile *m;
1026 1035
1027 sint16 x, y;
1028
1029 if (QUERY_FLAG (op, FLAG_REMOVED)) 1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1030 return; 1037 return;
1031 1038
1032 SET_FLAG (op, FLAG_REMOVED); 1039 SET_FLAG (this, FLAG_REMOVED);
1033 1040
1034 if (op->more != NULL) 1041 if (more)
1035 remove_ob (op->more); 1042 more->remove ();
1036 1043
1037 /* 1044 /*
1038 * In this case, the object to be removed is in someones 1045 * In this case, the object to be removed is in someones
1039 * inventory. 1046 * inventory.
1040 */ 1047 */
1041 if (op->env != NULL) 1048 if (env)
1042 { 1049 {
1043 if (op->nrof) 1050 if (nrof)
1044 sub_weight (op->env, op->weight * op->nrof); 1051 sub_weight (env, weight * nrof);
1045 else 1052 else
1046 sub_weight (op->env, op->weight + op->carrying); 1053 sub_weight (env, weight + carrying);
1047 1054
1048 /* NO_FIX_PLAYER is set when a great many changes are being 1055 /* NO_FIX_PLAYER is set when a great many changes are being
1049 * made to players inventory. If set, avoiding the call 1056 * made to players inventory. If set, avoiding the call
1050 * to save cpu time. 1057 * to save cpu time.
1051 */ 1058 */
1052 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1059 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1053 fix_player (otmp); 1060 fix_player (otmp);
1054 1061
1055 if (op->above != NULL) 1062 if (above != NULL)
1056 op->above->below = op->below; 1063 above->below = below;
1057 else 1064 else
1058 op->env->inv = op->below; 1065 env->inv = below;
1059 1066
1060 if (op->below != NULL) 1067 if (below != NULL)
1061 op->below->above = op->above; 1068 below->above = above;
1062 1069
1063 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1064 * the map, but we don't actually do that - it is up 1071 * the map, but we don't actually do that - it is up
1065 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1066 */ 1073 */
1067 op->x = op->env->x, op->y = op->env->y; 1074 x = env->x, y = env->y;
1068 op->map = op->env->map; 1075 map = env->map;
1069 op->above = NULL, op->below = NULL; 1076 above = 0, below = 0;
1070 op->env = NULL; 1077 env = 0;
1071 } 1078 }
1072 else if (op->map) 1079 else if (map)
1073 { 1080 {
1074 x = op->x;
1075 y = op->y;
1076 m = get_map_from_coord (op->map, &x, &y);
1077
1078 if (!m)
1079 {
1080 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1081 op->map->path, op->x, op->y);
1082 /* in old days, we used to set x and y to 0 and continue.
1083 * it seems if we get into this case, something is probablye
1084 * screwed up and should be fixed.
1085 */
1086 abort ();
1087 }
1088
1089 if (op->map != m)
1090 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1091 op->map->path, m->path, op->x, op->y, x, y);
1092
1093 /* Re did the following section of code - it looks like it had 1081 /* Re did the following section of code - it looks like it had
1094 * lots of logic for things we no longer care about 1082 * lots of logic for things we no longer care about
1095 */ 1083 */
1096 1084
1097 /* link the object above us */ 1085 /* link the object above us */
1098 if (op->above) 1086 if (above)
1099 op->above->below = op->below; 1087 above->below = below;
1100 else 1088 else
1101 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1089 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1102 1090
1103 /* Relink the object below us, if there is one */ 1091 /* Relink the object below us, if there is one */
1104 if (op->below) 1092 if (below)
1105 op->below->above = op->above; 1093 below->above = above;
1106 else 1094 else
1107 { 1095 {
1108 /* Nothing below, which means we need to relink map object for this space 1096 /* Nothing below, which means we need to relink map object for this space
1109 * use translated coordinates in case some oddness with map tiling is 1097 * use translated coordinates in case some oddness with map tiling is
1110 * evident 1098 * evident
1111 */ 1099 */
1112 if (GET_MAP_OB (m, x, y) != op) 1100 if (GET_MAP_OB (map, x, y) != this)
1113 { 1101 {
1114 char *dump = dump_object (op); 1102 char *dump = dump_object (this);
1115 LOG (llevError, 1103 LOG (llevError,
1116 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1104 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1117 free (dump); 1105 free (dump);
1118 dump = dump_object (GET_MAP_OB (m, x, y)); 1106 dump = dump_object (GET_MAP_OB (map, x, y));
1119 LOG (llevError, "%s\n", dump); 1107 LOG (llevError, "%s\n", dump);
1120 free (dump); 1108 free (dump);
1121 } 1109 }
1122 1110
1123 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1124 } 1112 }
1125 1113
1126 op->above = 0; 1114 above = 0;
1127 op->below = 0; 1115 below = 0;
1128 1116
1129 if (op->map->in_memory == MAP_SAVING) 1117 if (map->in_memory == MAP_SAVING)
1130 return; 1118 return;
1131 1119
1132 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1133 1121
1134 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1122 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1135 { 1123 {
1136 /* No point updating the players look faces if he is the object 1124 /* No point updating the players look faces if he is the object
1137 * being removed. 1125 * being removed.
1138 */ 1126 */
1139 1127
1140 if (tmp->type == PLAYER && tmp != op) 1128 if (tmp->type == PLAYER && tmp != this)
1141 { 1129 {
1142 /* If a container that the player is currently using somehow gets 1130 /* If a container that the player is currently using somehow gets
1143 * removed (most likely destroyed), update the player view 1131 * removed (most likely destroyed), update the player view
1144 * appropriately. 1132 * appropriately.
1145 */ 1133 */
1146 if (tmp->container == op) 1134 if (tmp->container == this)
1147 { 1135 {
1148 CLEAR_FLAG (op, FLAG_APPLIED); 1136 CLEAR_FLAG (this, FLAG_APPLIED);
1149 tmp->container = NULL; 1137 tmp->container = 0;
1150 } 1138 }
1151 1139
1152 tmp->contr->socket.update_look = 1; 1140 tmp->contr->socket.update_look = 1;
1153 } 1141 }
1154 1142
1155 /* See if player moving off should effect something */ 1143 /* See if player moving off should effect something */
1156 if (check_walk_off 1144 if (check_walk_off
1157 && ((op->move_type & tmp->move_off) 1145 && ((move_type & tmp->move_off)
1158 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1146 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1159 { 1147 {
1160 move_apply (tmp, op, NULL); 1148 move_apply (tmp, this, 0);
1161 1149
1162 if (op->destroyed ()) 1150 if (destroyed ())
1163 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1151 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1164 } 1152 }
1165 1153
1166 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1167 1155
1168 if (tmp->above == tmp) 1156 if (tmp->above == tmp)
1169 tmp->above = NULL; 1157 tmp->above = 0;
1170 1158
1171 last = tmp; 1159 last = tmp;
1172 } 1160 }
1173 1161
1174 /* last == NULL of there are no objects on this space */ 1162 /* last == NULL of there are no objects on this space */
1175 if (last == NULL) 1163 if (!last)
1176 { 1164 {
1177 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1178 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1166 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1179 * those out anyways, and if there are any flags set right now, they won't 1167 * those out anyways, and if there are any flags set right now, they won't
1180 * be correct anyways. 1168 * be correct anyways.
1181 */ 1169 */
1182 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1183 update_position (op->map, op->x, op->y); 1171 update_position (map, x, y);
1184 } 1172 }
1185 else 1173 else
1186 update_object (last, UP_OBJ_REMOVE); 1174 update_object (last, UP_OBJ_REMOVE);
1187 1175
1188 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1189 update_all_los (op->map, op->x, op->y); 1177 update_all_los (map, x, y);
1190 } 1178 }
1191} 1179}
1192 1180
1193/* 1181/*
1194 * merge_ob(op,top): 1182 * merge_ob(op,top):
… …
1215 { 1203 {
1216 top->nrof += op->nrof; 1204 top->nrof += op->nrof;
1217 1205
1218/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1219 op->weight = 0; /* Don't want any adjustements now */ 1207 op->weight = 0; /* Don't want any adjustements now */
1220 remove_ob (op); 1208 op->remove ();
1221 free_object (op); 1209 op->destroy (0);
1222 return top; 1210 return top;
1223 } 1211 }
1224 } 1212 }
1225 1213
1226 return 0; 1214 return 0;
… …
1356 if (op->nrof && !(flag & INS_NO_MERGE)) 1344 if (op->nrof && !(flag & INS_NO_MERGE))
1357 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1345 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1358 if (CAN_MERGE (op, tmp)) 1346 if (CAN_MERGE (op, tmp))
1359 { 1347 {
1360 op->nrof += tmp->nrof; 1348 op->nrof += tmp->nrof;
1361 remove_ob (tmp); 1349 tmp->remove ();
1362 free_object (tmp); 1350 tmp->destroy (0);
1363 } 1351 }
1364 1352
1365 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1366 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1367 1355
… …
1556 1544
1557 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1558 { 1546 {
1559 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1560 { 1548 {
1561 remove_ob (tmp); 1549 tmp->remove ();
1562 free_object (tmp); 1550 tmp->destroy (0);
1563 } 1551 }
1564 } 1552 }
1565 1553
1566 tmp1 = arch_to_object (archetype::find (arch_string)); 1554 tmp1 = arch_to_object (archetype::find (arch_string));
1567 1555
… …
1593 } 1581 }
1594 1582
1595 newob = object_create_clone (orig_ob); 1583 newob = object_create_clone (orig_ob);
1596 1584
1597 if ((orig_ob->nrof -= nr) < 1) 1585 if ((orig_ob->nrof -= nr) < 1)
1598 { 1586 orig_ob->destroy (1);
1599 if (!is_removed)
1600 remove_ob (orig_ob);
1601 free_object2 (orig_ob, 1);
1602 }
1603 else if (!is_removed) 1587 else if (!is_removed)
1604 { 1588 {
1605 if (orig_ob->env != NULL) 1589 if (orig_ob->env != NULL)
1606 sub_weight (orig_ob->env, orig_ob->weight * nr); 1590 sub_weight (orig_ob->env, orig_ob->weight * nr);
1607 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1591 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1671 esrv_send_item (tmp, op); 1655 esrv_send_item (tmp, op);
1672 } 1656 }
1673 } 1657 }
1674 else 1658 else
1675 { 1659 {
1676 remove_ob (op); 1660 op->remove ();
1677 op->nrof = 0; 1661 op->nrof = 0;
1678 if (tmp) 1662 if (tmp)
1679 { 1663 {
1680 esrv_del_item (tmp->contr, op->count); 1664 esrv_del_item (tmp->contr, op->count);
1681 } 1665 }
… …
1687 1671
1688 if (i < op->nrof) 1672 if (i < op->nrof)
1689 op->nrof -= i; 1673 op->nrof -= i;
1690 else 1674 else
1691 { 1675 {
1692 remove_ob (op); 1676 op->remove ();
1693 op->nrof = 0; 1677 op->nrof = 0;
1694 } 1678 }
1695 1679
1696 /* Since we just removed op, op->above is null */ 1680 /* Since we just removed op, op->above is null */
1697 for (tmp = above; tmp != NULL; tmp = tmp->above) 1681 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1706 1690
1707 if (op->nrof) 1691 if (op->nrof)
1708 return op; 1692 return op;
1709 else 1693 else
1710 { 1694 {
1711 free_object (op); 1695 op->destroy (0);
1712 return NULL; 1696 return NULL;
1713 } 1697 }
1714} 1698}
1715 1699
1716/* 1700/*
… …
1729 op->carrying += weight; 1713 op->carrying += weight;
1730 op = op->env; 1714 op = op->env;
1731 } 1715 }
1732} 1716}
1733 1717
1734/*
1735 * insert_ob_in_ob(op,environment):
1736 * This function inserts the object op in the linked list
1737 * inside the object environment.
1738 *
1739 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1740 * the inventory at the last position or next to other objects of the same
1741 * type.
1742 * Frank: Now sorted by type, archetype and magic!
1743 *
1744 * The function returns now pointer to inserted item, and return value can
1745 * be != op, if items are merged. -Tero
1746 */
1747
1748object * 1718object *
1749insert_ob_in_ob (object *op, object *where) 1719insert_ob_in_ob (object *op, object *where)
1750{ 1720{
1751 object * 1721 if (!where)
1752 tmp, *
1753 otmp;
1754
1755 if (!QUERY_FLAG (op, FLAG_REMOVED))
1756 {
1757 char *dump = dump_object (op);
1758 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1759 free (dump);
1760 return op;
1761 }
1762
1763 if (where == NULL)
1764 { 1722 {
1765 char *dump = dump_object (op); 1723 char *dump = dump_object (op);
1766 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1724 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1767 free (dump); 1725 free (dump);
1768 return op; 1726 return op;
1769 } 1727 }
1770 1728
1771 if (where->head) 1729 if (where->head)
1772 { 1730 {
1773 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1731 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1774 where = where->head; 1732 where = where->head;
1775 } 1733 }
1734
1735 return where->insert (op);
1736}
1737
1738/*
1739 * env->insert (op)
1740 * This function inserts the object op in the linked list
1741 * inside the object environment.
1742 *
1743 * The function returns now pointer to inserted item, and return value can
1744 * be != op, if items are merged. -Tero
1745 */
1746
1747object *
1748object::insert (object *op)
1749{
1750 object *tmp, *otmp;
1751
1752 if (!QUERY_FLAG (op, FLAG_REMOVED))
1753 op->remove ();
1776 1754
1777 if (op->more) 1755 if (op->more)
1778 { 1756 {
1779 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1757 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1780 return op; 1758 return op;
… …
1782 1760
1783 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1761 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1784 CLEAR_FLAG (op, FLAG_REMOVED); 1762 CLEAR_FLAG (op, FLAG_REMOVED);
1785 if (op->nrof) 1763 if (op->nrof)
1786 { 1764 {
1787 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1765 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1788 if (CAN_MERGE (tmp, op)) 1766 if (CAN_MERGE (tmp, op))
1789 { 1767 {
1790 /* return the original object and remove inserted object 1768 /* return the original object and remove inserted object
1791 (client needs the original object) */ 1769 (client needs the original object) */
1792 tmp->nrof += op->nrof; 1770 tmp->nrof += op->nrof;
1793 /* Weight handling gets pretty funky. Since we are adding to 1771 /* Weight handling gets pretty funky. Since we are adding to
1794 * tmp->nrof, we need to increase the weight. 1772 * tmp->nrof, we need to increase the weight.
1795 */ 1773 */
1796 add_weight (where, op->weight * op->nrof); 1774 add_weight (this, op->weight * op->nrof);
1797 SET_FLAG (op, FLAG_REMOVED); 1775 SET_FLAG (op, FLAG_REMOVED);
1798 free_object (op); /* free the inserted object */ 1776 op->destroy (); /* free the inserted object */
1799 op = tmp; 1777 op = tmp;
1800 remove_ob (op); /* and fix old object's links */ 1778 op->remove (); /* and fix old object's links */
1801 CLEAR_FLAG (op, FLAG_REMOVED); 1779 CLEAR_FLAG (op, FLAG_REMOVED);
1802 break; 1780 break;
1803 } 1781 }
1804 1782
1805 /* I assume combined objects have no inventory 1783 /* I assume combined objects have no inventory
1806 * We add the weight - this object could have just been removed 1784 * We add the weight - this object could have just been removed
1807 * (if it was possible to merge). calling remove_ob will subtract 1785 * (if it was possible to merge). calling remove_ob will subtract
1808 * the weight, so we need to add it in again, since we actually do 1786 * the weight, so we need to add it in again, since we actually do
1809 * the linking below 1787 * the linking below
1810 */ 1788 */
1811 add_weight (where, op->weight * op->nrof); 1789 add_weight (this, op->weight * op->nrof);
1812 } 1790 }
1813 else 1791 else
1814 add_weight (where, (op->weight + op->carrying)); 1792 add_weight (this, (op->weight + op->carrying));
1815 1793
1816 otmp = is_player_inv (where); 1794 otmp = is_player_inv (this);
1817 if (otmp && otmp->contr != NULL) 1795 if (otmp && otmp->contr)
1818 {
1819 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1796 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1820 fix_player (otmp); 1797 fix_player (otmp);
1821 }
1822 1798
1823 op->map = NULL; 1799 op->map = NULL;
1824 op->env = where; 1800 op->env = this;
1825 op->above = NULL; 1801 op->above = NULL;
1826 op->below = NULL; 1802 op->below = NULL;
1827 op->x = 0, op->y = 0; 1803 op->x = 0, op->y = 0;
1828 1804
1829 /* reset the light list and los of the players on the map */ 1805 /* reset the light list and los of the players on the map */
1830 if ((op->glow_radius != 0) && where->map) 1806 if ((op->glow_radius != 0) && map)
1831 { 1807 {
1832#ifdef DEBUG_LIGHTS 1808#ifdef DEBUG_LIGHTS
1833 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1809 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1834#endif /* DEBUG_LIGHTS */ 1810#endif /* DEBUG_LIGHTS */
1835 if (MAP_DARKNESS (where->map)) 1811 if (MAP_DARKNESS (map))
1836 update_all_los (where->map, where->x, where->y); 1812 update_all_los (map, x, y);
1837 } 1813 }
1838 1814
1839 /* Client has no idea of ordering so lets not bother ordering it here. 1815 /* Client has no idea of ordering so lets not bother ordering it here.
1840 * It sure simplifies this function... 1816 * It sure simplifies this function...
1841 */ 1817 */
1842 if (where->inv == NULL) 1818 if (!inv)
1843 where->inv = op; 1819 inv = op;
1844 else 1820 else
1845 { 1821 {
1846 op->below = where->inv; 1822 op->below = inv;
1847 op->below->above = op; 1823 op->below->above = op;
1848 where->inv = op; 1824 inv = op;
1849 } 1825 }
1826
1850 return op; 1827 return op;
1851} 1828}
1852 1829
1853/* 1830/*
1854 * Checks if any objects has a move_type that matches objects 1831 * Checks if any objects has a move_type that matches objects
… …
2543 * create clone from object to another 2520 * create clone from object to another
2544 */ 2521 */
2545object * 2522object *
2546object_create_clone (object *asrc) 2523object_create_clone (object *asrc)
2547{ 2524{
2548 object *
2549 dst = NULL, *tmp, *src, *part, *prev, *item; 2525 object *dst = 0, *tmp, *src, *part, *prev, *item;
2550 2526
2551 if (!asrc) 2527 if (!asrc)
2552 return NULL; 2528 return 0;
2529
2553 src = asrc; 2530 src = asrc;
2554 if (src->head) 2531 if (src->head)
2555 src = src->head; 2532 src = src->head;
2556 2533
2557 prev = NULL; 2534 prev = 0;
2558 for (part = src; part; part = part->more) 2535 for (part = src; part; part = part->more)
2559 { 2536 {
2560 tmp = get_object (); 2537 tmp = get_object ();
2561 copy_object (part, tmp); 2538 copy_object (part, tmp);
2562 tmp->x -= src->x; 2539 tmp->x -= src->x;
2563 tmp->y -= src->y; 2540 tmp->y -= src->y;
2541
2564 if (!part->head) 2542 if (!part->head)
2565 { 2543 {
2566 dst = tmp; 2544 dst = tmp;
2567 tmp->head = NULL; 2545 tmp->head = 0;
2568 } 2546 }
2569 else 2547 else
2570 { 2548 {
2571 tmp->head = dst; 2549 tmp->head = dst;
2572 } 2550 }
2551
2573 tmp->more = NULL; 2552 tmp->more = 0;
2553
2574 if (prev) 2554 if (prev)
2575 prev->more = tmp; 2555 prev->more = tmp;
2556
2576 prev = tmp; 2557 prev = tmp;
2577 } 2558 }
2578 2559
2579 for (item = src->inv; item; item = item->below) 2560 for (item = src->inv; item; item = item->below)
2580 insert_ob_in_ob (object_create_clone (item), dst); 2561 insert_ob_in_ob (object_create_clone (item), dst);

Diff Legend

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