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.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC vs.
Revision 1.66 by root, Wed Dec 13 03:28:42 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 ()
… …
183 * 183 *
184 * Note that this function appears a lot longer than the macro it 184 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 185 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 186 * reduce this to the same efficiency.
187 * 187 *
188 * Check nrof variable *before* calling CAN_MERGE() 188 * Check nrof variable *before* calling can_merge()
189 * 189 *
190 * Improvements made with merge: Better checking on potion, and also 190 * Improvements made with merge: Better checking on potion, and also
191 * check weight 191 * check weight
192 */ 192 */
193 193
194bool object::can_merge (object *ob1, object *ob2) 194bool object::can_merge_slow (object *ob1, object *ob2)
195{ 195{
196 /* A couple quicksanity checks */ 196 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 197 if (ob1 == ob2
198 || ob1->type != ob2->type
199 || ob1->speed != ob2->speed
200 || ob1->value != ob2->value
201 || ob1->name != ob2->name)
198 return 0; 202 return 0;
199 203
200 if (ob1->speed != ob2->speed) 204 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 206 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 207 * used to store nrof).
206 */ 208 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 209 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 262 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 264 return 0;
263 265
264 /* Now check to see if the two inventory objects could merge */ 266 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 267 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 268 return 0;
267 269
268 /* inventory ok - still need to check rest of this object to see 270 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 271 * if it is valid.
270 */ 272 */
… …
526 528
527 if (settings.casting_time) 529 if (settings.casting_time)
528 casting_time = -1; 530 casting_time = -1;
529} 531}
530 532
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/* 533/*
541 * copy object first frees everything allocated by the second object, 534 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 535 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 536 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 537 * 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 538 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 539 * will point at garbage.
547 */ 540 */
548void 541void
549copy_object (object *op2, object *op) 542object::copy_to (object *dst)
550{ 543{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 544 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 545 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 546
554 op2->clone (op); 547 *(object_copy *)dst = *this;
548 *(object_pod *)dst = *this;
549
550 if (self || cb)
551 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
555 552
556 if (is_freed) 553 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 554 SET_FLAG (dst, FLAG_FREED);
555
558 if (is_removed) 556 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 557 SET_FLAG (dst, FLAG_REMOVED);
560 558
561 if (op2->speed < 0) 559 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 560 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 561
564 /* Copy over key_values, if any. */ 562 /* Copy over key_values, if any. */
565 if (op2->key_values) 563 if (key_values)
566 { 564 {
567 key_value *tail = 0; 565 key_value *tail = 0;
568 key_value *i; 566 key_value *i;
569 567
570 op->key_values = 0; 568 dst->key_values = 0;
571 569
572 for (i = op2->key_values; i; i = i->next) 570 for (i = key_values; i; i = i->next)
573 { 571 {
574 key_value *new_link = new key_value; 572 key_value *new_link = new key_value;
575 573
576 new_link->next = 0; 574 new_link->next = 0;
577 new_link->key = i->key; 575 new_link->key = i->key;
578 new_link->value = i->value; 576 new_link->value = i->value;
579 577
580 /* Try and be clever here, too. */ 578 /* Try and be clever here, too. */
581 if (!op->key_values) 579 if (!dst->key_values)
582 { 580 {
583 op->key_values = new_link; 581 dst->key_values = new_link;
584 tail = new_link; 582 tail = new_link;
585 } 583 }
586 else 584 else
587 { 585 {
588 tail->next = new_link; 586 tail->next = new_link;
589 tail = new_link; 587 tail = new_link;
590 } 588 }
591 } 589 }
592 } 590 }
593 591
594 update_ob_speed (op); 592 update_ob_speed (dst);
593}
594
595object *
596object::clone ()
597{
598 object *neu = create ();
599 copy_to (neu);
600 return neu;
595} 601}
596 602
597/* 603/*
598 * If an object with the IS_TURNABLE() flag needs to be turned due 604 * 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 605 * to the closest player being on the other side, this function can
… …
804 update_now = 1; 810 update_now = 1;
805 811
806 if ((move_slow | op->move_slow) != move_slow) 812 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1; 813 update_now = 1;
808 } 814 }
815
809 /* if the object is being removed, we can't make intelligent 816 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 817 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 818 * that is being removed.
812 */ 819 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
907 914
908 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 915 if (QUERY_FLAG (this, FLAG_FRIENDLY))
909 remove_friendly_object (this); 916 remove_friendly_object (this);
910 917
911 if (!QUERY_FLAG (this, FLAG_REMOVED)) 918 if (!QUERY_FLAG (this, FLAG_REMOVED))
912 remove_ob (this); 919 remove ();
913 920
914 SET_FLAG (this, FLAG_FREED); 921 SET_FLAG (this, FLAG_FREED);
915 922
916 if (more) 923 if (more)
917 { 924 {
… …
942 949
943 while (op) 950 while (op)
944 { 951 {
945 object *tmp = op->below; 952 object *tmp = op->below;
946 953
947 remove_ob (op); 954 op->remove ();
948 955
949 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 956 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
950 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 957 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
951 free_object (op); 958 op->destroy ();
952 else 959 else
953 { 960 {
954 op->x = x; 961 op->x = x;
955 op->y = y; 962 op->y = y;
956 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 963 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1000 1007
1001/* 1008/*
1002 * sub_weight() recursively (outwards) subtracts a number from the 1009 * sub_weight() recursively (outwards) subtracts a number from the
1003 * weight of an object (and what is carried by it's environment(s)). 1010 * weight of an object (and what is carried by it's environment(s)).
1004 */ 1011 */
1005
1006void 1012void
1007sub_weight (object *op, signed long weight) 1013sub_weight (object *op, signed long weight)
1008{ 1014{
1009 while (op != NULL) 1015 while (op != NULL)
1010 { 1016 {
… …
1014 op->carrying -= weight; 1020 op->carrying -= weight;
1015 op = op->env; 1021 op = op->env;
1016 } 1022 }
1017} 1023}
1018 1024
1019/* remove_ob(op): 1025/* op->remove ():
1020 * This function removes the object op from the linked list of objects 1026 * This function removes the object op from the linked list of objects
1021 * which it is currently tied to. When this function is done, the 1027 * which it is currently tied to. When this function is done, the
1022 * object will have no environment. If the object previously had an 1028 * object will have no environment. If the object previously had an
1023 * environment, the x and y coordinates will be updated to 1029 * environment, the x and y coordinates will be updated to
1024 * the previous environment. 1030 * the previous environment.
1025 * Beware: This function is called from the editor as well! 1031 * Beware: This function is called from the editor as well!
1026 */ 1032 */
1027
1028void 1033void
1029remove_ob (object *op) 1034object::remove ()
1030{ 1035{
1031 object *tmp, *last = 0; 1036 object *tmp, *last = 0;
1032 object *otmp; 1037 object *otmp;
1033 1038
1034 int check_walk_off; 1039 int check_walk_off;
1035 maptile *m;
1036 1040
1037 sint16 x, y;
1038
1039 if (QUERY_FLAG (op, FLAG_REMOVED)) 1041 if (QUERY_FLAG (this, FLAG_REMOVED))
1040 return; 1042 return;
1041 1043
1042 SET_FLAG (op, FLAG_REMOVED); 1044 SET_FLAG (this, FLAG_REMOVED);
1043 1045
1044 if (op->more != NULL) 1046 if (more)
1045 remove_ob (op->more); 1047 more->remove ();
1046 1048
1047 /* 1049 /*
1048 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1049 * inventory. 1051 * inventory.
1050 */ 1052 */
1051 if (op->env != NULL) 1053 if (env)
1052 { 1054 {
1053 if (op->nrof) 1055 if (nrof)
1054 sub_weight (op->env, op->weight * op->nrof); 1056 sub_weight (env, weight * nrof);
1055 else 1057 else
1056 sub_weight (op->env, op->weight + op->carrying); 1058 sub_weight (env, weight + carrying);
1057 1059
1058 /* NO_FIX_PLAYER is set when a great many changes are being 1060 /* NO_FIX_PLAYER is set when a great many changes are being
1059 * made to players inventory. If set, avoiding the call 1061 * made to players inventory. If set, avoiding the call
1060 * to save cpu time. 1062 * to save cpu time.
1061 */ 1063 */
1062 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1064 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063 fix_player (otmp); 1065 fix_player (otmp);
1064 1066
1065 if (op->above != NULL) 1067 if (above != NULL)
1066 op->above->below = op->below; 1068 above->below = below;
1067 else 1069 else
1068 op->env->inv = op->below; 1070 env->inv = below;
1069 1071
1070 if (op->below != NULL) 1072 if (below != NULL)
1071 op->below->above = op->above; 1073 below->above = above;
1072 1074
1073 /* we set up values so that it could be inserted into 1075 /* we set up values so that it could be inserted into
1074 * the map, but we don't actually do that - it is up 1076 * the map, but we don't actually do that - it is up
1075 * to the caller to decide what we want to do. 1077 * to the caller to decide what we want to do.
1076 */ 1078 */
1077 op->x = op->env->x, op->y = op->env->y; 1079 x = env->x, y = env->y;
1078 op->map = op->env->map; 1080 map = env->map;
1079 op->above = NULL, op->below = NULL; 1081 above = 0, below = 0;
1080 op->env = NULL; 1082 env = 0;
1081 } 1083 }
1082 else if (op->map) 1084 else if (map)
1083 { 1085 {
1084 x = op->x;
1085 y = op->y;
1086 m = get_map_from_coord (op->map, &x, &y);
1087
1088 if (!m)
1089 {
1090 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1091 op->map->path, op->x, op->y);
1092 /* in old days, we used to set x and y to 0 and continue.
1093 * it seems if we get into this case, something is probablye
1094 * screwed up and should be fixed.
1095 */
1096 abort ();
1097 }
1098
1099 if (op->map != m)
1100 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1101 op->map->path, m->path, op->x, op->y, x, y);
1102
1103 /* Re did the following section of code - it looks like it had 1086 /* Re did the following section of code - it looks like it had
1104 * lots of logic for things we no longer care about 1087 * lots of logic for things we no longer care about
1105 */ 1088 */
1106 1089
1107 /* link the object above us */ 1090 /* link the object above us */
1108 if (op->above) 1091 if (above)
1109 op->above->below = op->below; 1092 above->below = below;
1110 else 1093 else
1111 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1094 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1112 1095
1113 /* Relink the object below us, if there is one */ 1096 /* Relink the object below us, if there is one */
1114 if (op->below) 1097 if (below)
1115 op->below->above = op->above; 1098 below->above = above;
1116 else 1099 else
1117 { 1100 {
1118 /* Nothing below, which means we need to relink map object for this space 1101 /* Nothing below, which means we need to relink map object for this space
1119 * use translated coordinates in case some oddness with map tiling is 1102 * use translated coordinates in case some oddness with map tiling is
1120 * evident 1103 * evident
1121 */ 1104 */
1122 if (GET_MAP_OB (m, x, y) != op) 1105 if (GET_MAP_OB (map, x, y) != this)
1123 { 1106 {
1124 char *dump = dump_object (op); 1107 char *dump = dump_object (this);
1125 LOG (llevError, 1108 LOG (llevError,
1126 "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); 1109 "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);
1127 free (dump); 1110 free (dump);
1128 dump = dump_object (GET_MAP_OB (m, x, y)); 1111 dump = dump_object (GET_MAP_OB (map, x, y));
1129 LOG (llevError, "%s\n", dump); 1112 LOG (llevError, "%s\n", dump);
1130 free (dump); 1113 free (dump);
1131 } 1114 }
1132 1115
1133 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1116 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1134 } 1117 }
1135 1118
1136 op->above = 0; 1119 above = 0;
1137 op->below = 0; 1120 below = 0;
1138 1121
1139 if (op->map->in_memory == MAP_SAVING) 1122 if (map->in_memory == MAP_SAVING)
1140 return; 1123 return;
1141 1124
1142 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1125 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1143 1126
1144 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1127 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1145 { 1128 {
1146 /* No point updating the players look faces if he is the object 1129 /* No point updating the players look faces if he is the object
1147 * being removed. 1130 * being removed.
1148 */ 1131 */
1149 1132
1150 if (tmp->type == PLAYER && tmp != op) 1133 if (tmp->type == PLAYER && tmp != this)
1151 { 1134 {
1152 /* If a container that the player is currently using somehow gets 1135 /* If a container that the player is currently using somehow gets
1153 * removed (most likely destroyed), update the player view 1136 * removed (most likely destroyed), update the player view
1154 * appropriately. 1137 * appropriately.
1155 */ 1138 */
1156 if (tmp->container == op) 1139 if (tmp->container == this)
1157 { 1140 {
1158 CLEAR_FLAG (op, FLAG_APPLIED); 1141 CLEAR_FLAG (this, FLAG_APPLIED);
1159 tmp->container = NULL; 1142 tmp->container = 0;
1160 } 1143 }
1161 1144
1162 tmp->contr->socket.update_look = 1; 1145 tmp->contr->socket.update_look = 1;
1163 } 1146 }
1164 1147
1165 /* See if player moving off should effect something */ 1148 /* See if player moving off should effect something */
1166 if (check_walk_off 1149 if (check_walk_off
1167 && ((op->move_type & tmp->move_off) 1150 && ((move_type & tmp->move_off)
1168 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1151 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1169 { 1152 {
1170 move_apply (tmp, op, NULL); 1153 move_apply (tmp, this, 0);
1171 1154
1172 if (op->destroyed ()) 1155 if (destroyed ())
1173 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1156 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1174 } 1157 }
1175 1158
1176 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1159 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1177 1160
1178 if (tmp->above == tmp) 1161 if (tmp->above == tmp)
1179 tmp->above = NULL; 1162 tmp->above = 0;
1180 1163
1181 last = tmp; 1164 last = tmp;
1182 } 1165 }
1183 1166
1184 /* last == NULL of there are no objects on this space */ 1167 /* last == NULL of there are no objects on this space */
1185 if (last == NULL) 1168 if (!last)
1186 { 1169 {
1187 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1188 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1171 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1189 * those out anyways, and if there are any flags set right now, they won't 1172 * those out anyways, and if there are any flags set right now, they won't
1190 * be correct anyways. 1173 * be correct anyways.
1191 */ 1174 */
1192 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1175 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1193 update_position (op->map, op->x, op->y); 1176 update_position (map, x, y);
1194 } 1177 }
1195 else 1178 else
1196 update_object (last, UP_OBJ_REMOVE); 1179 update_object (last, UP_OBJ_REMOVE);
1197 1180
1198 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1181 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1199 update_all_los (op->map, op->x, op->y); 1182 update_all_los (map, x, y);
1200 } 1183 }
1201} 1184}
1202 1185
1203/* 1186/*
1204 * merge_ob(op,top): 1187 * merge_ob(op,top):
… …
1219 1202
1220 for (; top != NULL; top = top->below) 1203 for (; top != NULL; top = top->below)
1221 { 1204 {
1222 if (top == op) 1205 if (top == op)
1223 continue; 1206 continue;
1224 if (CAN_MERGE (op, top)) 1207
1208 if (object::can_merge (op, top))
1225 { 1209 {
1226 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1227 1211
1228/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1229 op->weight = 0; /* Don't want any adjustements now */ 1213 op->weight = 0; /* Don't want any adjustements now */
1230 remove_ob (op); 1214 op->destroy ();
1231 free_object (op);
1232 return top; 1215 return top;
1233 } 1216 }
1234 } 1217 }
1235 1218
1236 return 0; 1219 return 0;
… …
1363 1346
1364 /* this has to be done after we translate the coordinates. 1347 /* this has to be done after we translate the coordinates.
1365 */ 1348 */
1366 if (op->nrof && !(flag & INS_NO_MERGE)) 1349 if (op->nrof && !(flag & INS_NO_MERGE))
1367 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1350 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1368 if (CAN_MERGE (op, tmp)) 1351 if (object::can_merge (op, tmp))
1369 { 1352 {
1370 op->nrof += tmp->nrof; 1353 op->nrof += tmp->nrof;
1371 remove_ob (tmp); 1354 tmp->destroy ();
1372 free_object (tmp);
1373 } 1355 }
1374 1356
1375 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1357 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1376 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1358 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1377 1359
… …
1563 tmp1; 1545 tmp1;
1564 1546
1565 /* first search for itself and remove any old instances */ 1547 /* first search for itself and remove any old instances */
1566 1548
1567 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1549 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1568 {
1569 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1550 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1570 { 1551 tmp->destroy ();
1571 remove_ob (tmp);
1572 free_object (tmp);
1573 }
1574 }
1575 1552
1576 tmp1 = arch_to_object (archetype::find (arch_string)); 1553 tmp1 = arch_to_object (archetype::find (arch_string));
1577 1554
1578 tmp1->x = op->x; 1555 tmp1->x = op->x;
1579 tmp1->y = op->y; 1556 tmp1->y = op->y;
… …
1589 */ 1566 */
1590 1567
1591object * 1568object *
1592get_split_ob (object *orig_ob, uint32 nr) 1569get_split_ob (object *orig_ob, uint32 nr)
1593{ 1570{
1594 object * 1571 object *newob;
1595 newob;
1596 int
1597 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1572 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1598 1573
1599 if (orig_ob->nrof < nr) 1574 if (orig_ob->nrof < nr)
1600 { 1575 {
1601 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1576 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1602 return NULL; 1577 return NULL;
1603 } 1578 }
1604 1579
1605 newob = object_create_clone (orig_ob); 1580 newob = object_create_clone (orig_ob);
1606 1581
1607 if ((orig_ob->nrof -= nr) < 1) 1582 if ((orig_ob->nrof -= nr) < 1)
1608 { 1583 orig_ob->destroy (1);
1609 if (!is_removed)
1610 remove_ob (orig_ob);
1611 free_object2 (orig_ob, 1);
1612 }
1613 else if (!is_removed) 1584 else if (!is_removed)
1614 { 1585 {
1615 if (orig_ob->env != NULL) 1586 if (orig_ob->env != NULL)
1616 sub_weight (orig_ob->env, orig_ob->weight * nr); 1587 sub_weight (orig_ob->env, orig_ob->weight * nr);
1617 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1588 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1681 esrv_send_item (tmp, op); 1652 esrv_send_item (tmp, op);
1682 } 1653 }
1683 } 1654 }
1684 else 1655 else
1685 { 1656 {
1686 remove_ob (op); 1657 op->remove ();
1687 op->nrof = 0; 1658 op->nrof = 0;
1688 if (tmp) 1659 if (tmp)
1689 { 1660 {
1690 esrv_del_item (tmp->contr, op->count); 1661 esrv_del_item (tmp->contr, op->count);
1691 } 1662 }
… …
1697 1668
1698 if (i < op->nrof) 1669 if (i < op->nrof)
1699 op->nrof -= i; 1670 op->nrof -= i;
1700 else 1671 else
1701 { 1672 {
1702 remove_ob (op); 1673 op->remove ();
1703 op->nrof = 0; 1674 op->nrof = 0;
1704 } 1675 }
1705 1676
1706 /* Since we just removed op, op->above is null */ 1677 /* Since we just removed op, op->above is null */
1707 for (tmp = above; tmp != NULL; tmp = tmp->above) 1678 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1716 1687
1717 if (op->nrof) 1688 if (op->nrof)
1718 return op; 1689 return op;
1719 else 1690 else
1720 { 1691 {
1721 free_object (op); 1692 op->destroy ();
1722 return NULL; 1693 return NULL;
1723 } 1694 }
1724} 1695}
1725 1696
1726/* 1697/*
… …
1739 op->carrying += weight; 1710 op->carrying += weight;
1740 op = op->env; 1711 op = op->env;
1741 } 1712 }
1742} 1713}
1743 1714
1744/*
1745 * insert_ob_in_ob(op,environment):
1746 * This function inserts the object op in the linked list
1747 * inside the object environment.
1748 *
1749 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1750 * the inventory at the last position or next to other objects of the same
1751 * type.
1752 * Frank: Now sorted by type, archetype and magic!
1753 *
1754 * The function returns now pointer to inserted item, and return value can
1755 * be != op, if items are merged. -Tero
1756 */
1757
1758object * 1715object *
1759insert_ob_in_ob (object *op, object *where) 1716insert_ob_in_ob (object *op, object *where)
1760{ 1717{
1761 object * 1718 if (!where)
1762 tmp, *
1763 otmp;
1764
1765 if (!QUERY_FLAG (op, FLAG_REMOVED))
1766 {
1767 char *dump = dump_object (op);
1768 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1769 free (dump);
1770 return op;
1771 }
1772
1773 if (where == NULL)
1774 { 1719 {
1775 char *dump = dump_object (op); 1720 char *dump = dump_object (op);
1776 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1721 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1777 free (dump); 1722 free (dump);
1778 return op; 1723 return op;
1779 } 1724 }
1780 1725
1781 if (where->head) 1726 if (where->head)
1782 { 1727 {
1783 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1728 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1784 where = where->head; 1729 where = where->head;
1785 } 1730 }
1731
1732 return where->insert (op);
1733}
1734
1735/*
1736 * env->insert (op)
1737 * This function inserts the object op in the linked list
1738 * inside the object environment.
1739 *
1740 * The function returns now pointer to inserted item, and return value can
1741 * be != op, if items are merged. -Tero
1742 */
1743
1744object *
1745object::insert (object *op)
1746{
1747 object *tmp, *otmp;
1748
1749 if (!QUERY_FLAG (op, FLAG_REMOVED))
1750 op->remove ();
1786 1751
1787 if (op->more) 1752 if (op->more)
1788 { 1753 {
1789 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1754 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1790 return op; 1755 return op;
… …
1792 1757
1793 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1758 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1794 CLEAR_FLAG (op, FLAG_REMOVED); 1759 CLEAR_FLAG (op, FLAG_REMOVED);
1795 if (op->nrof) 1760 if (op->nrof)
1796 { 1761 {
1797 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1762 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1798 if (CAN_MERGE (tmp, op)) 1763 if (object::can_merge (tmp, op))
1799 { 1764 {
1800 /* return the original object and remove inserted object 1765 /* return the original object and remove inserted object
1801 (client needs the original object) */ 1766 (client needs the original object) */
1802 tmp->nrof += op->nrof; 1767 tmp->nrof += op->nrof;
1803 /* Weight handling gets pretty funky. Since we are adding to 1768 /* Weight handling gets pretty funky. Since we are adding to
1804 * tmp->nrof, we need to increase the weight. 1769 * tmp->nrof, we need to increase the weight.
1805 */ 1770 */
1806 add_weight (where, op->weight * op->nrof); 1771 add_weight (this, op->weight * op->nrof);
1807 SET_FLAG (op, FLAG_REMOVED); 1772 SET_FLAG (op, FLAG_REMOVED);
1808 free_object (op); /* free the inserted object */ 1773 op->destroy (); /* free the inserted object */
1809 op = tmp; 1774 op = tmp;
1810 remove_ob (op); /* and fix old object's links */ 1775 op->remove (); /* and fix old object's links */
1811 CLEAR_FLAG (op, FLAG_REMOVED); 1776 CLEAR_FLAG (op, FLAG_REMOVED);
1812 break; 1777 break;
1813 } 1778 }
1814 1779
1815 /* I assume combined objects have no inventory 1780 /* I assume combined objects have no inventory
1816 * We add the weight - this object could have just been removed 1781 * We add the weight - this object could have just been removed
1817 * (if it was possible to merge). calling remove_ob will subtract 1782 * (if it was possible to merge). calling remove_ob will subtract
1818 * the weight, so we need to add it in again, since we actually do 1783 * the weight, so we need to add it in again, since we actually do
1819 * the linking below 1784 * the linking below
1820 */ 1785 */
1821 add_weight (where, op->weight * op->nrof); 1786 add_weight (this, op->weight * op->nrof);
1822 } 1787 }
1823 else 1788 else
1824 add_weight (where, (op->weight + op->carrying)); 1789 add_weight (this, (op->weight + op->carrying));
1825 1790
1826 otmp = is_player_inv (where); 1791 otmp = is_player_inv (this);
1827 if (otmp && otmp->contr != NULL) 1792 if (otmp && otmp->contr)
1828 {
1829 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1793 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1830 fix_player (otmp); 1794 fix_player (otmp);
1831 }
1832 1795
1833 op->map = NULL; 1796 op->map = NULL;
1834 op->env = where; 1797 op->env = this;
1835 op->above = NULL; 1798 op->above = NULL;
1836 op->below = NULL; 1799 op->below = NULL;
1837 op->x = 0, op->y = 0; 1800 op->x = 0, op->y = 0;
1838 1801
1839 /* reset the light list and los of the players on the map */ 1802 /* reset the light list and los of the players on the map */
1840 if ((op->glow_radius != 0) && where->map) 1803 if ((op->glow_radius != 0) && map)
1841 { 1804 {
1842#ifdef DEBUG_LIGHTS 1805#ifdef DEBUG_LIGHTS
1843 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1806 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1844#endif /* DEBUG_LIGHTS */ 1807#endif /* DEBUG_LIGHTS */
1845 if (MAP_DARKNESS (where->map)) 1808 if (MAP_DARKNESS (map))
1846 update_all_los (where->map, where->x, where->y); 1809 update_all_los (map, x, y);
1847 } 1810 }
1848 1811
1849 /* Client has no idea of ordering so lets not bother ordering it here. 1812 /* Client has no idea of ordering so lets not bother ordering it here.
1850 * It sure simplifies this function... 1813 * It sure simplifies this function...
1851 */ 1814 */
1852 if (where->inv == NULL) 1815 if (!inv)
1853 where->inv = op; 1816 inv = op;
1854 else 1817 else
1855 { 1818 {
1856 op->below = where->inv; 1819 op->below = inv;
1857 op->below->above = op; 1820 op->below->above = op;
1858 where->inv = op; 1821 inv = op;
1859 } 1822 }
1823
1860 return op; 1824 return op;
1861} 1825}
1862 1826
1863/* 1827/*
1864 * Checks if any objects has a move_type that matches objects 1828 * Checks if any objects has a move_type that matches objects
… …
2553 * create clone from object to another 2517 * create clone from object to another
2554 */ 2518 */
2555object * 2519object *
2556object_create_clone (object *asrc) 2520object_create_clone (object *asrc)
2557{ 2521{
2558 object *
2559 dst = NULL, *tmp, *src, *part, *prev, *item; 2522 object *dst = 0, *tmp, *src, *part, *prev, *item;
2560 2523
2561 if (!asrc) 2524 if (!asrc)
2562 return NULL; 2525 return 0;
2526
2563 src = asrc; 2527 src = asrc;
2564 if (src->head) 2528 if (src->head)
2565 src = src->head; 2529 src = src->head;
2566 2530
2567 prev = NULL; 2531 prev = 0;
2568 for (part = src; part; part = part->more) 2532 for (part = src; part; part = part->more)
2569 { 2533 {
2570 tmp = get_object (); 2534 tmp = part->clone ();
2571 copy_object (part, tmp);
2572 tmp->x -= src->x; 2535 tmp->x -= src->x;
2573 tmp->y -= src->y; 2536 tmp->y -= src->y;
2537
2574 if (!part->head) 2538 if (!part->head)
2575 { 2539 {
2576 dst = tmp; 2540 dst = tmp;
2577 tmp->head = NULL; 2541 tmp->head = 0;
2578 } 2542 }
2579 else 2543 else
2580 { 2544 {
2581 tmp->head = dst; 2545 tmp->head = dst;
2582 } 2546 }
2547
2583 tmp->more = NULL; 2548 tmp->more = 0;
2549
2584 if (prev) 2550 if (prev)
2585 prev->more = tmp; 2551 prev->more = tmp;
2552
2586 prev = tmp; 2553 prev = tmp;
2587 } 2554 }
2588 2555
2589 for (item = src->inv; item; item = item->below) 2556 for (item = src->inv; item; item = item->below)
2590 insert_ob_in_ob (object_create_clone (item), dst); 2557 insert_ob_in_ob (object_create_clone (item), dst);
… …
2616 } 2583 }
2617 2584
2618 fprintf (tempfile, obstr); 2585 fprintf (tempfile, obstr);
2619 fclose (tempfile); 2586 fclose (tempfile);
2620 2587
2621 op = get_object (); 2588 op = object::create ();
2622 2589
2623 object_thawer thawer (filename); 2590 object_thawer thawer (filename);
2624 2591
2625 if (thawer) 2592 if (thawer)
2626 load_object (thawer, op, 0); 2593 load_object (thawer, op, 0);

Diff Legend

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