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.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.65 by root, Wed Dec 13 00:42:03 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 ()
… …
526 526
527 if (settings.casting_time) 527 if (settings.casting_time)
528 casting_time = -1; 528 casting_time = -1;
529} 529}
530 530
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 531/*
541 * copy object first frees everything allocated by the second object, 532 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 533 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 534 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 535 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 536 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 537 * will point at garbage.
547 */ 538 */
548void 539void
549copy_object (object *op2, object *op) 540object::copy_to (object *dst)
550{ 541{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 542 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 543 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 544
554 op2->clone (op); 545 *(object_copy *)dst = *this;
546 *(object_pod *)dst = *this;
547
548 if (self || cb)
549 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
555 550
556 if (is_freed) 551 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 552 SET_FLAG (dst, FLAG_FREED);
553
558 if (is_removed) 554 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 555 SET_FLAG (dst, FLAG_REMOVED);
560 556
561 if (op2->speed < 0) 557 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 558 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 559
564 /* Copy over key_values, if any. */ 560 /* Copy over key_values, if any. */
565 if (op2->key_values) 561 if (key_values)
566 { 562 {
567 key_value *tail = 0; 563 key_value *tail = 0;
568 key_value *i; 564 key_value *i;
569 565
570 op->key_values = 0; 566 dst->key_values = 0;
571 567
572 for (i = op2->key_values; i; i = i->next) 568 for (i = key_values; i; i = i->next)
573 { 569 {
574 key_value *new_link = new key_value; 570 key_value *new_link = new key_value;
575 571
576 new_link->next = 0; 572 new_link->next = 0;
577 new_link->key = i->key; 573 new_link->key = i->key;
578 new_link->value = i->value; 574 new_link->value = i->value;
579 575
580 /* Try and be clever here, too. */ 576 /* Try and be clever here, too. */
581 if (!op->key_values) 577 if (!dst->key_values)
582 { 578 {
583 op->key_values = new_link; 579 dst->key_values = new_link;
584 tail = new_link; 580 tail = new_link;
585 } 581 }
586 else 582 else
587 { 583 {
588 tail->next = new_link; 584 tail->next = new_link;
589 tail = new_link; 585 tail = new_link;
590 } 586 }
591 } 587 }
592 } 588 }
593 589
594 update_ob_speed (op); 590 update_ob_speed (dst);
591}
592
593object *
594object::clone ()
595{
596 object *neu = create ();
597 copy_to (neu);
598 return neu;
595} 599}
596 600
597/* 601/*
598 * If an object with the IS_TURNABLE() flag needs to be turned due 602 * If an object with the IS_TURNABLE() flag needs to be turned due
599 * to the closest player being on the other side, this function can 603 * to the closest player being on the other side, this function can
… …
804 update_now = 1; 808 update_now = 1;
805 809
806 if ((move_slow | op->move_slow) != move_slow) 810 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1; 811 update_now = 1;
808 } 812 }
813
809 /* if the object is being removed, we can't make intelligent 814 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 815 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 816 * that is being removed.
812 */ 817 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 818 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
839 else 844 else
840 { 845 {
841 delete *i; 846 delete *i;
842 mortals.erase (i); 847 mortals.erase (i);
843 } 848 }
844
845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
852} 849}
853 850
854object::object () 851object::object ()
855{ 852{
856 SET_FLAG (this, FLAG_REMOVED); 853 SET_FLAG (this, FLAG_REMOVED);
… …
915 912
916 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 913 if (QUERY_FLAG (this, FLAG_FRIENDLY))
917 remove_friendly_object (this); 914 remove_friendly_object (this);
918 915
919 if (!QUERY_FLAG (this, FLAG_REMOVED)) 916 if (!QUERY_FLAG (this, FLAG_REMOVED))
920 remove_ob (this); 917 remove ();
921 918
922 SET_FLAG (this, FLAG_FREED); 919 SET_FLAG (this, FLAG_FREED);
923 920
924 if (more) 921 if (more)
925 { 922 {
… …
950 947
951 while (op) 948 while (op)
952 { 949 {
953 object *tmp = op->below; 950 object *tmp = op->below;
954 951
955 remove_ob (op); 952 op->remove ();
956 953
957 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 954 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 955 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959 free_object (op); 956 op->destroy ();
960 else 957 else
961 { 958 {
962 op->x = x; 959 op->x = x;
963 op->y = y; 960 op->y = y;
964 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 961 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
967 op = tmp; 964 op = tmp;
968 } 965 }
969 } 966 }
970 } 967 }
971 968
969 // hack to ensure that freed objects still have a valid map
970 {
971 static maptile *freed_map; // freed objects are moved here to avoid crashes
972
973 if (!freed_map)
974 {
975 freed_map = new maptile;
976
977 freed_map->name = "/internal/freed_objects_map";
978 freed_map->width = 3;
979 freed_map->height = 3;
980
981 freed_map->allocate ();
982 }
983
984 map = freed_map;
985 x = 1;
986 y = 1;
987 }
988
972 // clear those pointers that likely might have circular references to us 989 // clear those pointers that likely might have circular references to us
973 owner = 0; 990 owner = 0;
974 enemy = 0; 991 enemy = 0;
975 attacked_by = 0; 992 attacked_by = 0;
976 993
… …
988 1005
989/* 1006/*
990 * sub_weight() recursively (outwards) subtracts a number from the 1007 * sub_weight() recursively (outwards) subtracts a number from the
991 * weight of an object (and what is carried by it's environment(s)). 1008 * weight of an object (and what is carried by it's environment(s)).
992 */ 1009 */
993
994void 1010void
995sub_weight (object *op, signed long weight) 1011sub_weight (object *op, signed long weight)
996{ 1012{
997 while (op != NULL) 1013 while (op != NULL)
998 { 1014 {
… …
1002 op->carrying -= weight; 1018 op->carrying -= weight;
1003 op = op->env; 1019 op = op->env;
1004 } 1020 }
1005} 1021}
1006 1022
1007/* remove_ob(op): 1023/* op->remove ():
1008 * This function removes the object op from the linked list of objects 1024 * This function removes the object op from the linked list of objects
1009 * which it is currently tied to. When this function is done, the 1025 * which it is currently tied to. When this function is done, the
1010 * object will have no environment. If the object previously had an 1026 * object will have no environment. If the object previously had an
1011 * environment, the x and y coordinates will be updated to 1027 * environment, the x and y coordinates will be updated to
1012 * the previous environment. 1028 * the previous environment.
1013 * Beware: This function is called from the editor as well! 1029 * Beware: This function is called from the editor as well!
1014 */ 1030 */
1015
1016void 1031void
1017remove_ob (object *op) 1032object::remove ()
1018{ 1033{
1019 object *tmp, *last = 0; 1034 object *tmp, *last = 0;
1020 object *otmp; 1035 object *otmp;
1021 1036
1022 int check_walk_off; 1037 int check_walk_off;
1023 maptile *m;
1024 1038
1025 sint16 x, y;
1026
1027 if (QUERY_FLAG (op, FLAG_REMOVED)) 1039 if (QUERY_FLAG (this, FLAG_REMOVED))
1028 return; 1040 return;
1029 1041
1030 SET_FLAG (op, FLAG_REMOVED); 1042 SET_FLAG (this, FLAG_REMOVED);
1031 1043
1032 if (op->more != NULL) 1044 if (more)
1033 remove_ob (op->more); 1045 more->remove ();
1034 1046
1035 /* 1047 /*
1036 * In this case, the object to be removed is in someones 1048 * In this case, the object to be removed is in someones
1037 * inventory. 1049 * inventory.
1038 */ 1050 */
1039 if (op->env != NULL) 1051 if (env)
1040 { 1052 {
1041 if (op->nrof) 1053 if (nrof)
1042 sub_weight (op->env, op->weight * op->nrof); 1054 sub_weight (env, weight * nrof);
1043 else 1055 else
1044 sub_weight (op->env, op->weight + op->carrying); 1056 sub_weight (env, weight + carrying);
1045 1057
1046 /* NO_FIX_PLAYER is set when a great many changes are being 1058 /* NO_FIX_PLAYER is set when a great many changes are being
1047 * made to players inventory. If set, avoiding the call 1059 * made to players inventory. If set, avoiding the call
1048 * to save cpu time. 1060 * to save cpu time.
1049 */ 1061 */
1050 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1062 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1051 fix_player (otmp); 1063 fix_player (otmp);
1052 1064
1053 if (op->above != NULL) 1065 if (above != NULL)
1054 op->above->below = op->below; 1066 above->below = below;
1055 else 1067 else
1056 op->env->inv = op->below; 1068 env->inv = below;
1057 1069
1058 if (op->below != NULL) 1070 if (below != NULL)
1059 op->below->above = op->above; 1071 below->above = above;
1060 1072
1061 /* we set up values so that it could be inserted into 1073 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up 1074 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do. 1075 * to the caller to decide what we want to do.
1064 */ 1076 */
1065 op->x = op->env->x, op->y = op->env->y; 1077 x = env->x, y = env->y;
1066 op->map = op->env->map; 1078 map = env->map;
1067 op->above = NULL, op->below = NULL; 1079 above = 0, below = 0;
1068 op->env = NULL; 1080 env = 0;
1069 } 1081 }
1070 else if (op->map) 1082 else if (map)
1071 { 1083 {
1072 x = op->x;
1073 y = op->y;
1074 m = get_map_from_coord (op->map, &x, &y);
1075
1076 if (!m)
1077 {
1078 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1079 op->map->path, op->x, op->y);
1080 /* in old days, we used to set x and y to 0 and continue.
1081 * it seems if we get into this case, something is probablye
1082 * screwed up and should be fixed.
1083 */
1084 abort ();
1085 }
1086
1087 if (op->map != m)
1088 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1089 op->map->path, m->path, op->x, op->y, x, y);
1090
1091 /* Re did the following section of code - it looks like it had 1084 /* Re did the following section of code - it looks like it had
1092 * lots of logic for things we no longer care about 1085 * lots of logic for things we no longer care about
1093 */ 1086 */
1094 1087
1095 /* link the object above us */ 1088 /* link the object above us */
1096 if (op->above) 1089 if (above)
1097 op->above->below = op->below; 1090 above->below = below;
1098 else 1091 else
1099 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1092 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1100 1093
1101 /* Relink the object below us, if there is one */ 1094 /* Relink the object below us, if there is one */
1102 if (op->below) 1095 if (below)
1103 op->below->above = op->above; 1096 below->above = above;
1104 else 1097 else
1105 { 1098 {
1106 /* Nothing below, which means we need to relink map object for this space 1099 /* Nothing below, which means we need to relink map object for this space
1107 * use translated coordinates in case some oddness with map tiling is 1100 * use translated coordinates in case some oddness with map tiling is
1108 * evident 1101 * evident
1109 */ 1102 */
1110 if (GET_MAP_OB (m, x, y) != op) 1103 if (GET_MAP_OB (map, x, y) != this)
1111 { 1104 {
1112 char *dump = dump_object (op); 1105 char *dump = dump_object (this);
1113 LOG (llevError, 1106 LOG (llevError,
1114 "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); 1107 "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);
1115 free (dump); 1108 free (dump);
1116 dump = dump_object (GET_MAP_OB (m, x, y)); 1109 dump = dump_object (GET_MAP_OB (map, x, y));
1117 LOG (llevError, "%s\n", dump); 1110 LOG (llevError, "%s\n", dump);
1118 free (dump); 1111 free (dump);
1119 } 1112 }
1120 1113
1121 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1114 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1122 } 1115 }
1123 1116
1124 op->above = 0; 1117 above = 0;
1125 op->below = 0; 1118 below = 0;
1126 1119
1127 if (op->map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
1128 return; 1121 return;
1129 1122
1130 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1123 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1131 1124
1132 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1125 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1133 { 1126 {
1134 /* No point updating the players look faces if he is the object 1127 /* No point updating the players look faces if he is the object
1135 * being removed. 1128 * being removed.
1136 */ 1129 */
1137 1130
1138 if (tmp->type == PLAYER && tmp != op) 1131 if (tmp->type == PLAYER && tmp != this)
1139 { 1132 {
1140 /* If a container that the player is currently using somehow gets 1133 /* If a container that the player is currently using somehow gets
1141 * removed (most likely destroyed), update the player view 1134 * removed (most likely destroyed), update the player view
1142 * appropriately. 1135 * appropriately.
1143 */ 1136 */
1144 if (tmp->container == op) 1137 if (tmp->container == this)
1145 { 1138 {
1146 CLEAR_FLAG (op, FLAG_APPLIED); 1139 CLEAR_FLAG (this, FLAG_APPLIED);
1147 tmp->container = NULL; 1140 tmp->container = 0;
1148 } 1141 }
1149 1142
1150 tmp->contr->socket.update_look = 1; 1143 tmp->contr->socket.update_look = 1;
1151 } 1144 }
1152 1145
1153 /* See if player moving off should effect something */ 1146 /* See if player moving off should effect something */
1154 if (check_walk_off 1147 if (check_walk_off
1155 && ((op->move_type & tmp->move_off) 1148 && ((move_type & tmp->move_off)
1156 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1149 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1157 { 1150 {
1158 move_apply (tmp, op, NULL); 1151 move_apply (tmp, this, 0);
1159 1152
1160 if (op->destroyed ()) 1153 if (destroyed ())
1161 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1154 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162 } 1155 }
1163 1156
1164 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1157 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1165 1158
1166 if (tmp->above == tmp) 1159 if (tmp->above == tmp)
1167 tmp->above = NULL; 1160 tmp->above = 0;
1168 1161
1169 last = tmp; 1162 last = tmp;
1170 } 1163 }
1171 1164
1172 /* last == NULL of there are no objects on this space */ 1165 /* last == NULL of there are no objects on this space */
1173 if (last == NULL) 1166 if (!last)
1174 { 1167 {
1175 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1168 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1176 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1169 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1177 * those out anyways, and if there are any flags set right now, they won't 1170 * those out anyways, and if there are any flags set right now, they won't
1178 * be correct anyways. 1171 * be correct anyways.
1179 */ 1172 */
1180 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1173 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1181 update_position (op->map, op->x, op->y); 1174 update_position (map, x, y);
1182 } 1175 }
1183 else 1176 else
1184 update_object (last, UP_OBJ_REMOVE); 1177 update_object (last, UP_OBJ_REMOVE);
1185 1178
1186 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1179 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1187 update_all_los (op->map, op->x, op->y); 1180 update_all_los (map, x, y);
1188 } 1181 }
1189} 1182}
1190 1183
1191/* 1184/*
1192 * merge_ob(op,top): 1185 * merge_ob(op,top):
… …
1213 { 1206 {
1214 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1215 1208
1216/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1217 op->weight = 0; /* Don't want any adjustements now */ 1210 op->weight = 0; /* Don't want any adjustements now */
1218 remove_ob (op); 1211 op->destroy ();
1219 free_object (op);
1220 return top; 1212 return top;
1221 } 1213 }
1222 } 1214 }
1223 1215
1224 return 0; 1216 return 0;
… …
1354 if (op->nrof && !(flag & INS_NO_MERGE)) 1346 if (op->nrof && !(flag & INS_NO_MERGE))
1355 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1347 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1356 if (CAN_MERGE (op, tmp)) 1348 if (CAN_MERGE (op, tmp))
1357 { 1349 {
1358 op->nrof += tmp->nrof; 1350 op->nrof += tmp->nrof;
1359 remove_ob (tmp); 1351 tmp->destroy ();
1360 free_object (tmp);
1361 } 1352 }
1362 1353
1363 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1354 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1364 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1355 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1365 1356
… …
1551 tmp1; 1542 tmp1;
1552 1543
1553 /* first search for itself and remove any old instances */ 1544 /* first search for itself and remove any old instances */
1554 1545
1555 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1546 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1556 {
1557 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1558 { 1548 tmp->destroy ();
1559 remove_ob (tmp);
1560 free_object (tmp);
1561 }
1562 }
1563 1549
1564 tmp1 = arch_to_object (archetype::find (arch_string)); 1550 tmp1 = arch_to_object (archetype::find (arch_string));
1565 1551
1566 tmp1->x = op->x; 1552 tmp1->x = op->x;
1567 tmp1->y = op->y; 1553 tmp1->y = op->y;
… …
1577 */ 1563 */
1578 1564
1579object * 1565object *
1580get_split_ob (object *orig_ob, uint32 nr) 1566get_split_ob (object *orig_ob, uint32 nr)
1581{ 1567{
1582 object * 1568 object *newob;
1583 newob;
1584 int
1585 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1586 1570
1587 if (orig_ob->nrof < nr) 1571 if (orig_ob->nrof < nr)
1588 { 1572 {
1589 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1573 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1590 return NULL; 1574 return NULL;
1591 } 1575 }
1592 1576
1593 newob = object_create_clone (orig_ob); 1577 newob = object_create_clone (orig_ob);
1594 1578
1595 if ((orig_ob->nrof -= nr) < 1) 1579 if ((orig_ob->nrof -= nr) < 1)
1596 { 1580 orig_ob->destroy (1);
1597 if (!is_removed)
1598 remove_ob (orig_ob);
1599 free_object2 (orig_ob, 1);
1600 }
1601 else if (!is_removed) 1581 else if (!is_removed)
1602 { 1582 {
1603 if (orig_ob->env != NULL) 1583 if (orig_ob->env != NULL)
1604 sub_weight (orig_ob->env, orig_ob->weight * nr); 1584 sub_weight (orig_ob->env, orig_ob->weight * nr);
1605 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1585 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1669 esrv_send_item (tmp, op); 1649 esrv_send_item (tmp, op);
1670 } 1650 }
1671 } 1651 }
1672 else 1652 else
1673 { 1653 {
1674 remove_ob (op); 1654 op->remove ();
1675 op->nrof = 0; 1655 op->nrof = 0;
1676 if (tmp) 1656 if (tmp)
1677 { 1657 {
1678 esrv_del_item (tmp->contr, op->count); 1658 esrv_del_item (tmp->contr, op->count);
1679 } 1659 }
… …
1685 1665
1686 if (i < op->nrof) 1666 if (i < op->nrof)
1687 op->nrof -= i; 1667 op->nrof -= i;
1688 else 1668 else
1689 { 1669 {
1690 remove_ob (op); 1670 op->remove ();
1691 op->nrof = 0; 1671 op->nrof = 0;
1692 } 1672 }
1693 1673
1694 /* Since we just removed op, op->above is null */ 1674 /* Since we just removed op, op->above is null */
1695 for (tmp = above; tmp != NULL; tmp = tmp->above) 1675 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1704 1684
1705 if (op->nrof) 1685 if (op->nrof)
1706 return op; 1686 return op;
1707 else 1687 else
1708 { 1688 {
1709 free_object (op); 1689 op->destroy ();
1710 return NULL; 1690 return NULL;
1711 } 1691 }
1712} 1692}
1713 1693
1714/* 1694/*
… …
1727 op->carrying += weight; 1707 op->carrying += weight;
1728 op = op->env; 1708 op = op->env;
1729 } 1709 }
1730} 1710}
1731 1711
1732/*
1733 * insert_ob_in_ob(op,environment):
1734 * This function inserts the object op in the linked list
1735 * inside the object environment.
1736 *
1737 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1738 * the inventory at the last position or next to other objects of the same
1739 * type.
1740 * Frank: Now sorted by type, archetype and magic!
1741 *
1742 * The function returns now pointer to inserted item, and return value can
1743 * be != op, if items are merged. -Tero
1744 */
1745
1746object * 1712object *
1747insert_ob_in_ob (object *op, object *where) 1713insert_ob_in_ob (object *op, object *where)
1748{ 1714{
1749 object * 1715 if (!where)
1750 tmp, *
1751 otmp;
1752
1753 if (!QUERY_FLAG (op, FLAG_REMOVED))
1754 {
1755 char *dump = dump_object (op);
1756 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757 free (dump);
1758 return op;
1759 }
1760
1761 if (where == NULL)
1762 { 1716 {
1763 char *dump = dump_object (op); 1717 char *dump = dump_object (op);
1764 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1718 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765 free (dump); 1719 free (dump);
1766 return op; 1720 return op;
1767 } 1721 }
1768 1722
1769 if (where->head) 1723 if (where->head)
1770 { 1724 {
1771 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1725 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1772 where = where->head; 1726 where = where->head;
1773 } 1727 }
1728
1729 return where->insert (op);
1730}
1731
1732/*
1733 * env->insert (op)
1734 * This function inserts the object op in the linked list
1735 * inside the object environment.
1736 *
1737 * The function returns now pointer to inserted item, and return value can
1738 * be != op, if items are merged. -Tero
1739 */
1740
1741object *
1742object::insert (object *op)
1743{
1744 object *tmp, *otmp;
1745
1746 if (!QUERY_FLAG (op, FLAG_REMOVED))
1747 op->remove ();
1774 1748
1775 if (op->more) 1749 if (op->more)
1776 { 1750 {
1777 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1751 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1778 return op; 1752 return op;
… …
1780 1754
1781 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1755 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1782 CLEAR_FLAG (op, FLAG_REMOVED); 1756 CLEAR_FLAG (op, FLAG_REMOVED);
1783 if (op->nrof) 1757 if (op->nrof)
1784 { 1758 {
1785 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1759 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1786 if (CAN_MERGE (tmp, op)) 1760 if (CAN_MERGE (tmp, op))
1787 { 1761 {
1788 /* return the original object and remove inserted object 1762 /* return the original object and remove inserted object
1789 (client needs the original object) */ 1763 (client needs the original object) */
1790 tmp->nrof += op->nrof; 1764 tmp->nrof += op->nrof;
1791 /* Weight handling gets pretty funky. Since we are adding to 1765 /* Weight handling gets pretty funky. Since we are adding to
1792 * tmp->nrof, we need to increase the weight. 1766 * tmp->nrof, we need to increase the weight.
1793 */ 1767 */
1794 add_weight (where, op->weight * op->nrof); 1768 add_weight (this, op->weight * op->nrof);
1795 SET_FLAG (op, FLAG_REMOVED); 1769 SET_FLAG (op, FLAG_REMOVED);
1796 free_object (op); /* free the inserted object */ 1770 op->destroy (); /* free the inserted object */
1797 op = tmp; 1771 op = tmp;
1798 remove_ob (op); /* and fix old object's links */ 1772 op->remove (); /* and fix old object's links */
1799 CLEAR_FLAG (op, FLAG_REMOVED); 1773 CLEAR_FLAG (op, FLAG_REMOVED);
1800 break; 1774 break;
1801 } 1775 }
1802 1776
1803 /* I assume combined objects have no inventory 1777 /* I assume combined objects have no inventory
1804 * We add the weight - this object could have just been removed 1778 * We add the weight - this object could have just been removed
1805 * (if it was possible to merge). calling remove_ob will subtract 1779 * (if it was possible to merge). calling remove_ob will subtract
1806 * the weight, so we need to add it in again, since we actually do 1780 * the weight, so we need to add it in again, since we actually do
1807 * the linking below 1781 * the linking below
1808 */ 1782 */
1809 add_weight (where, op->weight * op->nrof); 1783 add_weight (this, op->weight * op->nrof);
1810 } 1784 }
1811 else 1785 else
1812 add_weight (where, (op->weight + op->carrying)); 1786 add_weight (this, (op->weight + op->carrying));
1813 1787
1814 otmp = is_player_inv (where); 1788 otmp = is_player_inv (this);
1815 if (otmp && otmp->contr != NULL) 1789 if (otmp && otmp->contr)
1816 {
1817 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1818 fix_player (otmp); 1791 fix_player (otmp);
1819 }
1820 1792
1821 op->map = NULL; 1793 op->map = NULL;
1822 op->env = where; 1794 op->env = this;
1823 op->above = NULL; 1795 op->above = NULL;
1824 op->below = NULL; 1796 op->below = NULL;
1825 op->x = 0, op->y = 0; 1797 op->x = 0, op->y = 0;
1826 1798
1827 /* reset the light list and los of the players on the map */ 1799 /* reset the light list and los of the players on the map */
1828 if ((op->glow_radius != 0) && where->map) 1800 if ((op->glow_radius != 0) && map)
1829 { 1801 {
1830#ifdef DEBUG_LIGHTS 1802#ifdef DEBUG_LIGHTS
1831 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1803 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1832#endif /* DEBUG_LIGHTS */ 1804#endif /* DEBUG_LIGHTS */
1833 if (MAP_DARKNESS (where->map)) 1805 if (MAP_DARKNESS (map))
1834 update_all_los (where->map, where->x, where->y); 1806 update_all_los (map, x, y);
1835 } 1807 }
1836 1808
1837 /* Client has no idea of ordering so lets not bother ordering it here. 1809 /* Client has no idea of ordering so lets not bother ordering it here.
1838 * It sure simplifies this function... 1810 * It sure simplifies this function...
1839 */ 1811 */
1840 if (where->inv == NULL) 1812 if (!inv)
1841 where->inv = op; 1813 inv = op;
1842 else 1814 else
1843 { 1815 {
1844 op->below = where->inv; 1816 op->below = inv;
1845 op->below->above = op; 1817 op->below->above = op;
1846 where->inv = op; 1818 inv = op;
1847 } 1819 }
1820
1848 return op; 1821 return op;
1849} 1822}
1850 1823
1851/* 1824/*
1852 * Checks if any objects has a move_type that matches objects 1825 * Checks if any objects has a move_type that matches objects
… …
2541 * create clone from object to another 2514 * create clone from object to another
2542 */ 2515 */
2543object * 2516object *
2544object_create_clone (object *asrc) 2517object_create_clone (object *asrc)
2545{ 2518{
2546 object *
2547 dst = NULL, *tmp, *src, *part, *prev, *item; 2519 object *dst = 0, *tmp, *src, *part, *prev, *item;
2548 2520
2549 if (!asrc) 2521 if (!asrc)
2550 return NULL; 2522 return 0;
2523
2551 src = asrc; 2524 src = asrc;
2552 if (src->head) 2525 if (src->head)
2553 src = src->head; 2526 src = src->head;
2554 2527
2555 prev = NULL; 2528 prev = 0;
2556 for (part = src; part; part = part->more) 2529 for (part = src; part; part = part->more)
2557 { 2530 {
2558 tmp = get_object (); 2531 tmp = part->clone ();
2559 copy_object (part, tmp);
2560 tmp->x -= src->x; 2532 tmp->x -= src->x;
2561 tmp->y -= src->y; 2533 tmp->y -= src->y;
2534
2562 if (!part->head) 2535 if (!part->head)
2563 { 2536 {
2564 dst = tmp; 2537 dst = tmp;
2565 tmp->head = NULL; 2538 tmp->head = 0;
2566 } 2539 }
2567 else 2540 else
2568 { 2541 {
2569 tmp->head = dst; 2542 tmp->head = dst;
2570 } 2543 }
2544
2571 tmp->more = NULL; 2545 tmp->more = 0;
2546
2572 if (prev) 2547 if (prev)
2573 prev->more = tmp; 2548 prev->more = tmp;
2549
2574 prev = tmp; 2550 prev = tmp;
2575 } 2551 }
2576 2552
2577 for (item = src->inv; item; item = item->below) 2553 for (item = src->inv; item; item = item->below)
2578 insert_ob_in_ob (object_create_clone (item), dst); 2554 insert_ob_in_ob (object_create_clone (item), dst);
… …
2604 } 2580 }
2605 2581
2606 fprintf (tempfile, obstr); 2582 fprintf (tempfile, obstr);
2607 fclose (tempfile); 2583 fclose (tempfile);
2608 2584
2609 op = get_object (); 2585 op = object::create ();
2610 2586
2611 object_thawer thawer (filename); 2587 object_thawer thawer (filename);
2612 2588
2613 if (thawer) 2589 if (thawer)
2614 load_object (thawer, op, 0); 2590 load_object (thawer, op, 0);

Diff Legend

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