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

Diff Legend

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