ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.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 912
924 if (more) 913 if (more)
925 { 914 {
… …
950 939
951 while (op) 940 while (op)
952 { 941 {
953 object *tmp = op->below; 942 object *tmp = op->below;
954 943
955 remove_ob (op); 944 op->remove ();
956 945
957 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 946 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 947 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959 free_object (op); 948 op->destroy ();
960 else 949 else
961 { 950 {
962 op->x = x; 951 op->x = x;
963 op->y = y; 952 op->y = y;
964 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 */
… …
967 op = tmp; 956 op = tmp;
968 } 957 }
969 } 958 }
970 } 959 }
971 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
972 // clear those pointers that likely might have circular references to us 981 // clear those pointers that likely might have circular references to us
973 owner = 0; 982 owner = 0;
974 enemy = 0; 983 enemy = 0;
975 attacked_by = 0; 984 attacked_by = 0;
976 985
… …
988 997
989/* 998/*
990 * sub_weight() recursively (outwards) subtracts a number from the 999 * sub_weight() recursively (outwards) subtracts a number from the
991 * 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)).
992 */ 1001 */
993
994void 1002void
995sub_weight (object *op, signed long weight) 1003sub_weight (object *op, signed long weight)
996{ 1004{
997 while (op != NULL) 1005 while (op != NULL)
998 { 1006 {
… …
1002 op->carrying -= weight; 1010 op->carrying -= weight;
1003 op = op->env; 1011 op = op->env;
1004 } 1012 }
1005} 1013}
1006 1014
1007/* remove_ob(op): 1015/* op->remove ():
1008 * 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
1009 * 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
1010 * object will have no environment. If the object previously had an 1018 * object will have no environment. If the object previously had an
1011 * environment, the x and y coordinates will be updated to 1019 * environment, the x and y coordinates will be updated to
1012 * the previous environment. 1020 * the previous environment.
1013 * Beware: This function is called from the editor as well! 1021 * Beware: This function is called from the editor as well!
1014 */ 1022 */
1015
1016void 1023void
1017remove_ob (object *op) 1024object::remove ()
1018{ 1025{
1019 object *tmp, *last = 0; 1026 object *tmp, *last = 0;
1020 object *otmp; 1027 object *otmp;
1021 1028
1022 int check_walk_off; 1029 int check_walk_off;
1023 maptile *m;
1024 1030
1025 sint16 x, y;
1026
1027 if (QUERY_FLAG (op, FLAG_REMOVED)) 1031 if (QUERY_FLAG (this, FLAG_REMOVED))
1028 return; 1032 return;
1029 1033
1030 SET_FLAG (op, FLAG_REMOVED); 1034 SET_FLAG (this, FLAG_REMOVED);
1031 1035
1032 if (op->more != NULL) 1036 if (more)
1033 remove_ob (op->more); 1037 more->remove ();
1034 1038
1035 /* 1039 /*
1036 * In this case, the object to be removed is in someones 1040 * In this case, the object to be removed is in someones
1037 * inventory. 1041 * inventory.
1038 */ 1042 */
1039 if (op->env != NULL) 1043 if (env)
1040 { 1044 {
1041 if (op->nrof) 1045 if (nrof)
1042 sub_weight (op->env, op->weight * op->nrof); 1046 sub_weight (env, weight * nrof);
1043 else 1047 else
1044 sub_weight (op->env, op->weight + op->carrying); 1048 sub_weight (env, weight + carrying);
1045 1049
1046 /* 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
1047 * made to players inventory. If set, avoiding the call 1051 * made to players inventory. If set, avoiding the call
1048 * to save cpu time. 1052 * to save cpu time.
1049 */ 1053 */
1050 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))
1051 fix_player (otmp); 1055 fix_player (otmp);
1052 1056
1053 if (op->above != NULL) 1057 if (above != NULL)
1054 op->above->below = op->below; 1058 above->below = below;
1055 else 1059 else
1056 op->env->inv = op->below; 1060 env->inv = below;
1057 1061
1058 if (op->below != NULL) 1062 if (below != NULL)
1059 op->below->above = op->above; 1063 below->above = above;
1060 1064
1061 /* we set up values so that it could be inserted into 1065 /* we set up values so that it could be inserted into
1062 * 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
1063 * to the caller to decide what we want to do. 1067 * to the caller to decide what we want to do.
1064 */ 1068 */
1065 op->x = op->env->x, op->y = op->env->y; 1069 x = env->x, y = env->y;
1066 op->map = op->env->map; 1070 map = env->map;
1067 op->above = NULL, op->below = NULL; 1071 above = 0, below = 0;
1068 op->env = NULL; 1072 env = 0;
1069 } 1073 }
1070 else if (op->map) 1074 else if (map)
1071 { 1075 {
1072 x = op->x;
1073 y = op->y;
1074 m = get_map_from_coord (op->map, &x, &y);
1075
1076 if (!m)
1077 {
1078 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1079 op->map->path, op->x, op->y);
1080 /* in old days, we used to set x and y to 0 and continue.
1081 * it seems if we get into this case, something is probablye
1082 * screwed up and should be fixed.
1083 */
1084 abort ();
1085 }
1086
1087 if (op->map != m)
1088 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1089 op->map->path, m->path, op->x, op->y, x, y);
1090
1091 /* Re did the following section of code - it looks like it had 1076 /* Re did the following section of code - it looks like it had
1092 * lots of logic for things we no longer care about 1077 * lots of logic for things we no longer care about
1093 */ 1078 */
1094 1079
1095 /* link the object above us */ 1080 /* link the object above us */
1096 if (op->above) 1081 if (above)
1097 op->above->below = op->below; 1082 above->below = below;
1098 else 1083 else
1099 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 */
1100 1085
1101 /* Relink the object below us, if there is one */ 1086 /* Relink the object below us, if there is one */
1102 if (op->below) 1087 if (below)
1103 op->below->above = op->above; 1088 below->above = above;
1104 else 1089 else
1105 { 1090 {
1106 /* 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
1107 * use translated coordinates in case some oddness with map tiling is 1092 * use translated coordinates in case some oddness with map tiling is
1108 * evident 1093 * evident
1109 */ 1094 */
1110 if (GET_MAP_OB (m, x, y) != op) 1095 if (GET_MAP_OB (map, x, y) != this)
1111 { 1096 {
1112 char *dump = dump_object (op); 1097 char *dump = dump_object (this);
1113 LOG (llevError, 1098 LOG (llevError,
1114 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 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);
1115 free (dump); 1100 free (dump);
1116 dump = dump_object (GET_MAP_OB (m, x, y)); 1101 dump = dump_object (GET_MAP_OB (map, x, y));
1117 LOG (llevError, "%s\n", dump); 1102 LOG (llevError, "%s\n", dump);
1118 free (dump); 1103 free (dump);
1119 } 1104 }
1120 1105
1121 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1106 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1122 } 1107 }
1123 1108
1124 op->above = 0; 1109 above = 0;
1125 op->below = 0; 1110 below = 0;
1126 1111
1127 if (op->map->in_memory == MAP_SAVING) 1112 if (map->in_memory == MAP_SAVING)
1128 return; 1113 return;
1129 1114
1130 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1115 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1131 1116
1132 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)
1133 { 1118 {
1134 /* 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
1135 * being removed. 1120 * being removed.
1136 */ 1121 */
1137 1122
1138 if (tmp->type == PLAYER && tmp != op) 1123 if (tmp->type == PLAYER && tmp != this)
1139 { 1124 {
1140 /* If a container that the player is currently using somehow gets 1125 /* If a container that the player is currently using somehow gets
1141 * removed (most likely destroyed), update the player view 1126 * removed (most likely destroyed), update the player view
1142 * appropriately. 1127 * appropriately.
1143 */ 1128 */
1144 if (tmp->container == op) 1129 if (tmp->container == this)
1145 { 1130 {
1146 CLEAR_FLAG (op, FLAG_APPLIED); 1131 CLEAR_FLAG (this, FLAG_APPLIED);
1147 tmp->container = NULL; 1132 tmp->container = 0;
1148 } 1133 }
1149 1134
1150 tmp->contr->socket.update_look = 1; 1135 tmp->contr->socket.update_look = 1;
1151 } 1136 }
1152 1137
1153 /* See if player moving off should effect something */ 1138 /* See if player moving off should effect something */
1154 if (check_walk_off 1139 if (check_walk_off
1155 && ((op->move_type & tmp->move_off) 1140 && ((move_type & tmp->move_off)
1156 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1141 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1157 { 1142 {
1158 move_apply (tmp, op, NULL); 1143 move_apply (tmp, this, 0);
1159 1144
1160 if (op->destroyed ()) 1145 if (destroyed ())
1161 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 ());
1162 } 1147 }
1163 1148
1164 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1149 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1165 1150
1166 if (tmp->above == tmp) 1151 if (tmp->above == tmp)
1167 tmp->above = NULL; 1152 tmp->above = 0;
1168 1153
1169 last = tmp; 1154 last = tmp;
1170 } 1155 }
1171 1156
1172 /* last == NULL of there are no objects on this space */ 1157 /* last == NULL of there are no objects on this space */
1173 if (last == NULL) 1158 if (!last)
1174 { 1159 {
1175 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1160 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1176 * 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
1177 * 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
1178 * be correct anyways. 1163 * be correct anyways.
1179 */ 1164 */
1180 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1165 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1181 update_position (op->map, op->x, op->y); 1166 update_position (map, x, y);
1182 } 1167 }
1183 else 1168 else
1184 update_object (last, UP_OBJ_REMOVE); 1169 update_object (last, UP_OBJ_REMOVE);
1185 1170
1186 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1171 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1187 update_all_los (op->map, op->x, op->y); 1172 update_all_los (map, x, y);
1188 } 1173 }
1189} 1174}
1190 1175
1191/* 1176/*
1192 * merge_ob(op,top): 1177 * merge_ob(op,top):
… …
1213 { 1198 {
1214 top->nrof += op->nrof; 1199 top->nrof += op->nrof;
1215 1200
1216/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1201/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1217 op->weight = 0; /* Don't want any adjustements now */ 1202 op->weight = 0; /* Don't want any adjustements now */
1218 remove_ob (op); 1203 op->destroy ();
1219 free_object (op);
1220 return top; 1204 return top;
1221 } 1205 }
1222 } 1206 }
1223 1207
1224 return 0; 1208 return 0;
… …
1354 if (op->nrof && !(flag & INS_NO_MERGE)) 1338 if (op->nrof && !(flag & INS_NO_MERGE))
1355 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)
1356 if (CAN_MERGE (op, tmp)) 1340 if (CAN_MERGE (op, tmp))
1357 { 1341 {
1358 op->nrof += tmp->nrof; 1342 op->nrof += tmp->nrof;
1359 remove_ob (tmp); 1343 tmp->destroy ();
1360 free_object (tmp);
1361 } 1344 }
1362 1345
1363 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 */
1364 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1347 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1365 1348
… …
1551 tmp1; 1534 tmp1;
1552 1535
1553 /* first search for itself and remove any old instances */ 1536 /* first search for itself and remove any old instances */
1554 1537
1555 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)
1556 {
1557 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1539 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1558 { 1540 tmp->destroy ();
1559 remove_ob (tmp);
1560 free_object (tmp);
1561 }
1562 }
1563 1541
1564 tmp1 = arch_to_object (archetype::find (arch_string)); 1542 tmp1 = arch_to_object (archetype::find (arch_string));
1565 1543
1566 tmp1->x = op->x; 1544 tmp1->x = op->x;
1567 tmp1->y = op->y; 1545 tmp1->y = op->y;
… …
1577 */ 1555 */
1578 1556
1579object * 1557object *
1580get_split_ob (object *orig_ob, uint32 nr) 1558get_split_ob (object *orig_ob, uint32 nr)
1581{ 1559{
1582 object * 1560 object *newob;
1583 newob;
1584 int
1585 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1561 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1586 1562
1587 if (orig_ob->nrof < nr) 1563 if (orig_ob->nrof < nr)
1588 { 1564 {
1589 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);
1590 return NULL; 1566 return NULL;
1591 } 1567 }
1592 1568
1593 newob = object_create_clone (orig_ob); 1569 newob = object_create_clone (orig_ob);
1594 1570
1595 if ((orig_ob->nrof -= nr) < 1) 1571 if ((orig_ob->nrof -= nr) < 1)
1596 { 1572 orig_ob->destroy (1);
1597 if (!is_removed)
1598 remove_ob (orig_ob);
1599 free_object2 (orig_ob, 1);
1600 }
1601 else if (!is_removed) 1573 else if (!is_removed)
1602 { 1574 {
1603 if (orig_ob->env != NULL) 1575 if (orig_ob->env != NULL)
1604 sub_weight (orig_ob->env, orig_ob->weight * nr); 1576 sub_weight (orig_ob->env, orig_ob->weight * nr);
1605 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)
… …
1669 esrv_send_item (tmp, op); 1641 esrv_send_item (tmp, op);
1670 } 1642 }
1671 } 1643 }
1672 else 1644 else
1673 { 1645 {
1674 remove_ob (op); 1646 op->remove ();
1675 op->nrof = 0; 1647 op->nrof = 0;
1676 if (tmp) 1648 if (tmp)
1677 { 1649 {
1678 esrv_del_item (tmp->contr, op->count); 1650 esrv_del_item (tmp->contr, op->count);
1679 } 1651 }
… …
1685 1657
1686 if (i < op->nrof) 1658 if (i < op->nrof)
1687 op->nrof -= i; 1659 op->nrof -= i;
1688 else 1660 else
1689 { 1661 {
1690 remove_ob (op); 1662 op->remove ();
1691 op->nrof = 0; 1663 op->nrof = 0;
1692 } 1664 }
1693 1665
1694 /* Since we just removed op, op->above is null */ 1666 /* Since we just removed op, op->above is null */
1695 for (tmp = above; tmp != NULL; tmp = tmp->above) 1667 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1704 1676
1705 if (op->nrof) 1677 if (op->nrof)
1706 return op; 1678 return op;
1707 else 1679 else
1708 { 1680 {
1709 free_object (op); 1681 op->destroy ();
1710 return NULL; 1682 return NULL;
1711 } 1683 }
1712} 1684}
1713 1685
1714/* 1686/*
… …
1727 op->carrying += weight; 1699 op->carrying += weight;
1728 op = op->env; 1700 op = op->env;
1729 } 1701 }
1730} 1702}
1731 1703
1732/*
1733 * insert_ob_in_ob(op,environment):
1734 * This function inserts the object op in the linked list
1735 * inside the object environment.
1736 *
1737 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1738 * the inventory at the last position or next to other objects of the same
1739 * type.
1740 * Frank: Now sorted by type, archetype and magic!
1741 *
1742 * The function returns now pointer to inserted item, and return value can
1743 * be != op, if items are merged. -Tero
1744 */
1745
1746object * 1704object *
1747insert_ob_in_ob (object *op, object *where) 1705insert_ob_in_ob (object *op, object *where)
1748{ 1706{
1749 object * 1707 if (!where)
1750 tmp, *
1751 otmp;
1752
1753 if (!QUERY_FLAG (op, FLAG_REMOVED))
1754 {
1755 char *dump = dump_object (op);
1756 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757 free (dump);
1758 return op;
1759 }
1760
1761 if (where == NULL)
1762 { 1708 {
1763 char *dump = dump_object (op); 1709 char *dump = dump_object (op);
1764 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);
1765 free (dump); 1711 free (dump);
1766 return op; 1712 return op;
1767 } 1713 }
1768 1714
1769 if (where->head) 1715 if (where->head)
1770 { 1716 {
1771 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");
1772 where = where->head; 1718 where = where->head;
1773 } 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 ();
1774 1740
1775 if (op->more) 1741 if (op->more)
1776 { 1742 {
1777 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);
1778 return op; 1744 return op;
… …
1780 1746
1781 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1747 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1782 CLEAR_FLAG (op, FLAG_REMOVED); 1748 CLEAR_FLAG (op, FLAG_REMOVED);
1783 if (op->nrof) 1749 if (op->nrof)
1784 { 1750 {
1785 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1751 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1786 if (CAN_MERGE (tmp, op)) 1752 if (CAN_MERGE (tmp, op))
1787 { 1753 {
1788 /* return the original object and remove inserted object 1754 /* return the original object and remove inserted object
1789 (client needs the original object) */ 1755 (client needs the original object) */
1790 tmp->nrof += op->nrof; 1756 tmp->nrof += op->nrof;
1791 /* Weight handling gets pretty funky. Since we are adding to 1757 /* Weight handling gets pretty funky. Since we are adding to
1792 * tmp->nrof, we need to increase the weight. 1758 * tmp->nrof, we need to increase the weight.
1793 */ 1759 */
1794 add_weight (where, op->weight * op->nrof); 1760 add_weight (this, op->weight * op->nrof);
1795 SET_FLAG (op, FLAG_REMOVED); 1761 SET_FLAG (op, FLAG_REMOVED);
1796 free_object (op); /* free the inserted object */ 1762 op->destroy (); /* free the inserted object */
1797 op = tmp; 1763 op = tmp;
1798 remove_ob (op); /* and fix old object's links */ 1764 op->remove (); /* and fix old object's links */
1799 CLEAR_FLAG (op, FLAG_REMOVED); 1765 CLEAR_FLAG (op, FLAG_REMOVED);
1800 break; 1766 break;
1801 } 1767 }
1802 1768
1803 /* I assume combined objects have no inventory 1769 /* I assume combined objects have no inventory
1804 * We add the weight - this object could have just been removed 1770 * We add the weight - this object could have just been removed
1805 * (if it was possible to merge). calling remove_ob will subtract 1771 * (if it was possible to merge). calling remove_ob will subtract
1806 * the weight, so we need to add it in again, since we actually do 1772 * the weight, so we need to add it in again, since we actually do
1807 * the linking below 1773 * the linking below
1808 */ 1774 */
1809 add_weight (where, op->weight * op->nrof); 1775 add_weight (this, op->weight * op->nrof);
1810 } 1776 }
1811 else 1777 else
1812 add_weight (where, (op->weight + op->carrying)); 1778 add_weight (this, (op->weight + op->carrying));
1813 1779
1814 otmp = is_player_inv (where); 1780 otmp = is_player_inv (this);
1815 if (otmp && otmp->contr != NULL) 1781 if (otmp && otmp->contr)
1816 {
1817 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1782 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1818 fix_player (otmp); 1783 fix_player (otmp);
1819 }
1820 1784
1821 op->map = NULL; 1785 op->map = NULL;
1822 op->env = where; 1786 op->env = this;
1823 op->above = NULL; 1787 op->above = NULL;
1824 op->below = NULL; 1788 op->below = NULL;
1825 op->x = 0, op->y = 0; 1789 op->x = 0, op->y = 0;
1826 1790
1827 /* 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 */
1828 if ((op->glow_radius != 0) && where->map) 1792 if ((op->glow_radius != 0) && map)
1829 { 1793 {
1830#ifdef DEBUG_LIGHTS 1794#ifdef DEBUG_LIGHTS
1831 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);
1832#endif /* DEBUG_LIGHTS */ 1796#endif /* DEBUG_LIGHTS */
1833 if (MAP_DARKNESS (where->map)) 1797 if (MAP_DARKNESS (map))
1834 update_all_los (where->map, where->x, where->y); 1798 update_all_los (map, x, y);
1835 } 1799 }
1836 1800
1837 /* 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.
1838 * It sure simplifies this function... 1802 * It sure simplifies this function...
1839 */ 1803 */
1840 if (where->inv == NULL) 1804 if (!inv)
1841 where->inv = op; 1805 inv = op;
1842 else 1806 else
1843 { 1807 {
1844 op->below = where->inv; 1808 op->below = inv;
1845 op->below->above = op; 1809 op->below->above = op;
1846 where->inv = op; 1810 inv = op;
1847 } 1811 }
1812
1848 return op; 1813 return op;
1849} 1814}
1850 1815
1851/* 1816/*
1852 * Checks if any objects has a move_type that matches objects 1817 * Checks if any objects has a move_type that matches objects
… …
2541 * create clone from object to another 2506 * create clone from object to another
2542 */ 2507 */
2543object * 2508object *
2544object_create_clone (object *asrc) 2509object_create_clone (object *asrc)
2545{ 2510{
2546 object *
2547 dst = NULL, *tmp, *src, *part, *prev, *item; 2511 object *dst = 0, *tmp, *src, *part, *prev, *item;
2548 2512
2549 if (!asrc) 2513 if (!asrc)
2550 return NULL; 2514 return 0;
2515
2551 src = asrc; 2516 src = asrc;
2552 if (src->head) 2517 if (src->head)
2553 src = src->head; 2518 src = src->head;
2554 2519
2555 prev = NULL; 2520 prev = 0;
2556 for (part = src; part; part = part->more) 2521 for (part = src; part; part = part->more)
2557 { 2522 {
2558 tmp = get_object (); 2523 tmp = object::create ();
2559 copy_object (part, tmp); 2524 part->copy_to (tmp);
2560 tmp->x -= src->x; 2525 tmp->x -= src->x;
2561 tmp->y -= src->y; 2526 tmp->y -= src->y;
2527
2562 if (!part->head) 2528 if (!part->head)
2563 { 2529 {
2564 dst = tmp; 2530 dst = tmp;
2565 tmp->head = NULL; 2531 tmp->head = 0;
2566 } 2532 }
2567 else 2533 else
2568 { 2534 {
2569 tmp->head = dst; 2535 tmp->head = dst;
2570 } 2536 }
2537
2571 tmp->more = NULL; 2538 tmp->more = 0;
2539
2572 if (prev) 2540 if (prev)
2573 prev->more = tmp; 2541 prev->more = tmp;
2542
2574 prev = tmp; 2543 prev = tmp;
2575 } 2544 }
2576 2545
2577 for (item = src->inv; item; item = item->below) 2546 for (item = src->inv; item; item = item->below)
2578 insert_ob_in_ob (object_create_clone (item), dst); 2547 insert_ob_in_ob (object_create_clone (item), dst);
… …
2604 } 2573 }
2605 2574
2606 fprintf (tempfile, obstr); 2575 fprintf (tempfile, obstr);
2607 fclose (tempfile); 2576 fclose (tempfile);
2608 2577
2609 op = get_object (); 2578 op = object::create ();
2610 2579
2611 object_thawer thawer (filename); 2580 object_thawer thawer (filename);
2612 2581
2613 if (thawer) 2582 if (thawer)
2614 load_object (thawer, op, 0); 2583 load_object (thawer, op, 0);

Diff Legend

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