… | |
… | |
139 | |
139 | |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
141 | static bool |
141 | static bool |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
143 | { |
143 | { |
144 | key_value *wants_field; |
|
|
145 | |
|
|
146 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
144 | /* n-squared behaviour (see kv_get), but I'm hoping both |
147 | * objects with lists are rare, and lists stay short. If not, use a |
145 | * objects with lists are rare, and lists stay short. If not, use a |
148 | * different structure or at least keep the lists sorted... |
146 | * different structure or at least keep the lists sorted... |
149 | */ |
147 | */ |
150 | |
148 | |
151 | /* For each field in wants, */ |
149 | /* For each field in wants, */ |
152 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
150 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
153 | { |
151 | if (has->kv_get (kv->key) != kv->value) |
154 | key_value *has_field; |
152 | return false; |
155 | |
|
|
156 | /* Look for a field in has with the same key. */ |
|
|
157 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
158 | |
|
|
159 | if (!has_field) |
|
|
160 | return 0; /* No field with that name. */ |
|
|
161 | |
|
|
162 | /* Found the matching field. */ |
|
|
163 | if (has_field->value != wants_field->value) |
|
|
164 | return 0; /* Values don't match, so this half of the comparison is false. */ |
|
|
165 | |
|
|
166 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
167 | } |
|
|
168 | |
153 | |
169 | /* If we get here, every field in wants has a matching field in has. */ |
154 | /* If we get here, every field in wants has a matching field in has. */ |
170 | return 1; |
155 | return true; |
171 | } |
156 | } |
172 | |
157 | |
173 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
158 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
174 | static bool |
159 | static bool |
175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
160 | compare_ob_value_lists (const object *ob1, const object *ob2) |
176 | { |
161 | { |
177 | /* However, there may be fields in has which aren't partnered in wants, |
162 | /* However, there may be fields in has which aren't partnered in wants, |
178 | * so we need to run the comparison *twice*. :( |
163 | * so we need to run the comparison *twice*. :( |
179 | */ |
164 | */ |
180 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
165 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
166 | && compare_ob_value_lists_one (ob2, ob1); |
181 | } |
167 | } |
182 | |
168 | |
183 | /* Function examines the 2 objects given to it, and returns true if |
169 | /* Function examines the 2 objects given to it, and returns true if |
184 | * they can be merged together. |
170 | * they can be merged together. |
185 | * |
171 | * |
… | |
… | |
200 | || ob1->speed != ob2->speed |
186 | || ob1->speed != ob2->speed |
201 | || ob1->value != ob2->value |
187 | || ob1->value != ob2->value |
202 | || ob1->name != ob2->name) |
188 | || ob1->name != ob2->name) |
203 | return 0; |
189 | return 0; |
204 | |
190 | |
205 | /* Do not merge objects if nrof would overflow. First part checks |
191 | /* Do not merge objects if nrof would overflow, assume nrof |
206 | * for unsigned overflow (2c), second part checks whether the result |
192 | * is always 0 .. 2**31-1 */ |
207 | * would fit into a 32 bit signed int, which is often used to hold |
193 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
208 | * nrof values. |
|
|
209 | */ |
|
|
210 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
211 | return 0; |
194 | return 0; |
212 | |
195 | |
213 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
196 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
214 | * This is to the comparison of the flags below will be OK. We |
197 | * This is to the comparison of the flags below will be OK. We |
215 | * just can't ignore the been applied or identified flags, as they |
198 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
220 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
203 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | |
204 | |
222 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
205 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | |
207 | |
225 | if (ob1->arch->name != ob2->arch->name |
208 | if (ob1->arch->archname != ob2->arch->archname |
226 | || ob1->name != ob2->name |
209 | || ob1->name != ob2->name |
227 | || ob1->title != ob2->title |
210 | || ob1->title != ob2->title |
228 | || ob1->msg != ob2->msg |
211 | || ob1->msg != ob2->msg |
229 | || ob1->weight != ob2->weight |
212 | || ob1->weight != ob2->weight |
230 | || ob1->attacktype != ob2->attacktype |
213 | || ob1->attacktype != ob2->attacktype |
231 | || ob1->magic != ob2->magic |
214 | || ob1->magic != ob2->magic |
232 | || ob1->slaying != ob2->slaying |
215 | || ob1->slaying != ob2->slaying |
233 | || ob1->skill != ob2->skill |
216 | || ob1->skill != ob2->skill |
234 | || ob1->value != ob2->value |
217 | || ob1->value != ob2->value |
235 | || ob1->animation_id != ob2->animation_id |
218 | || ob1->animation_id != ob2->animation_id |
|
|
219 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
236 | || ob1->client_type != ob2->client_type |
220 | || ob1->client_type != ob2->client_type |
237 | || ob1->materialname != ob2->materialname |
221 | || ob1->materialname != ob2->materialname |
238 | || ob1->lore != ob2->lore |
222 | || ob1->lore != ob2->lore |
239 | || ob1->subtype != ob2->subtype |
223 | || ob1->subtype != ob2->subtype |
240 | || ob1->move_type != ob2->move_type |
224 | || ob1->move_type != ob2->move_type |
… | |
… | |
248 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
249 | return 0; |
233 | return 0; |
250 | |
234 | |
251 | if ((ob1->flag ^ ob2->flag) |
235 | if ((ob1->flag ^ ob2->flag) |
252 | .reset (FLAG_INV_LOCKED) |
236 | .reset (FLAG_INV_LOCKED) |
253 | .reset (FLAG_CLIENT_SENT) |
|
|
254 | .reset (FLAG_REMOVED) |
237 | .reset (FLAG_REMOVED) |
255 | .any ()) |
238 | .any ()) |
256 | return 0; |
239 | return 0; |
257 | |
240 | |
258 | /* This is really a spellbook check - we should in general |
241 | /* This is really a spellbook check - we should in general |
… | |
… | |
358 | else |
341 | else |
359 | { |
342 | { |
360 | // maybe there is a player standing on the same mapspace |
343 | // maybe there is a player standing on the same mapspace |
361 | // this will catch the case where "this" is a player |
344 | // this will catch the case where "this" is a player |
362 | if (object *pl = ms ().player ()) |
345 | if (object *pl = ms ().player ()) |
|
|
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
363 | if (!pl->container || this == pl->container) |
347 | || this == pl->container) |
364 | return pl; |
348 | return pl; |
365 | } |
349 | } |
366 | } |
350 | } |
367 | |
351 | |
368 | return 0; |
352 | return 0; |
369 | } |
353 | } |
370 | |
354 | |
371 | // adjust weight per container type ("of holding") |
355 | // adjust weight per container type ("of holding") |
372 | static sint32 |
356 | static sint32 |
373 | weight_adjust (object *op, sint32 weight) |
357 | weight_adjust_for (object *op, sint32 weight) |
374 | { |
358 | { |
375 | return op->type == CONTAINER |
359 | return op->type == CONTAINER |
376 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
360 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
377 | : weight; |
361 | : weight; |
378 | } |
362 | } |
… | |
… | |
384 | static void |
368 | static void |
385 | adjust_weight (object *op, sint32 weight) |
369 | adjust_weight (object *op, sint32 weight) |
386 | { |
370 | { |
387 | while (op) |
371 | while (op) |
388 | { |
372 | { |
|
|
373 | // adjust by actual difference to account for rounding errors |
|
|
374 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
389 | weight = weight_adjust (op, weight); |
375 | weight = weight_adjust_for (op, op->carrying) |
|
|
376 | - weight_adjust_for (op, op->carrying - weight); |
390 | |
377 | |
391 | if (!weight) |
378 | if (!weight) |
392 | return; |
379 | return; |
393 | |
380 | |
394 | op->carrying += weight; |
381 | op->carrying += weight; |
… | |
… | |
417 | op->update_weight (); |
404 | op->update_weight (); |
418 | |
405 | |
419 | sum += op->total_weight (); |
406 | sum += op->total_weight (); |
420 | } |
407 | } |
421 | |
408 | |
422 | sum = weight_adjust (this, sum); |
409 | sum = weight_adjust_for (this, sum); |
423 | |
410 | |
424 | if (sum != carrying) |
411 | if (sum != carrying) |
425 | { |
412 | { |
426 | carrying = sum; |
413 | carrying = sum; |
427 | |
414 | |
… | |
… | |
489 | */ |
476 | */ |
490 | object * |
477 | object * |
491 | find_object_name (const char *str) |
478 | find_object_name (const char *str) |
492 | { |
479 | { |
493 | shstr_cmp str_ (str); |
480 | shstr_cmp str_ (str); |
494 | object *op; |
|
|
495 | |
481 | |
|
|
482 | if (str_) |
496 | for_all_objects (op) |
483 | for_all_objects (op) |
497 | if (op->name == str_) |
484 | if (op->name == str_) |
498 | break; |
485 | return op; |
499 | |
486 | |
500 | return op; |
487 | return 0; |
501 | } |
488 | } |
502 | |
489 | |
503 | /* |
490 | /* |
504 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * Sets the owner and sets the skill and exp pointers to owner's current |
505 | * skill and experience objects. |
492 | * skill and experience objects. |
… | |
… | |
603 | } |
590 | } |
604 | |
591 | |
605 | op->key_values = 0; |
592 | op->key_values = 0; |
606 | } |
593 | } |
607 | |
594 | |
608 | object & |
595 | /* |
609 | object::operator =(const object &src) |
596 | * copy_to first frees everything allocated by the dst object, |
|
|
597 | * and then copies the contents of itself into the second |
|
|
598 | * object, allocating what needs to be allocated. Basically, any |
|
|
599 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
600 | * if the first object is freed, the pointers in the new object |
|
|
601 | * will point at garbage. |
|
|
602 | */ |
|
|
603 | void |
|
|
604 | object::copy_to (object *dst) |
610 | { |
605 | { |
611 | remove (); |
606 | dst->remove (); |
612 | |
|
|
613 | *(object_copy *)this = src; |
607 | *(object_copy *)dst = *this; |
614 | |
|
|
615 | flag [FLAG_REMOVED] = true; |
608 | dst->flag [FLAG_REMOVED] = true; |
616 | |
609 | |
617 | /* Copy over key_values, if any. */ |
610 | /* Copy over key_values, if any. */ |
618 | if (src.key_values) |
611 | if (key_values) |
619 | { |
612 | { |
620 | key_value *tail = 0; |
613 | key_value *tail = 0; |
621 | key_values = 0; |
614 | dst->key_values = 0; |
622 | |
615 | |
623 | for (key_value *i = src.key_values; i; i = i->next) |
616 | for (key_value *i = key_values; i; i = i->next) |
624 | { |
617 | { |
625 | key_value *new_link = new key_value; |
618 | key_value *new_link = new key_value; |
626 | |
619 | |
627 | new_link->next = 0; |
620 | new_link->next = 0; |
628 | new_link->key = i->key; |
621 | new_link->key = i->key; |
629 | new_link->value = i->value; |
622 | new_link->value = i->value; |
630 | |
623 | |
631 | /* Try and be clever here, too. */ |
624 | /* Try and be clever here, too. */ |
632 | if (!key_values) |
625 | if (!dst->key_values) |
633 | { |
626 | { |
634 | key_values = new_link; |
627 | dst->key_values = new_link; |
635 | tail = new_link; |
628 | tail = new_link; |
636 | } |
629 | } |
637 | else |
630 | else |
638 | { |
631 | { |
639 | tail->next = new_link; |
632 | tail->next = new_link; |
640 | tail = new_link; |
633 | tail = new_link; |
641 | } |
634 | } |
642 | } |
635 | } |
643 | } |
636 | } |
644 | } |
|
|
645 | |
|
|
646 | /* |
|
|
647 | * copy_to first frees everything allocated by the dst object, |
|
|
648 | * and then copies the contents of itself into the second |
|
|
649 | * object, allocating what needs to be allocated. Basically, any |
|
|
650 | * data that is malloc'd needs to be re-malloc/copied. Otherwise, |
|
|
651 | * if the first object is freed, the pointers in the new object |
|
|
652 | * will point at garbage. |
|
|
653 | */ |
|
|
654 | void |
|
|
655 | object::copy_to (object *dst) |
|
|
656 | { |
|
|
657 | *dst = *this; |
|
|
658 | |
637 | |
659 | if (speed < 0) |
638 | if (speed < 0) |
660 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
661 | |
640 | |
662 | dst->set_speed (dst->speed); |
641 | dst->set_speed (dst->speed); |
… | |
… | |
787 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
788 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
789 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
790 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
791 | /* This isn't perfect, but I don't expect a lot of objects to |
770 | /* This isn't perfect, but I don't expect a lot of objects to |
792 | * to have move_allow right now. |
771 | * have move_allow right now. |
793 | */ |
772 | */ |
794 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
773 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
795 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
774 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
796 | m.flags_ = 0; |
775 | m.flags_ = 0; |
797 | } |
776 | } |
… | |
… | |
923 | * drop on that space. |
902 | * drop on that space. |
924 | */ |
903 | */ |
925 | if (!drop_to_ground |
904 | if (!drop_to_ground |
926 | || !map |
905 | || !map |
927 | || map->in_memory != MAP_ACTIVE |
906 | || map->in_memory != MAP_ACTIVE |
928 | || map->nodrop |
907 | || map->no_drop |
929 | || ms ().move_block == MOVE_ALL) |
908 | || ms ().move_block == MOVE_ALL) |
930 | { |
909 | { |
931 | while (inv) |
910 | while (inv) |
932 | { |
|
|
933 | inv->destroy_inv (false); |
|
|
934 | inv->destroy (); |
911 | inv->destroy (true); |
935 | } |
|
|
936 | } |
912 | } |
937 | else |
913 | else |
938 | { /* Put objects in inventory onto this space */ |
914 | { /* Put objects in inventory onto this space */ |
939 | while (inv) |
915 | while (inv) |
940 | { |
916 | { |
… | |
… | |
962 | |
938 | |
963 | static struct freed_map : maptile |
939 | static struct freed_map : maptile |
964 | { |
940 | { |
965 | freed_map () |
941 | freed_map () |
966 | { |
942 | { |
967 | path = "<freed objects map>"; |
943 | path = "<freed objects map>"; |
968 | name = "/internal/freed_objects_map"; |
944 | name = "/internal/freed_objects_map"; |
969 | width = 3; |
945 | width = 3; |
970 | height = 3; |
946 | height = 3; |
971 | nodrop = 1; |
947 | no_drop = 1; |
|
|
948 | no_reset = 1; |
972 | |
949 | |
973 | alloc (); |
950 | alloc (); |
974 | in_memory = MAP_ACTIVE; |
951 | in_memory = MAP_ACTIVE; |
|
|
952 | } |
|
|
953 | |
|
|
954 | ~freed_map () |
|
|
955 | { |
|
|
956 | destroy (); |
975 | } |
957 | } |
976 | } freed_map; // freed objects are moved here to avoid crashes |
958 | } freed_map; // freed objects are moved here to avoid crashes |
977 | |
959 | |
978 | void |
960 | void |
979 | object::do_destroy () |
961 | object::do_destroy () |
… | |
… | |
1070 | if (object *pl = visible_to ()) |
1052 | if (object *pl = visible_to ()) |
1071 | esrv_del_item (pl->contr, count); |
1053 | esrv_del_item (pl->contr, count); |
1072 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1054 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1073 | |
1055 | |
1074 | adjust_weight (env, -total_weight ()); |
1056 | adjust_weight (env, -total_weight ()); |
1075 | |
|
|
1076 | *(above ? &above->below : &env->inv) = below; |
|
|
1077 | |
|
|
1078 | if (below) |
|
|
1079 | below->above = above; |
|
|
1080 | |
1057 | |
1081 | /* we set up values so that it could be inserted into |
1058 | /* we set up values so that it could be inserted into |
1082 | * the map, but we don't actually do that - it is up |
1059 | * the map, but we don't actually do that - it is up |
1083 | * to the caller to decide what we want to do. |
1060 | * to the caller to decide what we want to do. |
1084 | */ |
1061 | */ |
1085 | map = env->map; |
1062 | map = env->map; |
1086 | x = env->x; |
1063 | x = env->x; |
1087 | y = env->y; |
1064 | y = env->y; |
|
|
1065 | |
|
|
1066 | // make sure cmov optimisation is applicable |
|
|
1067 | *(above ? &above->below : &env->inv) = below; |
|
|
1068 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1069 | |
1088 | above = 0; |
1070 | above = 0; |
1089 | below = 0; |
1071 | below = 0; |
1090 | env = 0; |
1072 | env = 0; |
1091 | |
1073 | |
1092 | /* NO_FIX_PLAYER is set when a great many changes are being |
1074 | /* NO_FIX_PLAYER is set when a great many changes are being |
… | |
… | |
1122 | |
1104 | |
1123 | esrv_del_item (pl->contr, count); |
1105 | esrv_del_item (pl->contr, count); |
1124 | } |
1106 | } |
1125 | |
1107 | |
1126 | /* link the object above us */ |
1108 | /* link the object above us */ |
1127 | if (above) |
1109 | // re-link, make sure compiler can easily use cmove |
1128 | above->below = below; |
1110 | *(above ? &above->below : &ms.top) = below; |
1129 | else |
1111 | *(below ? &below->above : &ms.bot) = above; |
1130 | ms.top = below; /* we were top, set new top */ |
|
|
1131 | |
|
|
1132 | /* Relink the object below us, if there is one */ |
|
|
1133 | if (below) |
|
|
1134 | below->above = above; |
|
|
1135 | else |
|
|
1136 | { |
|
|
1137 | /* Nothing below, which means we need to relink map object for this space |
|
|
1138 | * use translated coordinates in case some oddness with map tiling is |
|
|
1139 | * evident |
|
|
1140 | */ |
|
|
1141 | if (GET_MAP_OB (map, x, y) != this) |
|
|
1142 | LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ()); |
|
|
1143 | |
|
|
1144 | ms.bot = above; /* goes on above it. */ |
|
|
1145 | } |
|
|
1146 | |
1112 | |
1147 | above = 0; |
1113 | above = 0; |
1148 | below = 0; |
1114 | below = 0; |
|
|
1115 | |
|
|
1116 | ms.flags_ = 0; |
1149 | |
1117 | |
1150 | if (map->in_memory == MAP_SAVING) |
1118 | if (map->in_memory == MAP_SAVING) |
1151 | return; |
1119 | return; |
1152 | |
1120 | |
1153 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1121 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
… | |
… | |
1160 | * appropriately. |
1128 | * appropriately. |
1161 | */ |
1129 | */ |
1162 | pl->close_container (); |
1130 | pl->close_container (); |
1163 | |
1131 | |
1164 | //TODO: the floorbox prev/next might need updating |
1132 | //TODO: the floorbox prev/next might need updating |
1165 | esrv_del_item (pl->contr, count); |
1133 | //esrv_del_item (pl->contr, count); |
|
|
1134 | //TODO: update floorbox to preserve ordering |
|
|
1135 | if (pl->contr->ns) |
|
|
1136 | pl->contr->ns->floorbox_update (); |
1166 | } |
1137 | } |
1167 | |
1138 | |
1168 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1139 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1169 | { |
1140 | { |
1170 | /* No point updating the players look faces if he is the object |
1141 | /* No point updating the players look faces if he is the object |
… | |
… | |
1183 | } |
1154 | } |
1184 | |
1155 | |
1185 | last = tmp; |
1156 | last = tmp; |
1186 | } |
1157 | } |
1187 | |
1158 | |
1188 | /* last == NULL if there are no objects on this space */ |
|
|
1189 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1190 | if (!last) |
|
|
1191 | map->at (x, y).flags_ = 0; |
|
|
1192 | else |
|
|
1193 | update_object (last, UP_OBJ_REMOVE); |
|
|
1194 | |
|
|
1195 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1159 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1196 | update_all_los (map, x, y); |
1160 | update_all_los (map, x, y); |
1197 | } |
1161 | } |
1198 | } |
1162 | } |
1199 | |
1163 | |
… | |
… | |
1262 | * job preparing multi-part monsters. |
1226 | * job preparing multi-part monsters. |
1263 | */ |
1227 | */ |
1264 | object * |
1228 | object * |
1265 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1229 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1266 | { |
1230 | { |
|
|
1231 | op->remove (); |
|
|
1232 | |
1267 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1233 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1268 | { |
1234 | { |
1269 | tmp->x = x + tmp->arch->x; |
1235 | tmp->x = x + tmp->arch->x; |
1270 | tmp->y = y + tmp->arch->y; |
1236 | tmp->y = y + tmp->arch->y; |
1271 | } |
1237 | } |
… | |
… | |
1294 | * just 'op' otherwise |
1260 | * just 'op' otherwise |
1295 | */ |
1261 | */ |
1296 | object * |
1262 | object * |
1297 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1263 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1298 | { |
1264 | { |
1299 | assert (!op->flag [FLAG_FREED]); |
1265 | if (op->is_on_map ()) |
|
|
1266 | { |
|
|
1267 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1268 | abort (); |
|
|
1269 | } |
1300 | |
1270 | |
|
|
1271 | if (op->env) |
|
|
1272 | { |
|
|
1273 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1301 | op->remove (); |
1274 | op->remove (); |
|
|
1275 | } |
|
|
1276 | |
|
|
1277 | if (op->face && !face_info (op->face))//D TODO: remove soon |
|
|
1278 | {//D |
|
|
1279 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
|
|
1280 | op->face = 1;//D |
|
|
1281 | }//D |
1302 | |
1282 | |
1303 | /* Ideally, the caller figures this out. However, it complicates a lot |
1283 | /* Ideally, the caller figures this out. However, it complicates a lot |
1304 | * of areas of callers (eg, anything that uses find_free_spot would now |
1284 | * of areas of callers (eg, anything that uses find_free_spot would now |
1305 | * need extra work |
1285 | * need extra work |
1306 | */ |
1286 | */ |
1307 | if (!xy_normalise (m, op->x, op->y)) |
1287 | if (!xy_normalise (m, op->x, op->y)) |
1308 | { |
1288 | { |
1309 | op->destroy (1); |
1289 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1310 | return 0; |
1290 | return 0; |
1311 | } |
1291 | } |
1312 | |
1292 | |
1313 | if (object *more = op->more) |
1293 | if (object *more = op->more) |
1314 | if (!insert_ob_in_map (more, m, originator, flag)) |
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1323 | */ |
1303 | */ |
1324 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1325 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1305 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1326 | if (object::can_merge (op, tmp)) |
1306 | if (object::can_merge (op, tmp)) |
1327 | { |
1307 | { |
1328 | // TODO: we atcually want to update tmp, not op, |
1308 | // TODO: we actually want to update tmp, not op, |
1329 | // but some caller surely breaks when we return tmp |
1309 | // but some caller surely breaks when we return tmp |
1330 | // from here :/ |
1310 | // from here :/ |
1331 | op->nrof += tmp->nrof; |
1311 | op->nrof += tmp->nrof; |
1332 | tmp->destroy (1); |
1312 | tmp->destroy (1); |
1333 | } |
1313 | } |
… | |
… | |
1344 | { |
1324 | { |
1345 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1346 | abort (); |
1326 | abort (); |
1347 | } |
1327 | } |
1348 | |
1328 | |
|
|
1329 | if (!originator->is_on_map ()) |
|
|
1330 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1331 | op->debug_desc (), originator->debug_desc ()); |
|
|
1332 | |
1349 | op->above = originator; |
1333 | op->above = originator; |
1350 | op->below = originator->below; |
1334 | op->below = originator->below; |
1351 | |
|
|
1352 | if (op->below) |
|
|
1353 | op->below->above = op; |
|
|
1354 | else |
|
|
1355 | ms.bot = op; |
|
|
1356 | |
|
|
1357 | /* since *below* originator, no need to update top */ |
|
|
1358 | originator->below = op; |
1335 | originator->below = op; |
|
|
1336 | |
|
|
1337 | *(op->below ? &op->below->above : &ms.bot) = op; |
1359 | } |
1338 | } |
1360 | else |
1339 | else |
1361 | { |
1340 | { |
1362 | object *top, *floor = NULL; |
1341 | object *floor = 0; |
1363 | |
1342 | object *top = ms.top; |
1364 | top = ms.bot; |
|
|
1365 | |
1343 | |
1366 | /* If there are other objects, then */ |
1344 | /* If there are other objects, then */ |
1367 | if (top) |
1345 | if (top) |
1368 | { |
1346 | { |
1369 | object *last = 0; |
|
|
1370 | |
|
|
1371 | /* |
1347 | /* |
1372 | * If there are multiple objects on this space, we do some trickier handling. |
1348 | * If there are multiple objects on this space, we do some trickier handling. |
1373 | * We've already dealt with merging if appropriate. |
1349 | * We've already dealt with merging if appropriate. |
1374 | * Generally, we want to put the new object on top. But if |
1350 | * Generally, we want to put the new object on top. But if |
1375 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1351 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1378 | * once we get to them. This reduces the need to traverse over all of |
1354 | * once we get to them. This reduces the need to traverse over all of |
1379 | * them when adding another one - this saves quite a bit of cpu time |
1355 | * them when adding another one - this saves quite a bit of cpu time |
1380 | * when lots of spells are cast in one area. Currently, it is presumed |
1356 | * when lots of spells are cast in one area. Currently, it is presumed |
1381 | * that flying non pickable objects are spell objects. |
1357 | * that flying non pickable objects are spell objects. |
1382 | */ |
1358 | */ |
1383 | for (top = ms.bot; top; top = top->above) |
1359 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1384 | { |
1360 | { |
1385 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1361 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1386 | floor = top; |
1362 | floor = tmp; |
1387 | |
1363 | |
1388 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1364 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1389 | { |
1365 | { |
1390 | /* We insert above top, so we want this object below this */ |
1366 | /* We insert above top, so we want this object below this */ |
1391 | top = top->below; |
1367 | top = tmp->below; |
1392 | break; |
1368 | break; |
1393 | } |
1369 | } |
1394 | |
1370 | |
1395 | last = top; |
1371 | top = tmp; |
1396 | } |
1372 | } |
1397 | |
|
|
1398 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1399 | top = last; |
|
|
1400 | |
1373 | |
1401 | /* We let update_position deal with figuring out what the space |
1374 | /* We let update_position deal with figuring out what the space |
1402 | * looks like instead of lots of conditions here. |
1375 | * looks like instead of lots of conditions here. |
1403 | * makes things faster, and effectively the same result. |
1376 | * makes things faster, and effectively the same result. |
1404 | */ |
1377 | */ |
… | |
… | |
1411 | */ |
1384 | */ |
1412 | if (!(flag & INS_ON_TOP) |
1385 | if (!(flag & INS_ON_TOP) |
1413 | && ms.flags () & P_BLOCKSVIEW |
1386 | && ms.flags () & P_BLOCKSVIEW |
1414 | && (op->face && !faces [op->face].visibility)) |
1387 | && (op->face && !faces [op->face].visibility)) |
1415 | { |
1388 | { |
|
|
1389 | object *last; |
|
|
1390 | |
1416 | for (last = top; last != floor; last = last->below) |
1391 | for (last = top; last != floor; last = last->below) |
1417 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1392 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1418 | break; |
1393 | break; |
1419 | |
1394 | |
1420 | /* Check to see if we found the object that blocks view, |
1395 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1428 | } /* If objects on this space */ |
1403 | } /* If objects on this space */ |
1429 | |
1404 | |
1430 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1405 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1431 | top = floor; |
1406 | top = floor; |
1432 | |
1407 | |
1433 | /* Top is the object that our object (op) is going to get inserted above. |
1408 | // insert object above top, or bottom-most if top = 0 |
1434 | */ |
|
|
1435 | |
|
|
1436 | /* First object on this space */ |
|
|
1437 | if (!top) |
1409 | if (!top) |
1438 | { |
1410 | { |
|
|
1411 | op->below = 0; |
1439 | op->above = ms.bot; |
1412 | op->above = ms.bot; |
1440 | |
|
|
1441 | if (op->above) |
|
|
1442 | op->above->below = op; |
|
|
1443 | |
|
|
1444 | op->below = 0; |
|
|
1445 | ms.bot = op; |
1413 | ms.bot = op; |
|
|
1414 | |
|
|
1415 | *(op->above ? &op->above->below : &ms.top) = op; |
1446 | } |
1416 | } |
1447 | else |
1417 | else |
1448 | { /* get inserted into the stack above top */ |
1418 | { |
1449 | op->above = top->above; |
1419 | op->above = top->above; |
1450 | |
|
|
1451 | if (op->above) |
|
|
1452 | op->above->below = op; |
1420 | top->above = op; |
1453 | |
1421 | |
1454 | op->below = top; |
1422 | op->below = top; |
1455 | top->above = op; |
1423 | *(op->above ? &op->above->below : &ms.top) = op; |
1456 | } |
1424 | } |
1457 | |
1425 | } |
1458 | if (!op->above) |
|
|
1459 | ms.top = op; |
|
|
1460 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1461 | |
1426 | |
1462 | if (op->type == PLAYER) |
1427 | if (op->type == PLAYER) |
1463 | { |
1428 | { |
1464 | op->contr->do_los = 1; |
1429 | op->contr->do_los = 1; |
1465 | ++op->map->players; |
1430 | ++op->map->players; |
… | |
… | |
1468 | |
1433 | |
1469 | op->map->dirty = true; |
1434 | op->map->dirty = true; |
1470 | |
1435 | |
1471 | if (object *pl = ms.player ()) |
1436 | if (object *pl = ms.player ()) |
1472 | //TODO: the floorbox prev/next might need updating |
1437 | //TODO: the floorbox prev/next might need updating |
1473 | esrv_send_item (pl, op); |
1438 | //esrv_send_item (pl, op); |
|
|
1439 | //TODO: update floorbox to preserve ordering |
|
|
1440 | if (pl->contr->ns) |
|
|
1441 | pl->contr->ns->floorbox_update (); |
1474 | |
1442 | |
1475 | /* If this object glows, it may affect lighting conditions that are |
1443 | /* If this object glows, it may affect lighting conditions that are |
1476 | * visible to others on this map. But update_all_los is really |
1444 | * visible to others on this map. But update_all_los is really |
1477 | * an inefficient way to do this, as it means los for all players |
1445 | * an inefficient way to do this, as it means los for all players |
1478 | * on the map will get recalculated. The players could very well |
1446 | * on the map will get recalculated. The players could very well |
… | |
… | |
1558 | if (!nr) |
1526 | if (!nr) |
1559 | return true; |
1527 | return true; |
1560 | |
1528 | |
1561 | nr = min (nr, nrof); |
1529 | nr = min (nr, nrof); |
1562 | |
1530 | |
|
|
1531 | if (nrof > nr) |
|
|
1532 | { |
1563 | nrof -= nr; |
1533 | nrof -= nr; |
1564 | |
|
|
1565 | if (nrof) |
|
|
1566 | { |
|
|
1567 | adjust_weight (env, -weight * nr); // carrying == 0 |
1534 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1568 | |
1535 | |
1569 | if (object *pl = visible_to ()) |
1536 | if (object *pl = visible_to ()) |
1570 | esrv_update_item (UPD_NROF, pl, this); |
1537 | esrv_update_item (UPD_NROF, pl, this); |
1571 | |
1538 | |
1572 | return true; |
1539 | return true; |
1573 | } |
1540 | } |
1574 | else |
1541 | else |
1575 | { |
1542 | { |
1576 | destroy (1); |
1543 | destroy (); |
1577 | return false; |
1544 | return false; |
1578 | } |
1545 | } |
1579 | } |
1546 | } |
1580 | |
1547 | |
1581 | /* |
1548 | /* |
… | |
… | |
1598 | } |
1565 | } |
1599 | else |
1566 | else |
1600 | { |
1567 | { |
1601 | decrease (nr); |
1568 | decrease (nr); |
1602 | |
1569 | |
1603 | object *op = object_create_clone (this); |
1570 | object *op = deep_clone (); |
1604 | op->nrof = nr; |
1571 | op->nrof = nr; |
1605 | return op; |
1572 | return op; |
1606 | } |
1573 | } |
1607 | } |
1574 | } |
1608 | |
1575 | |
… | |
… | |
1829 | LOG (llevError, "Present_arch called outside map.\n"); |
1796 | LOG (llevError, "Present_arch called outside map.\n"); |
1830 | return NULL; |
1797 | return NULL; |
1831 | } |
1798 | } |
1832 | |
1799 | |
1833 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1800 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1834 | if (tmp->arch == at) |
1801 | if (tmp->arch->archname == at->archname) |
1835 | return tmp; |
1802 | return tmp; |
1836 | |
1803 | |
1837 | return NULL; |
1804 | return NULL; |
1838 | } |
1805 | } |
1839 | |
1806 | |
… | |
… | |
1903 | * The first matching object is returned, or NULL if none. |
1870 | * The first matching object is returned, or NULL if none. |
1904 | */ |
1871 | */ |
1905 | object * |
1872 | object * |
1906 | present_arch_in_ob (const archetype *at, const object *op) |
1873 | present_arch_in_ob (const archetype *at, const object *op) |
1907 | { |
1874 | { |
1908 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1875 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1909 | if (tmp->arch == at) |
1876 | if (tmp->arch->archname == at->archname) |
1910 | return tmp; |
1877 | return tmp; |
1911 | |
1878 | |
1912 | return NULL; |
1879 | return NULL; |
1913 | } |
1880 | } |
1914 | |
1881 | |
… | |
… | |
2323 | |
2290 | |
2324 | /* |
2291 | /* |
2325 | * create clone from object to another |
2292 | * create clone from object to another |
2326 | */ |
2293 | */ |
2327 | object * |
2294 | object * |
2328 | object_create_clone (object *asrc) |
2295 | object::deep_clone () |
2329 | { |
2296 | { |
|
|
2297 | assert (("deep_clone called on non-head object", is_head ())); |
|
|
2298 | |
2330 | object *dst = 0; |
2299 | object *dst = clone (); |
2331 | |
2300 | |
2332 | if (!asrc) |
|
|
2333 | return 0; |
|
|
2334 | |
|
|
2335 | object *src = asrc->head_ (); |
|
|
2336 | |
|
|
2337 | object *prev = 0; |
2301 | object *prev = dst; |
2338 | for (object *part = src; part; part = part->more) |
2302 | for (object *part = this->more; part; part = part->more) |
2339 | { |
2303 | { |
2340 | object *tmp = part->clone (); |
2304 | object *tmp = part->clone (); |
2341 | |
|
|
2342 | tmp->x -= src->x; |
|
|
2343 | tmp->y -= src->y; |
|
|
2344 | |
|
|
2345 | if (!part->head) |
|
|
2346 | { |
|
|
2347 | dst = tmp; |
|
|
2348 | tmp->head = 0; |
|
|
2349 | } |
|
|
2350 | else |
|
|
2351 | tmp->head = dst; |
2305 | tmp->head = dst; |
2352 | |
|
|
2353 | tmp->more = 0; |
|
|
2354 | |
|
|
2355 | if (prev) |
|
|
2356 | prev->more = tmp; |
2306 | prev->more = tmp; |
2357 | |
|
|
2358 | prev = tmp; |
2307 | prev = tmp; |
2359 | } |
2308 | } |
2360 | |
2309 | |
2361 | for (object *item = src->inv; item; item = item->below) |
2310 | for (object *item = inv; item; item = item->below) |
2362 | insert_ob_in_ob (object_create_clone (item), dst); |
2311 | insert_ob_in_ob (item->deep_clone (), dst); |
2363 | |
2312 | |
2364 | return dst; |
2313 | return dst; |
2365 | } |
2314 | } |
2366 | |
2315 | |
2367 | /* This returns the first object in who's inventory that |
2316 | /* This returns the first object in who's inventory that |
… | |
… | |
2376 | return tmp; |
2325 | return tmp; |
2377 | |
2326 | |
2378 | return 0; |
2327 | return 0; |
2379 | } |
2328 | } |
2380 | |
2329 | |
2381 | /* If ob has a field named key, return the link from the list, |
2330 | const shstr & |
2382 | * otherwise return NULL. |
2331 | object::kv_get (const shstr &key) const |
2383 | * |
|
|
2384 | * key must be a passed in shared string - otherwise, this won't |
|
|
2385 | * do the desired thing. |
|
|
2386 | */ |
|
|
2387 | key_value * |
|
|
2388 | get_ob_key_link (const object *ob, const char *key) |
|
|
2389 | { |
2332 | { |
2390 | for (key_value *link = ob->key_values; link; link = link->next) |
2333 | for (key_value *kv = key_values; kv; kv = kv->next) |
2391 | if (link->key == key) |
2334 | if (kv->key == key) |
2392 | return link; |
|
|
2393 | |
|
|
2394 | return 0; |
|
|
2395 | } |
|
|
2396 | |
|
|
2397 | /* |
|
|
2398 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
2399 | * |
|
|
2400 | * The argument doesn't need to be a shared string. |
|
|
2401 | * |
|
|
2402 | * The returned string is shared. |
|
|
2403 | */ |
|
|
2404 | const char * |
|
|
2405 | get_ob_key_value (const object *op, const char *const key) |
|
|
2406 | { |
|
|
2407 | key_value *link; |
|
|
2408 | shstr_cmp canonical_key (key); |
|
|
2409 | |
|
|
2410 | if (!canonical_key) |
|
|
2411 | { |
|
|
2412 | /* 1. There being a field named key on any object |
|
|
2413 | * implies there'd be a shared string to find. |
|
|
2414 | * 2. Since there isn't, no object has this field. |
|
|
2415 | * 3. Therefore, *this* object doesn't have this field. |
|
|
2416 | */ |
|
|
2417 | return 0; |
|
|
2418 | } |
|
|
2419 | |
|
|
2420 | /* This is copied from get_ob_key_link() above - |
|
|
2421 | * only 4 lines, and saves the function call overhead. |
|
|
2422 | */ |
|
|
2423 | for (link = op->key_values; link; link = link->next) |
|
|
2424 | if (link->key == canonical_key) |
|
|
2425 | return link->value; |
2335 | return kv->value; |
2426 | |
2336 | |
2427 | return 0; |
2337 | return shstr_null; |
2428 | } |
2338 | } |
2429 | |
2339 | |
2430 | /* |
2340 | void |
2431 | * Updates the canonical_key in op to value. |
2341 | object::kv_set (const shstr &key, const shstr &value) |
2432 | * |
|
|
2433 | * canonical_key is a shared string (value doesn't have to be). |
|
|
2434 | * |
|
|
2435 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
2436 | * keys. |
|
|
2437 | * |
|
|
2438 | * Returns TRUE on success. |
|
|
2439 | */ |
|
|
2440 | int |
|
|
2441 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
2442 | { |
2342 | { |
2443 | key_value *field = NULL, *last = NULL; |
2343 | for (key_value *kv = key_values; kv; kv = kv->next) |
2444 | |
2344 | if (kv->key == key) |
2445 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
2446 | { |
|
|
2447 | if (field->key != canonical_key) |
|
|
2448 | { |
2345 | { |
2449 | last = field; |
2346 | kv->value = value; |
2450 | continue; |
2347 | return; |
2451 | } |
2348 | } |
2452 | |
2349 | |
2453 | if (value) |
2350 | key_value *kv = new key_value; |
2454 | field->value = value; |
2351 | |
2455 | else |
2352 | kv->next = key_values; |
|
|
2353 | kv->key = key; |
|
|
2354 | kv->value = value; |
|
|
2355 | |
|
|
2356 | key_values = kv; |
|
|
2357 | } |
|
|
2358 | |
|
|
2359 | void |
|
|
2360 | object::kv_del (const shstr &key) |
|
|
2361 | { |
|
|
2362 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2363 | if ((*kvp)->key == key) |
2456 | { |
2364 | { |
2457 | /* Basically, if the archetype has this key set, |
2365 | key_value *kv = *kvp; |
2458 | * we need to store the null value so when we save |
2366 | *kvp = (*kvp)->next; |
2459 | * it, we save the empty value so that when we load, |
2367 | delete kv; |
2460 | * we get this value back again. |
2368 | return; |
2461 | */ |
|
|
2462 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
2463 | field->value = 0; |
|
|
2464 | else |
|
|
2465 | { |
|
|
2466 | if (last) |
|
|
2467 | last->next = field->next; |
|
|
2468 | else |
|
|
2469 | op->key_values = field->next; |
|
|
2470 | |
|
|
2471 | delete field; |
|
|
2472 | } |
|
|
2473 | } |
2369 | } |
2474 | return TRUE; |
|
|
2475 | } |
|
|
2476 | /* IF we get here, key doesn't exist */ |
|
|
2477 | |
|
|
2478 | /* No field, we'll have to add it. */ |
|
|
2479 | |
|
|
2480 | if (!add_key) |
|
|
2481 | return FALSE; |
|
|
2482 | |
|
|
2483 | /* There isn't any good reason to store a null |
|
|
2484 | * value in the key/value list. If the archetype has |
|
|
2485 | * this key, then we should also have it, so shouldn't |
|
|
2486 | * be here. If user wants to store empty strings, |
|
|
2487 | * should pass in "" |
|
|
2488 | */ |
|
|
2489 | if (value == NULL) |
|
|
2490 | return TRUE; |
|
|
2491 | |
|
|
2492 | field = new key_value; |
|
|
2493 | |
|
|
2494 | field->key = canonical_key; |
|
|
2495 | field->value = value; |
|
|
2496 | /* Usual prepend-addition. */ |
|
|
2497 | field->next = op->key_values; |
|
|
2498 | op->key_values = field; |
|
|
2499 | |
|
|
2500 | return TRUE; |
|
|
2501 | } |
|
|
2502 | |
|
|
2503 | /* |
|
|
2504 | * Updates the key in op to value. |
|
|
2505 | * |
|
|
2506 | * If add_key is FALSE, this will only update existing keys, |
|
|
2507 | * and not add new ones. |
|
|
2508 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
2509 | * |
|
|
2510 | * Returns TRUE on success. |
|
|
2511 | */ |
|
|
2512 | int |
|
|
2513 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
2514 | { |
|
|
2515 | shstr key_ (key); |
|
|
2516 | |
|
|
2517 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
2518 | } |
2370 | } |
2519 | |
2371 | |
2520 | object::depth_iterator::depth_iterator (object *container) |
2372 | object::depth_iterator::depth_iterator (object *container) |
2521 | : iterator_base (container) |
2373 | : iterator_base (container) |
2522 | { |
2374 | { |
… | |
… | |
2572 | { |
2424 | { |
2573 | char flagdesc[512]; |
2425 | char flagdesc[512]; |
2574 | char info2[256 * 4]; |
2426 | char info2[256 * 4]; |
2575 | char *p = info; |
2427 | char *p = info; |
2576 | |
2428 | |
2577 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2429 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2578 | count, |
2430 | count, |
2579 | uuid.c_str (), |
2431 | uuid.c_str (), |
2580 | &name, |
2432 | &name, |
2581 | title ? "\",title:\"" : "", |
2433 | title ? ",title:\"" : "", |
2582 | title ? (const char *)title : "", |
2434 | title ? (const char *)title : "", |
|
|
2435 | title ? "\"" : "", |
2583 | flag_desc (flagdesc, 512), type); |
2436 | flag_desc (flagdesc, 512), type); |
2584 | |
2437 | |
2585 | if (!flag[FLAG_REMOVED] && env) |
2438 | if (!flag[FLAG_REMOVED] && env) |
2586 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2439 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2587 | |
2440 | |