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

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

Diff Legend

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