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.217 by root, Wed Apr 23 07:13:23 2008 UTC vs.
Revision 1.235 by root, Tue May 6 20:00:12 2008 UTC

… …
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. */
141static bool 141static bool
142compare_ob_value_lists_one (const object *wants, const object *has) 142compare_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. */
174static bool 159static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_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 *
… …
334 320
335// find player who can see this object 321// find player who can see this object
336object * 322object *
337object::visible_to () const 323object::visible_to () const
338{ 324{
339 if (!flag [FLAG_REMOVED]) 325 if (client_visible () && !flag [FLAG_REMOVED])
340 { 326 {
341 // see if we are in a container of sorts 327 // see if we are in a container of sorts
342 if (env) 328 if (env)
343 { 329 {
344 // the player inventory itself is always visible 330 // the player inventory itself is always visible
… …
358 else 344 else
359 { 345 {
360 // maybe there is a player standing on the same mapspace 346 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player 347 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ()) 348 if (object *pl = ms ().player ())
349 if (!pl->container || this == pl->container)
363 return pl; 350 return pl;
364 } 351 }
365 } 352 }
366 353
367 return 0; 354 return 0;
368} 355}
369 356
370// adjust weight per container type ("of holding") 357// adjust weight per container type ("of holding")
371static sint32 358static sint32
372weight_adjust (object *op, sint32 weight) 359weight_adjust_for (object *op, sint32 weight)
373{ 360{
374 return op->type == CONTAINER 361 return op->type == CONTAINER
375 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376 : weight; 363 : weight;
377} 364}
… …
383static void 370static void
384adjust_weight (object *op, sint32 weight) 371adjust_weight (object *op, sint32 weight)
385{ 372{
386 while (op) 373 while (op)
387 { 374 {
375 // adjust by actual difference to account for rounding errors
376 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388 weight = weight_adjust (op, weight); 377 weight = weight_adjust_for (op, op->carrying)
378 - weight_adjust_for (op, op->carrying - weight);
389 379
390 if (!weight) 380 if (!weight)
391 return; 381 return;
392 382
393 op->carrying += weight; 383 op->carrying += weight;
… …
416 op->update_weight (); 406 op->update_weight ();
417 407
418 sum += op->total_weight (); 408 sum += op->total_weight ();
419 } 409 }
420 410
421 sum = weight_adjust (this, sum); 411 sum = weight_adjust_for (this, sum);
422 412
423 if (sum != carrying) 413 if (sum != carrying)
424 { 414 {
425 carrying = sum; 415 carrying = sum;
426 416
… …
602 } 592 }
603 593
604 op->key_values = 0; 594 op->key_values = 0;
605} 595}
606 596
607object & 597/*
608object::operator =(const object &src) 598 * copy_to first frees everything allocated by the dst object,
599 * and then copies the contents of itself into the second
600 * object, allocating what needs to be allocated. Basically, any
601 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
602 * if the first object is freed, the pointers in the new object
603 * will point at garbage.
604 */
605void
606object::copy_to (object *dst)
609{ 607{
610 bool is_freed = flag [FLAG_FREED]; 608 dst->remove ();
611 bool is_removed = flag [FLAG_REMOVED];
612
613 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
614
615 flag [FLAG_FREED] = is_freed;
616 flag [FLAG_REMOVED] = is_removed; 610 dst->flag [FLAG_REMOVED] = true;
617 611
618 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
619 if (src.key_values) 613 if (key_values)
620 { 614 {
621 key_value *tail = 0; 615 key_value *tail = 0;
622 key_values = 0; 616 dst->key_values = 0;
623 617
624 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
625 { 619 {
626 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
627 621
628 new_link->next = 0; 622 new_link->next = 0;
629 new_link->key = i->key; 623 new_link->key = i->key;
630 new_link->value = i->value; 624 new_link->value = i->value;
631 625
632 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
633 if (!key_values) 627 if (!dst->key_values)
634 { 628 {
635 key_values = new_link; 629 dst->key_values = new_link;
636 tail = new_link; 630 tail = new_link;
637 } 631 }
638 else 632 else
639 { 633 {
640 tail->next = new_link; 634 tail->next = new_link;
641 tail = new_link; 635 tail = new_link;
642 } 636 }
643 } 637 }
644 } 638 }
645}
646
647/*
648 * copy_to first frees everything allocated by the dst object,
649 * and then copies the contents of itself into the second
650 * object, allocating what needs to be allocated. Basically, any
651 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
652 * if the first object is freed, the pointers in the new object
653 * will point at garbage.
654 */
655void
656object::copy_to (object *dst)
657{
658 *dst = *this;
659 639
660 if (speed < 0) 640 if (speed < 0)
661 dst->speed_left -= rndm (); 641 dst->speed_left -= rndm ();
662 642
663 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
… …
685object * 665object *
686object::clone () 666object::clone ()
687{ 667{
688 object *neu = create (); 668 object *neu = create ();
689 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
690 return neu; 671 return neu;
691} 672}
692 673
693/* 674/*
694 * If an object with the IS_TURNABLE() flag needs to be turned due 675 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
745 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
746 */ 727 */
747void 728void
748update_object (object *op, int action) 729update_object (object *op, int action)
749{ 730{
750 if (op == NULL) 731 if (!op)
751 { 732 {
752 /* this should never happen */ 733 /* this should never happen */
753 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
754 return; 735 return;
755 } 736 }
756 737
757 if (op->env) 738 if (!op->is_on_map ())
758 { 739 {
759 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
760 * to do in this case. 741 * to do in this case.
761 */ 742 */
762 return; 743 return;
763 } 744 }
764
765 /* If the map is saving, don't do anything as everything is
766 * going to get freed anyways.
767 */
768 if (!op->map || op->map->in_memory == MAP_SAVING)
769 return;
770 745
771 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
772 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
773 { 748 {
774 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
… …
964 object *op = new object; 939 object *op = new object;
965 op->link (); 940 op->link ();
966 return op; 941 return op;
967} 942}
968 943
944static struct freed_map : maptile
945{
946 freed_map ()
947 {
948 path = "<freed objects map>";
949 name = "/internal/freed_objects_map";
950 width = 3;
951 height = 3;
952 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
969void 964void
970object::do_destroy () 965object::do_destroy ()
971{ 966{
972 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
973 remove_button_link (this); 968 remove_button_link (this);
… …
983 unlink (); 978 unlink ();
984 979
985 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
986 981
987 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
988 {
989 static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991 if (!freed_map)
992 {
993 freed_map = new maptile;
994
995 freed_map->path = "<freed objects map>";
996 freed_map->name = "/internal/freed_objects_map";
997 freed_map->width = 3;
998 freed_map->height = 3;
999 freed_map->nodrop = 1;
1000
1001 freed_map->alloc ();
1002 freed_map->in_memory = MAP_ACTIVE;
1003 }
1004
1005 map = freed_map; 983 map = &freed_map;
1006 x = 1; 984 x = 1;
1007 y = 1; 985 y = 1;
1008 }
1009 986
1010 if (more) 987 if (more)
1011 { 988 {
1012 more->destroy (); 989 more->destroy ();
1013 more = 0; 990 more = 0;
… …
1025void 1002void
1026object::destroy (bool destroy_inventory) 1003object::destroy (bool destroy_inventory)
1027{ 1004{
1028 if (destroyed ()) 1005 if (destroyed ())
1029 return; 1006 return;
1007
1008 if (!is_head () && !head->destroyed ())
1009 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory);
1012 return;
1013 }
1030 1014
1031 destroy_inv (!destroy_inventory); 1015 destroy_inv (!destroy_inventory);
1032 1016
1033 if (is_head ()) 1017 if (is_head ())
1034 if (sound_destroy) 1018 if (sound_destroy)
… …
1055 if (flag [FLAG_REMOVED]) 1039 if (flag [FLAG_REMOVED])
1056 return; 1040 return;
1057 1041
1058 INVOKE_OBJECT (REMOVE, this); 1042 INVOKE_OBJECT (REMOVE, this);
1059 1043
1060 if (object *pl = visible_to ())
1061 esrv_del_item (pl->contr, count);
1062
1063 flag [FLAG_REMOVED] = true; 1044 flag [FLAG_REMOVED] = true;
1064 1045
1065 if (more) 1046 if (more)
1066 more->remove (); 1047 more->remove ();
1067 1048
… …
1069 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1070 * inventory. 1051 * inventory.
1071 */ 1052 */
1072 if (env) 1053 if (env)
1073 { 1054 {
1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059
1074 adjust_weight (env, -total_weight ()); 1060 adjust_weight (env, -total_weight ());
1075 1061
1076 *(above ? &above->below : &env->inv) = below; 1062 *(above ? &above->below : &env->inv) = below;
1077 1063
1078 if (below) 1064 if (below)
… …
1096 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1097 otmp->update_stats (); 1083 otmp->update_stats ();
1098 } 1084 }
1099 else if (map) 1085 else if (map)
1100 { 1086 {
1101 if (type == PLAYER)
1102 {
1103 // leaving a spot always closes any open container on the ground
1104 if (container && !container->env)
1105 // this causes spurious floorbox updates, but it ensures
1106 // that the CLOSE event is being sent.
1107 close_container ();
1108
1109 --map->players;
1110 map->touch ();
1111 }
1112
1113 map->dirty = true; 1087 map->dirty = true;
1114 mapspace &ms = this->ms (); 1088 mapspace &ms = this->ms ();
1089
1090 if (object *pl = ms.player ())
1091 {
1092 if (type == PLAYER) // this == pl(!)
1093 {
1094 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent.
1098 close_container ();
1099
1100 --map->players;
1101 map->touch ();
1102 }
1103 else if (pl->container == this)
1104 {
1105 // removing a container should close it
1106 close_container ();
1107 }
1108
1109 esrv_del_item (pl->contr, count);
1110 }
1115 1111
1116 /* link the object above us */ 1112 /* link the object above us */
1117 if (above) 1113 if (above)
1118 above->below = below; 1114 above->below = below;
1119 else 1115 else
… …
1121 1117
1122 /* Relink the object below us, if there is one */ 1118 /* Relink the object below us, if there is one */
1123 if (below) 1119 if (below)
1124 below->above = above; 1120 below->above = above;
1125 else 1121 else
1126 { 1122 ms.bot = above;
1127 /* Nothing below, which means we need to relink map object for this space
1128 * use translated coordinates in case some oddness with map tiling is
1129 * evident
1130 */
1131 if (GET_MAP_OB (map, x, y) != this)
1132 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 ());
1133
1134 ms.bot = above; /* goes on above it. */
1135 }
1136 1123
1137 above = 0; 1124 above = 0;
1138 below = 0; 1125 below = 0;
1139 1126
1140 if (map->in_memory == MAP_SAVING) 1127 if (map->in_memory == MAP_SAVING)
… …
1149 * removed (most likely destroyed), update the player view 1136 * removed (most likely destroyed), update the player view
1150 * appropriately. 1137 * appropriately.
1151 */ 1138 */
1152 pl->close_container (); 1139 pl->close_container ();
1153 1140
1141 //TODO: the floorbox prev/next might need updating
1154 esrv_del_item (pl, count); 1142 //esrv_del_item (pl->contr, count);
1143 //TODO: update floorbox to preserve ordering
1144 if (pl->contr->ns)
1145 pl->contr->ns->floorbox_update ();
1155 } 1146 }
1156 1147
1157 for (tmp = ms.bot; tmp; tmp = tmp->above) 1148 for (tmp = ms.bot; tmp; tmp = tmp->above)
1158 { 1149 {
1159 /* No point updating the players look faces if he is the object 1150 /* No point updating the players look faces if he is the object
… …
1285object * 1276object *
1286insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1277insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1287{ 1278{
1288 assert (!op->flag [FLAG_FREED]); 1279 assert (!op->flag [FLAG_FREED]);
1289 1280
1290 object *top, *floor = NULL;
1291
1292 op->remove (); 1281 op->remove ();
1293 1282
1294 /* Ideally, the caller figures this out. However, it complicates a lot 1283 /* Ideally, the caller figures this out. However, it complicates a lot
1295 * 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
1296 * need extra work 1285 * need extra work
1297 */ 1286 */
1298 if (!xy_normalise (m, op->x, op->y)) 1287 if (!xy_normalise (m, op->x, op->y))
1299 { 1288 {
1300 op->destroy (1); 1289 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1301 return 0; 1290 return 0;
1302 } 1291 }
1303 1292
1304 if (object *more = op->more) 1293 if (object *more = op->more)
1305 if (!insert_ob_in_map (more, m, originator, flag)) 1294 if (!insert_ob_in_map (more, m, originator, flag))
… …
1314 */ 1303 */
1315 if (op->nrof && !(flag & INS_NO_MERGE)) 1304 if (op->nrof && !(flag & INS_NO_MERGE))
1316 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1305 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1317 if (object::can_merge (op, tmp)) 1306 if (object::can_merge (op, tmp))
1318 { 1307 {
1308 // TODO: we atcually want to update tmp, not op,
1309 // but some caller surely breaks when we return tmp
1310 // from here :/
1319 op->nrof += tmp->nrof; 1311 op->nrof += tmp->nrof;
1320 tmp->destroy (1); 1312 tmp->destroy (1);
1321 } 1313 }
1322 1314
1323 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1315 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
… …
1345 /* since *below* originator, no need to update top */ 1337 /* since *below* originator, no need to update top */
1346 originator->below = op; 1338 originator->below = op;
1347 } 1339 }
1348 else 1340 else
1349 { 1341 {
1342 object *top, *floor = NULL;
1343
1350 top = ms.bot; 1344 top = ms.bot;
1351 1345
1352 /* If there are other objects, then */ 1346 /* If there are other objects, then */
1353 if (top) 1347 if (top)
1354 { 1348 {
… …
1453 } 1447 }
1454 1448
1455 op->map->dirty = true; 1449 op->map->dirty = true;
1456 1450
1457 if (object *pl = ms.player ()) 1451 if (object *pl = ms.player ())
1452 //TODO: the floorbox prev/next might need updating
1458 esrv_send_item (pl, op); 1453 //esrv_send_item (pl, op);
1454 //TODO: update floorbox to preserve ordering
1455 if (pl->contr->ns)
1456 pl->contr->ns->floorbox_update ();
1459 1457
1460 /* If this object glows, it may affect lighting conditions that are 1458 /* If this object glows, it may affect lighting conditions that are
1461 * visible to others on this map. But update_all_los is really 1459 * visible to others on this map. But update_all_los is really
1462 * an inefficient way to do this, as it means los for all players 1460 * an inefficient way to do this, as it means los for all players
1463 * on the map will get recalculated. The players could very well 1461 * on the map will get recalculated. The players could very well
… …
1583 } 1581 }
1584 else 1582 else
1585 { 1583 {
1586 decrease (nr); 1584 decrease (nr);
1587 1585
1588 object *op = object_create_clone (this); 1586 object *op = deep_clone ();
1589 op->nrof = nr; 1587 op->nrof = nr;
1590 return op; 1588 return op;
1591 } 1589 }
1592} 1590}
1593 1591
… …
1814 LOG (llevError, "Present_arch called outside map.\n"); 1812 LOG (llevError, "Present_arch called outside map.\n");
1815 return NULL; 1813 return NULL;
1816 } 1814 }
1817 1815
1818 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1816 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1819 if (tmp->arch == at) 1817 if (tmp->arch->archname == at->archname)
1820 return tmp; 1818 return tmp;
1821 1819
1822 return NULL; 1820 return NULL;
1823} 1821}
1824 1822
… …
1888 * The first matching object is returned, or NULL if none. 1886 * The first matching object is returned, or NULL if none.
1889 */ 1887 */
1890object * 1888object *
1891present_arch_in_ob (const archetype *at, const object *op) 1889present_arch_in_ob (const archetype *at, const object *op)
1892{ 1890{
1893 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1891 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1894 if (tmp->arch == at) 1892 if (tmp->arch->archname == at->archname)
1895 return tmp; 1893 return tmp;
1896 1894
1897 return NULL; 1895 return NULL;
1898} 1896}
1899 1897
… …
2308 2306
2309/* 2307/*
2310 * create clone from object to another 2308 * create clone from object to another
2311 */ 2309 */
2312object * 2310object *
2313object_create_clone (object *asrc) 2311object::deep_clone ()
2314{ 2312{
2315 object *dst = 0, *tmp, *src, *prev, *item; 2313 assert (("deep_clone called on non-head object", is_head ()));
2316 2314
2317 if (!asrc) 2315 object *dst = clone ();
2318 return 0;
2319 2316
2320 src = asrc->head_ (); 2317 object *prev = dst;
2321
2322 prev = 0;
2323 for (object *part = src; part; part = part->more) 2318 for (object *part = this->more; part; part = part->more)
2324 { 2319 {
2325 tmp = part->clone (); 2320 object *tmp = part->clone ();
2326 tmp->x -= src->x;
2327 tmp->y -= src->y;
2328
2329 if (!part->head)
2330 {
2331 dst = tmp;
2332 tmp->head = 0;
2333 }
2334 else
2335 tmp->head = dst; 2321 tmp->head = dst;
2336
2337 tmp->more = 0;
2338
2339 if (prev)
2340 prev->more = tmp; 2322 prev->more = tmp;
2341
2342 prev = tmp; 2323 prev = tmp;
2343 } 2324 }
2344 2325
2345 for (item = src->inv; item; item = item->below) 2326 for (object *item = inv; item; item = item->below)
2346 insert_ob_in_ob (object_create_clone (item), dst); 2327 insert_ob_in_ob (item->deep_clone (), dst);
2347 2328
2348 return dst; 2329 return dst;
2349} 2330}
2350 2331
2351/* This returns the first object in who's inventory that 2332/* This returns the first object in who's inventory that
… …
2360 return tmp; 2341 return tmp;
2361 2342
2362 return 0; 2343 return 0;
2363} 2344}
2364 2345
2365/* If ob has a field named key, return the link from the list, 2346const shstr &
2366 * otherwise return NULL. 2347object::kv_get (const shstr &key) const
2367 *
2368 * key must be a passed in shared string - otherwise, this won't
2369 * do the desired thing.
2370 */
2371key_value *
2372get_ob_key_link (const object *ob, const char *key)
2373{ 2348{
2374 for (key_value *link = ob->key_values; link; link = link->next) 2349 for (key_value *kv = key_values; kv; kv = kv->next)
2375 if (link->key == key) 2350 if (kv->key == key)
2376 return link;
2377
2378 return 0;
2379}
2380
2381/*
2382 * Returns the value of op has an extra_field for key, or NULL.
2383 *
2384 * The argument doesn't need to be a shared string.
2385 *
2386 * The returned string is shared.
2387 */
2388const char *
2389get_ob_key_value (const object *op, const char *const key)
2390{
2391 key_value *link;
2392 shstr_cmp canonical_key (key);
2393
2394 if (!canonical_key)
2395 {
2396 /* 1. There being a field named key on any object
2397 * implies there'd be a shared string to find.
2398 * 2. Since there isn't, no object has this field.
2399 * 3. Therefore, *this* object doesn't have this field.
2400 */
2401 return 0;
2402 }
2403
2404 /* This is copied from get_ob_key_link() above -
2405 * only 4 lines, and saves the function call overhead.
2406 */
2407 for (link = op->key_values; link; link = link->next)
2408 if (link->key == canonical_key)
2409 return link->value; 2351 return kv->value;
2410 2352
2411 return 0; 2353 return shstr_null;
2412} 2354}
2413 2355
2414/* 2356void
2415 * Updates the canonical_key in op to value. 2357object::kv_set (const shstr &key, const shstr &value)
2416 *
2417 * canonical_key is a shared string (value doesn't have to be).
2418 *
2419 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2420 * keys.
2421 *
2422 * Returns TRUE on success.
2423 */
2424int
2425set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2426{ 2358{
2427 key_value *field = NULL, *last = NULL; 2359 for (key_value *kv = key_values; kv; kv = kv->next)
2428 2360 if (kv->key == key)
2429 for (field = op->key_values; field != NULL; field = field->next)
2430 {
2431 if (field->key != canonical_key)
2432 { 2361 {
2433 last = field; 2362 kv->value = value;
2434 continue; 2363 return;
2435 } 2364 }
2436 2365
2437 if (value) 2366 key_value *kv = new key_value;
2438 field->value = value; 2367
2439 else 2368 kv->next = key_values;
2369 kv->key = key;
2370 kv->value = value;
2371
2372 key_values = kv;
2373}
2374
2375void
2376object::kv_del (const shstr &key)
2377{
2378 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2379 if ((*kvp)->key == key)
2440 { 2380 {
2441 /* Basically, if the archetype has this key set, 2381 key_value *kv = *kvp;
2442 * we need to store the null value so when we save 2382 *kvp = (*kvp)->next;
2443 * it, we save the empty value so that when we load, 2383 delete kv;
2444 * we get this value back again. 2384 return;
2445 */
2446 if (get_ob_key_link (op->arch, canonical_key))
2447 field->value = 0;
2448 else
2449 {
2450 if (last)
2451 last->next = field->next;
2452 else
2453 op->key_values = field->next;
2454
2455 delete field;
2456 }
2457 } 2385 }
2458 return TRUE;
2459 }
2460 /* IF we get here, key doesn't exist */
2461
2462 /* No field, we'll have to add it. */
2463
2464 if (!add_key)
2465 return FALSE;
2466
2467 /* There isn't any good reason to store a null
2468 * value in the key/value list. If the archetype has
2469 * this key, then we should also have it, so shouldn't
2470 * be here. If user wants to store empty strings,
2471 * should pass in ""
2472 */
2473 if (value == NULL)
2474 return TRUE;
2475
2476 field = new key_value;
2477
2478 field->key = canonical_key;
2479 field->value = value;
2480 /* Usual prepend-addition. */
2481 field->next = op->key_values;
2482 op->key_values = field;
2483
2484 return TRUE;
2485}
2486
2487/*
2488 * Updates the key in op to value.
2489 *
2490 * If add_key is FALSE, this will only update existing keys,
2491 * and not add new ones.
2492 * In general, should be little reason FALSE is ever passed in for add_key
2493 *
2494 * Returns TRUE on success.
2495 */
2496int
2497set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2498{
2499 shstr key_ (key);
2500
2501 return set_ob_key_value_s (op, key_, value, add_key);
2502} 2386}
2503 2387
2504object::depth_iterator::depth_iterator (object *container) 2388object::depth_iterator::depth_iterator (object *container)
2505: iterator_base (container) 2389: iterator_base (container)
2506{ 2390{
… …
2604object::open_container (object *new_container) 2488object::open_container (object *new_container)
2605{ 2489{
2606 if (container == new_container) 2490 if (container == new_container)
2607 return; 2491 return;
2608 2492
2609 if (object *old_container = container) 2493 object *old_container = container;
2494
2495 if (old_container)
2610 { 2496 {
2611 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2497 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2612 return; 2498 return;
2613 2499
2614#if 0 2500#if 0
… …
2616 if (object *closer = old_container->inv) 2502 if (object *closer = old_container->inv)
2617 if (closer->type == CLOSE_CON) 2503 if (closer->type == CLOSE_CON)
2618 closer->destroy (); 2504 closer->destroy ();
2619#endif 2505#endif
2620 2506
2507 // make sure the container is available
2508 esrv_send_item (this, old_container);
2509
2621 old_container->flag [FLAG_APPLIED] = false; 2510 old_container->flag [FLAG_APPLIED] = false;
2622 container = 0; 2511 container = 0;
2623 2512
2513 // client needs item update to make it work, client bug requires this to be separate
2624 esrv_update_item (UPD_FLAGS, this, old_container); 2514 esrv_update_item (UPD_FLAGS, this, old_container);
2515
2625 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2516 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2626 play_sound (sound_find ("chest_close")); 2517 play_sound (sound_find ("chest_close"));
2627 } 2518 }
2628 2519
2629 if (new_container) 2520 if (new_container)
… …
2642 } 2533 }
2643#endif 2534#endif
2644 2535
2645 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2536 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2646 2537
2538 // make sure the container is available, client bug requires this to be separate
2539 esrv_send_item (this, new_container);
2540
2647 new_container->flag [FLAG_APPLIED] = true; 2541 new_container->flag [FLAG_APPLIED] = true;
2648 container = new_container; 2542 container = new_container;
2649 2543
2544 // client needs flag change
2650 esrv_update_item (UPD_FLAGS, this, new_container); 2545 esrv_update_item (UPD_FLAGS, this, new_container);
2651 esrv_send_inventory (this, new_container); 2546 esrv_send_inventory (this, new_container);
2652 play_sound (sound_find ("chest_open")); 2547 play_sound (sound_find ("chest_open"));
2653 } 2548 }
2549// else if (!old_container->env && contr && contr->ns)
2550// contr->ns->floorbox_reset ();
2654} 2551}
2655 2552
2656object * 2553object *
2657object::force_find (const shstr name) 2554object::force_find (const shstr name)
2658{ 2555{

Diff Legend

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