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.64 by root, Tue Dec 12 21:39:56 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);
597} 591}
598 592
599/* 593/*
600 * If an object with the IS_TURNABLE() flag needs to be turned due 594 * 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 595 * to the closest player being on the other side, this function can
… …
806 update_now = 1; 800 update_now = 1;
807 801
808 if ((move_slow | op->move_slow) != move_slow) 802 if ((move_slow | op->move_slow) != move_slow)
809 update_now = 1; 803 update_now = 1;
810 } 804 }
805
811 /* if the object is being removed, we can't make intelligent 806 /* if the object is being removed, we can't make intelligent
812 * decisions, because remove_ob can't really pass the object 807 * decisions, because remove_ob can't really pass the object
813 * that is being removed. 808 * that is being removed.
814 */ 809 */
815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 810 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
841 else 836 else
842 { 837 {
843 delete *i; 838 delete *i;
844 mortals.erase (i); 839 mortals.erase (i);
845 } 840 }
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} 841}
855 842
856object::object () 843object::object ()
857{ 844{
858 SET_FLAG (this, FLAG_REMOVED); 845 SET_FLAG (this, FLAG_REMOVED);
… …
917 904
918 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 905 if (QUERY_FLAG (this, FLAG_FRIENDLY))
919 remove_friendly_object (this); 906 remove_friendly_object (this);
920 907
921 if (!QUERY_FLAG (this, FLAG_REMOVED)) 908 if (!QUERY_FLAG (this, FLAG_REMOVED))
922 remove_ob (this); 909 remove ();
923 910
924 SET_FLAG (this, FLAG_FREED); 911 SET_FLAG (this, FLAG_FREED);
925 912
926 if (more) 913 if (more)
927 { 914 {
… …
952 939
953 while (op) 940 while (op)
954 { 941 {
955 object *tmp = op->below; 942 object *tmp = op->below;
956 943
957 remove_ob (op); 944 op->remove ();
958 945
959 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 946 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)) 947 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
961 free_object (op); 948 op->destroy ();
962 else 949 else
963 { 950 {
964 op->x = x; 951 op->x = x;
965 op->y = y; 952 op->y = y;
966 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 953 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
969 op = tmp; 956 op = tmp;
970 } 957 }
971 } 958 }
972 } 959 }
973 960
961 // hack to ensure that freed objects still have a valid map
962 {
963 static maptile *freed_map; // freed objects are moved here to avoid crashes
964
965 if (!freed_map)
966 {
967 freed_map = new maptile;
968
969 freed_map->name = "/internal/freed_objects_map";
970 freed_map->width = 3;
971 freed_map->height = 3;
972
973 freed_map->allocate ();
974 }
975
976 map = freed_map;
977 x = 1;
978 y = 1;
979 }
980
974 // clear those pointers that likely might have circular references to us 981 // clear those pointers that likely might have circular references to us
975 owner = 0; 982 owner = 0;
976 enemy = 0; 983 enemy = 0;
977 attacked_by = 0; 984 attacked_by = 0;
978 985
… …
990 997
991/* 998/*
992 * sub_weight() recursively (outwards) subtracts a number from the 999 * sub_weight() recursively (outwards) subtracts a number from the
993 * weight of an object (and what is carried by it's environment(s)). 1000 * weight of an object (and what is carried by it's environment(s)).
994 */ 1001 */
995
996void 1002void
997sub_weight (object *op, signed long weight) 1003sub_weight (object *op, signed long weight)
998{ 1004{
999 while (op != NULL) 1005 while (op != NULL)
1000 { 1006 {
… …
1004 op->carrying -= weight; 1010 op->carrying -= weight;
1005 op = op->env; 1011 op = op->env;
1006 } 1012 }
1007} 1013}
1008 1014
1009/* remove_ob(op): 1015/* op->remove ():
1010 * This function removes the object op from the linked list of objects 1016 * 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 1017 * which it is currently tied to. When this function is done, the
1012 * object will have no environment. If the object previously had an 1018 * object will have no environment. If the object previously had an
1013 * environment, the x and y coordinates will be updated to 1019 * environment, the x and y coordinates will be updated to
1014 * the previous environment. 1020 * the previous environment.
1015 * Beware: This function is called from the editor as well! 1021 * Beware: This function is called from the editor as well!
1016 */ 1022 */
1017
1018void 1023void
1019remove_ob (object *op) 1024object::remove ()
1020{ 1025{
1021 object *tmp, *last = 0; 1026 object *tmp, *last = 0;
1022 object *otmp; 1027 object *otmp;
1023 1028
1024 int check_walk_off; 1029 int check_walk_off;
1025 maptile *m;
1026 1030
1027 sint16 x, y;
1028
1029 if (QUERY_FLAG (op, FLAG_REMOVED)) 1031 if (QUERY_FLAG (this, FLAG_REMOVED))
1030 return; 1032 return;
1031 1033
1032 SET_FLAG (op, FLAG_REMOVED); 1034 SET_FLAG (this, FLAG_REMOVED);
1033 1035
1034 if (op->more != NULL) 1036 if (more)
1035 remove_ob (op->more); 1037 more->remove ();
1036 1038
1037 /* 1039 /*
1038 * In this case, the object to be removed is in someones 1040 * In this case, the object to be removed is in someones
1039 * inventory. 1041 * inventory.
1040 */ 1042 */
1041 if (op->env != NULL) 1043 if (env)
1042 { 1044 {
1043 if (op->nrof) 1045 if (nrof)
1044 sub_weight (op->env, op->weight * op->nrof); 1046 sub_weight (env, weight * nrof);
1045 else 1047 else
1046 sub_weight (op->env, op->weight + op->carrying); 1048 sub_weight (env, weight + carrying);
1047 1049
1048 /* NO_FIX_PLAYER is set when a great many changes are being 1050 /* NO_FIX_PLAYER is set when a great many changes are being
1049 * made to players inventory. If set, avoiding the call 1051 * made to players inventory. If set, avoiding the call
1050 * to save cpu time. 1052 * to save cpu time.
1051 */ 1053 */
1052 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1054 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1053 fix_player (otmp); 1055 fix_player (otmp);
1054 1056
1055 if (op->above != NULL) 1057 if (above != NULL)
1056 op->above->below = op->below; 1058 above->below = below;
1057 else 1059 else
1058 op->env->inv = op->below; 1060 env->inv = below;
1059 1061
1060 if (op->below != NULL) 1062 if (below != NULL)
1061 op->below->above = op->above; 1063 below->above = above;
1062 1064
1063 /* we set up values so that it could be inserted into 1065 /* we set up values so that it could be inserted into
1064 * the map, but we don't actually do that - it is up 1066 * the map, but we don't actually do that - it is up
1065 * to the caller to decide what we want to do. 1067 * to the caller to decide what we want to do.
1066 */ 1068 */
1067 op->x = op->env->x, op->y = op->env->y; 1069 x = env->x, y = env->y;
1068 op->map = op->env->map; 1070 map = env->map;
1069 op->above = NULL, op->below = NULL; 1071 above = 0, below = 0;
1070 op->env = NULL; 1072 env = 0;
1071 } 1073 }
1072 else if (op->map) 1074 else if (map)
1073 { 1075 {
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 1076 /* Re did the following section of code - it looks like it had
1094 * lots of logic for things we no longer care about 1077 * lots of logic for things we no longer care about
1095 */ 1078 */
1096 1079
1097 /* link the object above us */ 1080 /* link the object above us */
1098 if (op->above) 1081 if (above)
1099 op->above->below = op->below; 1082 above->below = below;
1100 else 1083 else
1101 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1084 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1102 1085
1103 /* Relink the object below us, if there is one */ 1086 /* Relink the object below us, if there is one */
1104 if (op->below) 1087 if (below)
1105 op->below->above = op->above; 1088 below->above = above;
1106 else 1089 else
1107 { 1090 {
1108 /* Nothing below, which means we need to relink map object for this space 1091 /* 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 1092 * use translated coordinates in case some oddness with map tiling is
1110 * evident 1093 * evident
1111 */ 1094 */
1112 if (GET_MAP_OB (m, x, y) != op) 1095 if (GET_MAP_OB (map, x, y) != this)
1113 { 1096 {
1114 char *dump = dump_object (op); 1097 char *dump = dump_object (this);
1115 LOG (llevError, 1098 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); 1099 "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); 1100 free (dump);
1118 dump = dump_object (GET_MAP_OB (m, x, y)); 1101 dump = dump_object (GET_MAP_OB (map, x, y));
1119 LOG (llevError, "%s\n", dump); 1102 LOG (llevError, "%s\n", dump);
1120 free (dump); 1103 free (dump);
1121 } 1104 }
1122 1105
1123 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1106 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1124 } 1107 }
1125 1108
1126 op->above = 0; 1109 above = 0;
1127 op->below = 0; 1110 below = 0;
1128 1111
1129 if (op->map->in_memory == MAP_SAVING) 1112 if (map->in_memory == MAP_SAVING)
1130 return; 1113 return;
1131 1114
1132 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1115 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1133 1116
1134 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1117 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1135 { 1118 {
1136 /* No point updating the players look faces if he is the object 1119 /* No point updating the players look faces if he is the object
1137 * being removed. 1120 * being removed.
1138 */ 1121 */
1139 1122
1140 if (tmp->type == PLAYER && tmp != op) 1123 if (tmp->type == PLAYER && tmp != this)
1141 { 1124 {
1142 /* If a container that the player is currently using somehow gets 1125 /* If a container that the player is currently using somehow gets
1143 * removed (most likely destroyed), update the player view 1126 * removed (most likely destroyed), update the player view
1144 * appropriately. 1127 * appropriately.
1145 */ 1128 */
1146 if (tmp->container == op) 1129 if (tmp->container == this)
1147 { 1130 {
1148 CLEAR_FLAG (op, FLAG_APPLIED); 1131 CLEAR_FLAG (this, FLAG_APPLIED);
1149 tmp->container = NULL; 1132 tmp->container = 0;
1150 } 1133 }
1151 1134
1152 tmp->contr->socket.update_look = 1; 1135 tmp->contr->socket.update_look = 1;
1153 } 1136 }
1154 1137
1155 /* See if player moving off should effect something */ 1138 /* See if player moving off should effect something */
1156 if (check_walk_off 1139 if (check_walk_off
1157 && ((op->move_type & tmp->move_off) 1140 && ((move_type & tmp->move_off)
1158 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1141 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1159 { 1142 {
1160 move_apply (tmp, op, NULL); 1143 move_apply (tmp, this, 0);
1161 1144
1162 if (op->destroyed ()) 1145 if (destroyed ())
1163 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1146 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1164 } 1147 }
1165 1148
1166 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1149 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1167 1150
1168 if (tmp->above == tmp) 1151 if (tmp->above == tmp)
1169 tmp->above = NULL; 1152 tmp->above = 0;
1170 1153
1171 last = tmp; 1154 last = tmp;
1172 } 1155 }
1173 1156
1174 /* last == NULL of there are no objects on this space */ 1157 /* last == NULL of there are no objects on this space */
1175 if (last == NULL) 1158 if (!last)
1176 { 1159 {
1177 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1160 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1178 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1161 * 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 1162 * those out anyways, and if there are any flags set right now, they won't
1180 * be correct anyways. 1163 * be correct anyways.
1181 */ 1164 */
1182 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1165 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1183 update_position (op->map, op->x, op->y); 1166 update_position (map, x, y);
1184 } 1167 }
1185 else 1168 else
1186 update_object (last, UP_OBJ_REMOVE); 1169 update_object (last, UP_OBJ_REMOVE);
1187 1170
1188 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1171 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1189 update_all_los (op->map, op->x, op->y); 1172 update_all_los (map, x, y);
1190 } 1173 }
1191} 1174}
1192 1175
1193/* 1176/*
1194 * merge_ob(op,top): 1177 * merge_ob(op,top):
… …
1215 { 1198 {
1216 top->nrof += op->nrof; 1199 top->nrof += op->nrof;
1217 1200
1218/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1201/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1219 op->weight = 0; /* Don't want any adjustements now */ 1202 op->weight = 0; /* Don't want any adjustements now */
1220 remove_ob (op); 1203 op->destroy ();
1221 free_object (op);
1222 return top; 1204 return top;
1223 } 1205 }
1224 } 1206 }
1225 1207
1226 return 0; 1208 return 0;
… …
1356 if (op->nrof && !(flag & INS_NO_MERGE)) 1338 if (op->nrof && !(flag & INS_NO_MERGE))
1357 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1339 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1358 if (CAN_MERGE (op, tmp)) 1340 if (CAN_MERGE (op, tmp))
1359 { 1341 {
1360 op->nrof += tmp->nrof; 1342 op->nrof += tmp->nrof;
1361 remove_ob (tmp); 1343 tmp->destroy ();
1362 free_object (tmp);
1363 } 1344 }
1364 1345
1365 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1346 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1366 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1347 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1367 1348
… …
1553 tmp1; 1534 tmp1;
1554 1535
1555 /* first search for itself and remove any old instances */ 1536 /* first search for itself and remove any old instances */
1556 1537
1557 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1538 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 */ 1539 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1560 { 1540 tmp->destroy ();
1561 remove_ob (tmp);
1562 free_object (tmp);
1563 }
1564 }
1565 1541
1566 tmp1 = arch_to_object (archetype::find (arch_string)); 1542 tmp1 = arch_to_object (archetype::find (arch_string));
1567 1543
1568 tmp1->x = op->x; 1544 tmp1->x = op->x;
1569 tmp1->y = op->y; 1545 tmp1->y = op->y;
… …
1579 */ 1555 */
1580 1556
1581object * 1557object *
1582get_split_ob (object *orig_ob, uint32 nr) 1558get_split_ob (object *orig_ob, uint32 nr)
1583{ 1559{
1584 object * 1560 object *newob;
1585 newob;
1586 int
1587 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1561 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1588 1562
1589 if (orig_ob->nrof < nr) 1563 if (orig_ob->nrof < nr)
1590 { 1564 {
1591 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1565 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1592 return NULL; 1566 return NULL;
1593 } 1567 }
1594 1568
1595 newob = object_create_clone (orig_ob); 1569 newob = object_create_clone (orig_ob);
1596 1570
1597 if ((orig_ob->nrof -= nr) < 1) 1571 if ((orig_ob->nrof -= nr) < 1)
1598 { 1572 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) 1573 else if (!is_removed)
1604 { 1574 {
1605 if (orig_ob->env != NULL) 1575 if (orig_ob->env != NULL)
1606 sub_weight (orig_ob->env, orig_ob->weight * nr); 1576 sub_weight (orig_ob->env, orig_ob->weight * nr);
1607 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1577 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1671 esrv_send_item (tmp, op); 1641 esrv_send_item (tmp, op);
1672 } 1642 }
1673 } 1643 }
1674 else 1644 else
1675 { 1645 {
1676 remove_ob (op); 1646 op->remove ();
1677 op->nrof = 0; 1647 op->nrof = 0;
1678 if (tmp) 1648 if (tmp)
1679 { 1649 {
1680 esrv_del_item (tmp->contr, op->count); 1650 esrv_del_item (tmp->contr, op->count);
1681 } 1651 }
… …
1687 1657
1688 if (i < op->nrof) 1658 if (i < op->nrof)
1689 op->nrof -= i; 1659 op->nrof -= i;
1690 else 1660 else
1691 { 1661 {
1692 remove_ob (op); 1662 op->remove ();
1693 op->nrof = 0; 1663 op->nrof = 0;
1694 } 1664 }
1695 1665
1696 /* Since we just removed op, op->above is null */ 1666 /* Since we just removed op, op->above is null */
1697 for (tmp = above; tmp != NULL; tmp = tmp->above) 1667 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1706 1676
1707 if (op->nrof) 1677 if (op->nrof)
1708 return op; 1678 return op;
1709 else 1679 else
1710 { 1680 {
1711 free_object (op); 1681 op->destroy ();
1712 return NULL; 1682 return NULL;
1713 } 1683 }
1714} 1684}
1715 1685
1716/* 1686/*
… …
1729 op->carrying += weight; 1699 op->carrying += weight;
1730 op = op->env; 1700 op = op->env;
1731 } 1701 }
1732} 1702}
1733 1703
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 * 1704object *
1749insert_ob_in_ob (object *op, object *where) 1705insert_ob_in_ob (object *op, object *where)
1750{ 1706{
1751 object * 1707 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 { 1708 {
1765 char *dump = dump_object (op); 1709 char *dump = dump_object (op);
1766 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1710 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1767 free (dump); 1711 free (dump);
1768 return op; 1712 return op;
1769 } 1713 }
1770 1714
1771 if (where->head) 1715 if (where->head)
1772 { 1716 {
1773 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1717 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1774 where = where->head; 1718 where = where->head;
1775 } 1719 }
1720
1721 return where->insert (op);
1722}
1723
1724/*
1725 * env->insert (op)
1726 * This function inserts the object op in the linked list
1727 * inside the object environment.
1728 *
1729 * The function returns now pointer to inserted item, and return value can
1730 * be != op, if items are merged. -Tero
1731 */
1732
1733object *
1734object::insert (object *op)
1735{
1736 object *tmp, *otmp;
1737
1738 if (!QUERY_FLAG (op, FLAG_REMOVED))
1739 op->remove ();
1776 1740
1777 if (op->more) 1741 if (op->more)
1778 { 1742 {
1779 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1743 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1780 return op; 1744 return op;
… …
1782 1746
1783 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1747 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1784 CLEAR_FLAG (op, FLAG_REMOVED); 1748 CLEAR_FLAG (op, FLAG_REMOVED);
1785 if (op->nrof) 1749 if (op->nrof)
1786 { 1750 {
1787 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1751 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1788 if (CAN_MERGE (tmp, op)) 1752 if (CAN_MERGE (tmp, op))
1789 { 1753 {
1790 /* return the original object and remove inserted object 1754 /* return the original object and remove inserted object
1791 (client needs the original object) */ 1755 (client needs the original object) */
1792 tmp->nrof += op->nrof; 1756 tmp->nrof += op->nrof;
1793 /* Weight handling gets pretty funky. Since we are adding to 1757 /* Weight handling gets pretty funky. Since we are adding to
1794 * tmp->nrof, we need to increase the weight. 1758 * tmp->nrof, we need to increase the weight.
1795 */ 1759 */
1796 add_weight (where, op->weight * op->nrof); 1760 add_weight (this, op->weight * op->nrof);
1797 SET_FLAG (op, FLAG_REMOVED); 1761 SET_FLAG (op, FLAG_REMOVED);
1798 free_object (op); /* free the inserted object */ 1762 op->destroy (); /* free the inserted object */
1799 op = tmp; 1763 op = tmp;
1800 remove_ob (op); /* and fix old object's links */ 1764 op->remove (); /* and fix old object's links */
1801 CLEAR_FLAG (op, FLAG_REMOVED); 1765 CLEAR_FLAG (op, FLAG_REMOVED);
1802 break; 1766 break;
1803 } 1767 }
1804 1768
1805 /* I assume combined objects have no inventory 1769 /* I assume combined objects have no inventory
1806 * We add the weight - this object could have just been removed 1770 * We add the weight - this object could have just been removed
1807 * (if it was possible to merge). calling remove_ob will subtract 1771 * (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 1772 * the weight, so we need to add it in again, since we actually do
1809 * the linking below 1773 * the linking below
1810 */ 1774 */
1811 add_weight (where, op->weight * op->nrof); 1775 add_weight (this, op->weight * op->nrof);
1812 } 1776 }
1813 else 1777 else
1814 add_weight (where, (op->weight + op->carrying)); 1778 add_weight (this, (op->weight + op->carrying));
1815 1779
1816 otmp = is_player_inv (where); 1780 otmp = is_player_inv (this);
1817 if (otmp && otmp->contr != NULL) 1781 if (otmp && otmp->contr)
1818 {
1819 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1782 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1820 fix_player (otmp); 1783 fix_player (otmp);
1821 }
1822 1784
1823 op->map = NULL; 1785 op->map = NULL;
1824 op->env = where; 1786 op->env = this;
1825 op->above = NULL; 1787 op->above = NULL;
1826 op->below = NULL; 1788 op->below = NULL;
1827 op->x = 0, op->y = 0; 1789 op->x = 0, op->y = 0;
1828 1790
1829 /* reset the light list and los of the players on the map */ 1791 /* reset the light list and los of the players on the map */
1830 if ((op->glow_radius != 0) && where->map) 1792 if ((op->glow_radius != 0) && map)
1831 { 1793 {
1832#ifdef DEBUG_LIGHTS 1794#ifdef DEBUG_LIGHTS
1833 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1795 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1834#endif /* DEBUG_LIGHTS */ 1796#endif /* DEBUG_LIGHTS */
1835 if (MAP_DARKNESS (where->map)) 1797 if (MAP_DARKNESS (map))
1836 update_all_los (where->map, where->x, where->y); 1798 update_all_los (map, x, y);
1837 } 1799 }
1838 1800
1839 /* Client has no idea of ordering so lets not bother ordering it here. 1801 /* Client has no idea of ordering so lets not bother ordering it here.
1840 * It sure simplifies this function... 1802 * It sure simplifies this function...
1841 */ 1803 */
1842 if (where->inv == NULL) 1804 if (!inv)
1843 where->inv = op; 1805 inv = op;
1844 else 1806 else
1845 { 1807 {
1846 op->below = where->inv; 1808 op->below = inv;
1847 op->below->above = op; 1809 op->below->above = op;
1848 where->inv = op; 1810 inv = op;
1849 } 1811 }
1812
1850 return op; 1813 return op;
1851} 1814}
1852 1815
1853/* 1816/*
1854 * Checks if any objects has a move_type that matches objects 1817 * Checks if any objects has a move_type that matches objects
… …
2543 * create clone from object to another 2506 * create clone from object to another
2544 */ 2507 */
2545object * 2508object *
2546object_create_clone (object *asrc) 2509object_create_clone (object *asrc)
2547{ 2510{
2548 object *
2549 dst = NULL, *tmp, *src, *part, *prev, *item; 2511 object *dst = 0, *tmp, *src, *part, *prev, *item;
2550 2512
2551 if (!asrc) 2513 if (!asrc)
2552 return NULL; 2514 return 0;
2515
2553 src = asrc; 2516 src = asrc;
2554 if (src->head) 2517 if (src->head)
2555 src = src->head; 2518 src = src->head;
2556 2519
2557 prev = NULL; 2520 prev = 0;
2558 for (part = src; part; part = part->more) 2521 for (part = src; part; part = part->more)
2559 { 2522 {
2560 tmp = get_object (); 2523 tmp = object::create ();
2561 copy_object (part, tmp); 2524 part->copy_to (tmp);
2562 tmp->x -= src->x; 2525 tmp->x -= src->x;
2563 tmp->y -= src->y; 2526 tmp->y -= src->y;
2527
2564 if (!part->head) 2528 if (!part->head)
2565 { 2529 {
2566 dst = tmp; 2530 dst = tmp;
2567 tmp->head = NULL; 2531 tmp->head = 0;
2568 } 2532 }
2569 else 2533 else
2570 { 2534 {
2571 tmp->head = dst; 2535 tmp->head = dst;
2572 } 2536 }
2537
2573 tmp->more = NULL; 2538 tmp->more = 0;
2539
2574 if (prev) 2540 if (prev)
2575 prev->more = tmp; 2541 prev->more = tmp;
2542
2576 prev = tmp; 2543 prev = tmp;
2577 } 2544 }
2578 2545
2579 for (item = src->inv; item; item = item->below) 2546 for (item = src->inv; item; item = item->below)
2580 insert_ob_in_ob (object_create_clone (item), dst); 2547 insert_ob_in_ob (object_create_clone (item), dst);
… …
2606 } 2573 }
2607 2574
2608 fprintf (tempfile, obstr); 2575 fprintf (tempfile, obstr);
2609 fclose (tempfile); 2576 fclose (tempfile);
2610 2577
2611 op = get_object (); 2578 op = object::create ();
2612 2579
2613 object_thawer thawer (filename); 2580 object_thawer thawer (filename);
2614 2581
2615 if (thawer) 2582 if (thawer)
2616 load_object (thawer, op, 0); 2583 load_object (thawer, op, 0);

Diff Legend

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