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.56 by root, Sun Dec 3 02:04:57 2006 UTC vs.
Revision 1.66 by root, Wed Dec 13 03:28:42 2006 UTC

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

Diff Legend

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