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.55 by root, Sun Dec 3 00:41:33 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 ()
… …
526 526
527 if (settings.casting_time) 527 if (settings.casting_time)
528 casting_time = -1; 528 casting_time = -1;
529} 529}
530 530
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 531/*
541 * copy object first frees everything allocated by the second object, 532 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 533 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 534 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 535 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 536 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 537 * will point at garbage.
547 */ 538 */
548void 539void
549copy_object (object *op2, object *op) 540object::copy_to (object *dst)
550{ 541{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 542 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 543 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 544
554 op2->clone (op); 545 *(object_copy *)dst = *this;
546 *(object_pod *)dst = *this;
547
548 if (self || cb)
549 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
555 550
556 if (is_freed) 551 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 552 SET_FLAG (dst, FLAG_FREED);
553
558 if (is_removed) 554 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 555 SET_FLAG (dst, FLAG_REMOVED);
560 556
561 if (op2->speed < 0) 557 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 558 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 559
564 /* Copy over key_values, if any. */ 560 /* Copy over key_values, if any. */
565 if (op2->key_values) 561 if (key_values)
566 { 562 {
567 key_value *tail = 0; 563 key_value *tail = 0;
568 key_value *i; 564 key_value *i;
569 565
570 op->key_values = 0; 566 dst->key_values = 0;
571 567
572 for (i = op2->key_values; i; i = i->next) 568 for (i = key_values; i; i = i->next)
573 { 569 {
574 key_value *new_link = new key_value; 570 key_value *new_link = new key_value;
575 571
576 new_link->next = 0; 572 new_link->next = 0;
577 new_link->key = i->key; 573 new_link->key = i->key;
578 new_link->value = i->value; 574 new_link->value = i->value;
579 575
580 /* Try and be clever here, too. */ 576 /* Try and be clever here, too. */
581 if (!op->key_values) 577 if (!dst->key_values)
582 { 578 {
583 op->key_values = new_link; 579 dst->key_values = new_link;
584 tail = new_link; 580 tail = new_link;
585 } 581 }
586 else 582 else
587 { 583 {
588 tail->next = new_link; 584 tail->next = new_link;
589 tail = new_link; 585 tail = new_link;
590 } 586 }
591 } 587 }
592 } 588 }
593 589
594 update_ob_speed (op); 590 update_ob_speed (dst);
595} 591}
596 592
597/* 593/*
598 * 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
599 * 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
… …
804 update_now = 1; 800 update_now = 1;
805 801
806 if ((move_slow | op->move_slow) != move_slow) 802 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1; 803 update_now = 1;
808 } 804 }
805
809 /* if the object is being removed, we can't make intelligent 806 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 807 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 808 * that is being removed.
812 */ 809 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 810 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
839 else 836 else
840 { 837 {
841 delete *i; 838 delete *i;
842 mortals.erase (i); 839 mortals.erase (i);
843 } 840 }
844
845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
852} 841}
853 842
854object::object () 843object::object ()
855{ 844{
856 SET_FLAG (this, FLAG_REMOVED); 845 SET_FLAG (this, FLAG_REMOVED);
… …
915 904
916 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 905 if (QUERY_FLAG (this, FLAG_FRIENDLY))
917 remove_friendly_object (this); 906 remove_friendly_object (this);
918 907
919 if (!QUERY_FLAG (this, FLAG_REMOVED)) 908 if (!QUERY_FLAG (this, FLAG_REMOVED))
920 remove_ob (this); 909 remove ();
921 910
922 SET_FLAG (this, FLAG_FREED); 911 SET_FLAG (this, FLAG_FREED);
923
924 // hack to ensure that freed objects still have a valid map
925 {
926 static maptile *freed_map; // freed objects are moved here to avoid crashes
927
928 if (!freed_map)
929 {
930 freed_map = get_empty_map (3, 3);
931 freed_map->name = "freed objects map";
932 allocate_map (freed_map);
933 }
934
935 map = freed_map;
936 x = 1;
937 y = 1;
938 }
939 912
940 if (more) 913 if (more)
941 { 914 {
942 more->destroy (destroy_inventory); 915 more->destroy (destroy_inventory);
943 more = 0; 916 more = 0;
… …
966 939
967 while (op) 940 while (op)
968 { 941 {
969 object *tmp = op->below; 942 object *tmp = op->below;
970 943
971 remove_ob (op); 944 op->remove ();
972 945
973 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 946 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
974 || 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))
975 free_object (op); 948 op->destroy ();
976 else 949 else
977 { 950 {
978 op->x = x; 951 op->x = x;
979 op->y = y; 952 op->y = y;
980 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 */
… …
983 op = tmp; 956 op = tmp;
984 } 957 }
985 } 958 }
986 } 959 }
987 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
988 // clear those pointers that likely might have circular references to us 981 // clear those pointers that likely might have circular references to us
989 owner = 0; 982 owner = 0;
990 enemy = 0; 983 enemy = 0;
991 attacked_by = 0; 984 attacked_by = 0;
992 985
… …
1004 997
1005/* 998/*
1006 * sub_weight() recursively (outwards) subtracts a number from the 999 * sub_weight() recursively (outwards) subtracts a number from the
1007 * 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)).
1008 */ 1001 */
1009
1010void 1002void
1011sub_weight (object *op, signed long weight) 1003sub_weight (object *op, signed long weight)
1012{ 1004{
1013 while (op != NULL) 1005 while (op != NULL)
1014 { 1006 {
… …
1018 op->carrying -= weight; 1010 op->carrying -= weight;
1019 op = op->env; 1011 op = op->env;
1020 } 1012 }
1021} 1013}
1022 1014
1023/* remove_ob(op): 1015/* op->remove ():
1024 * 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
1025 * 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
1026 * object will have no environment. If the object previously had an 1018 * object will have no environment. If the object previously had an
1027 * environment, the x and y coordinates will be updated to 1019 * environment, the x and y coordinates will be updated to
1028 * the previous environment. 1020 * the previous environment.
1029 * Beware: This function is called from the editor as well! 1021 * Beware: This function is called from the editor as well!
1030 */ 1022 */
1031
1032void 1023void
1033remove_ob (object *op) 1024object::remove ()
1034{ 1025{
1035 object *tmp, *last = 0; 1026 object *tmp, *last = 0;
1036 object *otmp; 1027 object *otmp;
1037 1028
1038 int check_walk_off; 1029 int check_walk_off;
1039 maptile *m;
1040 1030
1041 sint16 x, y;
1042
1043 if (QUERY_FLAG (op, FLAG_REMOVED)) 1031 if (QUERY_FLAG (this, FLAG_REMOVED))
1044 return; 1032 return;
1045 1033
1046 SET_FLAG (op, FLAG_REMOVED); 1034 SET_FLAG (this, FLAG_REMOVED);
1047 1035
1048 if (op->more != NULL) 1036 if (more)
1049 remove_ob (op->more); 1037 more->remove ();
1050 1038
1051 /* 1039 /*
1052 * In this case, the object to be removed is in someones 1040 * In this case, the object to be removed is in someones
1053 * inventory. 1041 * inventory.
1054 */ 1042 */
1055 if (op->env != NULL) 1043 if (env)
1056 { 1044 {
1057 if (op->nrof) 1045 if (nrof)
1058 sub_weight (op->env, op->weight * op->nrof); 1046 sub_weight (env, weight * nrof);
1059 else 1047 else
1060 sub_weight (op->env, op->weight + op->carrying); 1048 sub_weight (env, weight + carrying);
1061 1049
1062 /* 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
1063 * made to players inventory. If set, avoiding the call 1051 * made to players inventory. If set, avoiding the call
1064 * to save cpu time. 1052 * to save cpu time.
1065 */ 1053 */
1066 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))
1067 fix_player (otmp); 1055 fix_player (otmp);
1068 1056
1069 if (op->above != NULL) 1057 if (above != NULL)
1070 op->above->below = op->below; 1058 above->below = below;
1071 else 1059 else
1072 op->env->inv = op->below; 1060 env->inv = below;
1073 1061
1074 if (op->below != NULL) 1062 if (below != NULL)
1075 op->below->above = op->above; 1063 below->above = above;
1076 1064
1077 /* we set up values so that it could be inserted into 1065 /* we set up values so that it could be inserted into
1078 * 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
1079 * to the caller to decide what we want to do. 1067 * to the caller to decide what we want to do.
1080 */ 1068 */
1081 op->x = op->env->x, op->y = op->env->y; 1069 x = env->x, y = env->y;
1082 op->map = op->env->map; 1070 map = env->map;
1083 op->above = NULL, op->below = NULL; 1071 above = 0, below = 0;
1084 op->env = NULL; 1072 env = 0;
1085 } 1073 }
1086 else if (op->map) 1074 else if (map)
1087 { 1075 {
1088 x = op->x;
1089 y = op->y;
1090 m = get_map_from_coord (op->map, &x, &y);
1091
1092 if (!m)
1093 {
1094 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1095 op->map->path, op->x, op->y);
1096 /* in old days, we used to set x and y to 0 and continue.
1097 * it seems if we get into this case, something is probablye
1098 * screwed up and should be fixed.
1099 */
1100 abort ();
1101 }
1102
1103 if (op->map != m)
1104 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1105 op->map->path, m->path, op->x, op->y, x, y);
1106
1107 /* 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
1108 * lots of logic for things we no longer care about 1077 * lots of logic for things we no longer care about
1109 */ 1078 */
1110 1079
1111 /* link the object above us */ 1080 /* link the object above us */
1112 if (op->above) 1081 if (above)
1113 op->above->below = op->below; 1082 above->below = below;
1114 else 1083 else
1115 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 */
1116 1085
1117 /* Relink the object below us, if there is one */ 1086 /* Relink the object below us, if there is one */
1118 if (op->below) 1087 if (below)
1119 op->below->above = op->above; 1088 below->above = above;
1120 else 1089 else
1121 { 1090 {
1122 /* 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
1123 * use translated coordinates in case some oddness with map tiling is 1092 * use translated coordinates in case some oddness with map tiling is
1124 * evident 1093 * evident
1125 */ 1094 */
1126 if (GET_MAP_OB (m, x, y) != op) 1095 if (GET_MAP_OB (map, x, y) != this)
1127 { 1096 {
1128 char *dump = dump_object (op); 1097 char *dump = dump_object (this);
1129 LOG (llevError, 1098 LOG (llevError,
1130 "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);
1131 free (dump); 1100 free (dump);
1132 dump = dump_object (GET_MAP_OB (m, x, y)); 1101 dump = dump_object (GET_MAP_OB (map, x, y));
1133 LOG (llevError, "%s\n", dump); 1102 LOG (llevError, "%s\n", dump);
1134 free (dump); 1103 free (dump);
1135 } 1104 }
1136 1105
1137 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1106 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1138 } 1107 }
1139 1108
1140 op->above = 0; 1109 above = 0;
1141 op->below = 0; 1110 below = 0;
1142 1111
1143 if (op->map->in_memory == MAP_SAVING) 1112 if (map->in_memory == MAP_SAVING)
1144 return; 1113 return;
1145 1114
1146 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1115 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1147 1116
1148 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)
1149 { 1118 {
1150 /* 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
1151 * being removed. 1120 * being removed.
1152 */ 1121 */
1153 1122
1154 if (tmp->type == PLAYER && tmp != op) 1123 if (tmp->type == PLAYER && tmp != this)
1155 { 1124 {
1156 /* If a container that the player is currently using somehow gets 1125 /* If a container that the player is currently using somehow gets
1157 * removed (most likely destroyed), update the player view 1126 * removed (most likely destroyed), update the player view
1158 * appropriately. 1127 * appropriately.
1159 */ 1128 */
1160 if (tmp->container == op) 1129 if (tmp->container == this)
1161 { 1130 {
1162 CLEAR_FLAG (op, FLAG_APPLIED); 1131 CLEAR_FLAG (this, FLAG_APPLIED);
1163 tmp->container = NULL; 1132 tmp->container = 0;
1164 } 1133 }
1165 1134
1166 tmp->contr->socket.update_look = 1; 1135 tmp->contr->socket.update_look = 1;
1167 } 1136 }
1168 1137
1169 /* See if player moving off should effect something */ 1138 /* See if player moving off should effect something */
1170 if (check_walk_off 1139 if (check_walk_off
1171 && ((op->move_type & tmp->move_off) 1140 && ((move_type & tmp->move_off)
1172 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1141 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1173 { 1142 {
1174 move_apply (tmp, op, NULL); 1143 move_apply (tmp, this, 0);
1175 1144
1176 if (op->destroyed ()) 1145 if (destroyed ())
1177 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 ());
1178 } 1147 }
1179 1148
1180 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1149 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1181 1150
1182 if (tmp->above == tmp) 1151 if (tmp->above == tmp)
1183 tmp->above = NULL; 1152 tmp->above = 0;
1184 1153
1185 last = tmp; 1154 last = tmp;
1186 } 1155 }
1187 1156
1188 /* last == NULL of there are no objects on this space */ 1157 /* last == NULL of there are no objects on this space */
1189 if (last == NULL) 1158 if (!last)
1190 { 1159 {
1191 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1160 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1192 * 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
1193 * 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
1194 * be correct anyways. 1163 * be correct anyways.
1195 */ 1164 */
1196 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1165 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1197 update_position (op->map, op->x, op->y); 1166 update_position (map, x, y);
1198 } 1167 }
1199 else 1168 else
1200 update_object (last, UP_OBJ_REMOVE); 1169 update_object (last, UP_OBJ_REMOVE);
1201 1170
1202 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1171 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1203 update_all_los (op->map, op->x, op->y); 1172 update_all_los (map, x, y);
1204 } 1173 }
1205} 1174}
1206 1175
1207/* 1176/*
1208 * merge_ob(op,top): 1177 * merge_ob(op,top):
… …
1229 { 1198 {
1230 top->nrof += op->nrof; 1199 top->nrof += op->nrof;
1231 1200
1232/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1201/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1233 op->weight = 0; /* Don't want any adjustements now */ 1202 op->weight = 0; /* Don't want any adjustements now */
1234 remove_ob (op); 1203 op->destroy ();
1235 free_object (op);
1236 return top; 1204 return top;
1237 } 1205 }
1238 } 1206 }
1239 1207
1240 return 0; 1208 return 0;
… …
1370 if (op->nrof && !(flag & INS_NO_MERGE)) 1338 if (op->nrof && !(flag & INS_NO_MERGE))
1371 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)
1372 if (CAN_MERGE (op, tmp)) 1340 if (CAN_MERGE (op, tmp))
1373 { 1341 {
1374 op->nrof += tmp->nrof; 1342 op->nrof += tmp->nrof;
1375 remove_ob (tmp); 1343 tmp->destroy ();
1376 free_object (tmp);
1377 } 1344 }
1378 1345
1379 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 */
1380 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1347 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1381 1348
… …
1567 tmp1; 1534 tmp1;
1568 1535
1569 /* first search for itself and remove any old instances */ 1536 /* first search for itself and remove any old instances */
1570 1537
1571 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)
1572 {
1573 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1539 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1574 { 1540 tmp->destroy ();
1575 remove_ob (tmp);
1576 free_object (tmp);
1577 }
1578 }
1579 1541
1580 tmp1 = arch_to_object (archetype::find (arch_string)); 1542 tmp1 = arch_to_object (archetype::find (arch_string));
1581 1543
1582 tmp1->x = op->x; 1544 tmp1->x = op->x;
1583 tmp1->y = op->y; 1545 tmp1->y = op->y;
… …
1593 */ 1555 */
1594 1556
1595object * 1557object *
1596get_split_ob (object *orig_ob, uint32 nr) 1558get_split_ob (object *orig_ob, uint32 nr)
1597{ 1559{
1598 object * 1560 object *newob;
1599 newob;
1600 int
1601 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1561 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1602 1562
1603 if (orig_ob->nrof < nr) 1563 if (orig_ob->nrof < nr)
1604 { 1564 {
1605 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);
1606 return NULL; 1566 return NULL;
1607 } 1567 }
1608 1568
1609 newob = object_create_clone (orig_ob); 1569 newob = object_create_clone (orig_ob);
1610 1570
1611 if ((orig_ob->nrof -= nr) < 1) 1571 if ((orig_ob->nrof -= nr) < 1)
1612 { 1572 orig_ob->destroy (1);
1613 if (!is_removed)
1614 remove_ob (orig_ob);
1615 free_object2 (orig_ob, 1);
1616 }
1617 else if (!is_removed) 1573 else if (!is_removed)
1618 { 1574 {
1619 if (orig_ob->env != NULL) 1575 if (orig_ob->env != NULL)
1620 sub_weight (orig_ob->env, orig_ob->weight * nr); 1576 sub_weight (orig_ob->env, orig_ob->weight * nr);
1621 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)
… …
1685 esrv_send_item (tmp, op); 1641 esrv_send_item (tmp, op);
1686 } 1642 }
1687 } 1643 }
1688 else 1644 else
1689 { 1645 {
1690 remove_ob (op); 1646 op->remove ();
1691 op->nrof = 0; 1647 op->nrof = 0;
1692 if (tmp) 1648 if (tmp)
1693 { 1649 {
1694 esrv_del_item (tmp->contr, op->count); 1650 esrv_del_item (tmp->contr, op->count);
1695 } 1651 }
… …
1701 1657
1702 if (i < op->nrof) 1658 if (i < op->nrof)
1703 op->nrof -= i; 1659 op->nrof -= i;
1704 else 1660 else
1705 { 1661 {
1706 remove_ob (op); 1662 op->remove ();
1707 op->nrof = 0; 1663 op->nrof = 0;
1708 } 1664 }
1709 1665
1710 /* Since we just removed op, op->above is null */ 1666 /* Since we just removed op, op->above is null */
1711 for (tmp = above; tmp != NULL; tmp = tmp->above) 1667 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1720 1676
1721 if (op->nrof) 1677 if (op->nrof)
1722 return op; 1678 return op;
1723 else 1679 else
1724 { 1680 {
1725 free_object (op); 1681 op->destroy ();
1726 return NULL; 1682 return NULL;
1727 } 1683 }
1728} 1684}
1729 1685
1730/* 1686/*
… …
1743 op->carrying += weight; 1699 op->carrying += weight;
1744 op = op->env; 1700 op = op->env;
1745 } 1701 }
1746} 1702}
1747 1703
1748/*
1749 * insert_ob_in_ob(op,environment):
1750 * This function inserts the object op in the linked list
1751 * inside the object environment.
1752 *
1753 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1754 * the inventory at the last position or next to other objects of the same
1755 * type.
1756 * Frank: Now sorted by type, archetype and magic!
1757 *
1758 * The function returns now pointer to inserted item, and return value can
1759 * be != op, if items are merged. -Tero
1760 */
1761
1762object * 1704object *
1763insert_ob_in_ob (object *op, object *where) 1705insert_ob_in_ob (object *op, object *where)
1764{ 1706{
1765 object * 1707 if (!where)
1766 tmp, *
1767 otmp;
1768
1769 if (!QUERY_FLAG (op, FLAG_REMOVED))
1770 {
1771 char *dump = dump_object (op);
1772 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1773 free (dump);
1774 return op;
1775 }
1776
1777 if (where == NULL)
1778 { 1708 {
1779 char *dump = dump_object (op); 1709 char *dump = dump_object (op);
1780 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);
1781 free (dump); 1711 free (dump);
1782 return op; 1712 return op;
1783 } 1713 }
1784 1714
1785 if (where->head) 1715 if (where->head)
1786 { 1716 {
1787 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");
1788 where = where->head; 1718 where = where->head;
1789 } 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 ();
1790 1740
1791 if (op->more) 1741 if (op->more)
1792 { 1742 {
1793 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);
1794 return op; 1744 return op;
… …
1796 1746
1797 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1747 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1798 CLEAR_FLAG (op, FLAG_REMOVED); 1748 CLEAR_FLAG (op, FLAG_REMOVED);
1799 if (op->nrof) 1749 if (op->nrof)
1800 { 1750 {
1801 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1751 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1802 if (CAN_MERGE (tmp, op)) 1752 if (CAN_MERGE (tmp, op))
1803 { 1753 {
1804 /* return the original object and remove inserted object 1754 /* return the original object and remove inserted object
1805 (client needs the original object) */ 1755 (client needs the original object) */
1806 tmp->nrof += op->nrof; 1756 tmp->nrof += op->nrof;
1807 /* Weight handling gets pretty funky. Since we are adding to 1757 /* Weight handling gets pretty funky. Since we are adding to
1808 * tmp->nrof, we need to increase the weight. 1758 * tmp->nrof, we need to increase the weight.
1809 */ 1759 */
1810 add_weight (where, op->weight * op->nrof); 1760 add_weight (this, op->weight * op->nrof);
1811 SET_FLAG (op, FLAG_REMOVED); 1761 SET_FLAG (op, FLAG_REMOVED);
1812 free_object (op); /* free the inserted object */ 1762 op->destroy (); /* free the inserted object */
1813 op = tmp; 1763 op = tmp;
1814 remove_ob (op); /* and fix old object's links */ 1764 op->remove (); /* and fix old object's links */
1815 CLEAR_FLAG (op, FLAG_REMOVED); 1765 CLEAR_FLAG (op, FLAG_REMOVED);
1816 break; 1766 break;
1817 } 1767 }
1818 1768
1819 /* I assume combined objects have no inventory 1769 /* I assume combined objects have no inventory
1820 * We add the weight - this object could have just been removed 1770 * We add the weight - this object could have just been removed
1821 * (if it was possible to merge). calling remove_ob will subtract 1771 * (if it was possible to merge). calling remove_ob will subtract
1822 * 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
1823 * the linking below 1773 * the linking below
1824 */ 1774 */
1825 add_weight (where, op->weight * op->nrof); 1775 add_weight (this, op->weight * op->nrof);
1826 } 1776 }
1827 else 1777 else
1828 add_weight (where, (op->weight + op->carrying)); 1778 add_weight (this, (op->weight + op->carrying));
1829 1779
1830 otmp = is_player_inv (where); 1780 otmp = is_player_inv (this);
1831 if (otmp && otmp->contr != NULL) 1781 if (otmp && otmp->contr)
1832 {
1833 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1782 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1834 fix_player (otmp); 1783 fix_player (otmp);
1835 }
1836 1784
1837 op->map = NULL; 1785 op->map = NULL;
1838 op->env = where; 1786 op->env = this;
1839 op->above = NULL; 1787 op->above = NULL;
1840 op->below = NULL; 1788 op->below = NULL;
1841 op->x = 0, op->y = 0; 1789 op->x = 0, op->y = 0;
1842 1790
1843 /* 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 */
1844 if ((op->glow_radius != 0) && where->map) 1792 if ((op->glow_radius != 0) && map)
1845 { 1793 {
1846#ifdef DEBUG_LIGHTS 1794#ifdef DEBUG_LIGHTS
1847 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);
1848#endif /* DEBUG_LIGHTS */ 1796#endif /* DEBUG_LIGHTS */
1849 if (MAP_DARKNESS (where->map)) 1797 if (MAP_DARKNESS (map))
1850 update_all_los (where->map, where->x, where->y); 1798 update_all_los (map, x, y);
1851 } 1799 }
1852 1800
1853 /* 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.
1854 * It sure simplifies this function... 1802 * It sure simplifies this function...
1855 */ 1803 */
1856 if (where->inv == NULL) 1804 if (!inv)
1857 where->inv = op; 1805 inv = op;
1858 else 1806 else
1859 { 1807 {
1860 op->below = where->inv; 1808 op->below = inv;
1861 op->below->above = op; 1809 op->below->above = op;
1862 where->inv = op; 1810 inv = op;
1863 } 1811 }
1812
1864 return op; 1813 return op;
1865} 1814}
1866 1815
1867/* 1816/*
1868 * Checks if any objects has a move_type that matches objects 1817 * Checks if any objects has a move_type that matches objects
… …
2557 * create clone from object to another 2506 * create clone from object to another
2558 */ 2507 */
2559object * 2508object *
2560object_create_clone (object *asrc) 2509object_create_clone (object *asrc)
2561{ 2510{
2562 object *
2563 dst = NULL, *tmp, *src, *part, *prev, *item; 2511 object *dst = 0, *tmp, *src, *part, *prev, *item;
2564 2512
2565 if (!asrc) 2513 if (!asrc)
2566 return NULL; 2514 return 0;
2515
2567 src = asrc; 2516 src = asrc;
2568 if (src->head) 2517 if (src->head)
2569 src = src->head; 2518 src = src->head;
2570 2519
2571 prev = NULL; 2520 prev = 0;
2572 for (part = src; part; part = part->more) 2521 for (part = src; part; part = part->more)
2573 { 2522 {
2574 tmp = get_object (); 2523 tmp = object::create ();
2575 copy_object (part, tmp); 2524 part->copy_to (tmp);
2576 tmp->x -= src->x; 2525 tmp->x -= src->x;
2577 tmp->y -= src->y; 2526 tmp->y -= src->y;
2527
2578 if (!part->head) 2528 if (!part->head)
2579 { 2529 {
2580 dst = tmp; 2530 dst = tmp;
2581 tmp->head = NULL; 2531 tmp->head = 0;
2582 } 2532 }
2583 else 2533 else
2584 { 2534 {
2585 tmp->head = dst; 2535 tmp->head = dst;
2586 } 2536 }
2537
2587 tmp->more = NULL; 2538 tmp->more = 0;
2539
2588 if (prev) 2540 if (prev)
2589 prev->more = tmp; 2541 prev->more = tmp;
2542
2590 prev = tmp; 2543 prev = tmp;
2591 } 2544 }
2592 2545
2593 for (item = src->inv; item; item = item->below) 2546 for (item = src->inv; item; item = item->below)
2594 insert_ob_in_ob (object_create_clone (item), dst); 2547 insert_ob_in_ob (object_create_clone (item), dst);
… …
2620 } 2573 }
2621 2574
2622 fprintf (tempfile, obstr); 2575 fprintf (tempfile, obstr);
2623 fclose (tempfile); 2576 fclose (tempfile);
2624 2577
2625 op = get_object (); 2578 op = object::create ();
2626 2579
2627 object_thawer thawer (filename); 2580 object_thawer thawer (filename);
2628 2581
2629 if (thawer) 2582 if (thawer)
2630 load_object (thawer, op, 0); 2583 load_object (thawer, op, 0);

Diff Legend

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