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.220 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.229 by root, Sat May 3 12:29:09 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 *
… …
603 } 589 }
604 590
605 op->key_values = 0; 591 op->key_values = 0;
606} 592}
607 593
608object & 594/*
609object::operator =(const object &src) 595 * copy_to first frees everything allocated by the dst object,
596 * and then copies the contents of itself into the second
597 * object, allocating what needs to be allocated. Basically, any
598 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
599 * if the first object is freed, the pointers in the new object
600 * will point at garbage.
601 */
602void
603object::copy_to (object *dst)
610{ 604{
611 bool is_freed = flag [FLAG_FREED]; 605 dst->remove ();
612 bool is_removed = flag [FLAG_REMOVED];
613
614 *(object_copy *)this = src; 606 *(object_copy *)dst = *this;
615
616 flag [FLAG_FREED] = is_freed;
617 flag [FLAG_REMOVED] = is_removed; 607 dst->flag [FLAG_REMOVED] = true;
618 608
619 /* Copy over key_values, if any. */ 609 /* Copy over key_values, if any. */
620 if (src.key_values) 610 if (key_values)
621 { 611 {
622 key_value *tail = 0; 612 key_value *tail = 0;
623 key_values = 0; 613 dst->key_values = 0;
624 614
625 for (key_value *i = src.key_values; i; i = i->next) 615 for (key_value *i = key_values; i; i = i->next)
626 { 616 {
627 key_value *new_link = new key_value; 617 key_value *new_link = new key_value;
628 618
629 new_link->next = 0; 619 new_link->next = 0;
630 new_link->key = i->key; 620 new_link->key = i->key;
631 new_link->value = i->value; 621 new_link->value = i->value;
632 622
633 /* Try and be clever here, too. */ 623 /* Try and be clever here, too. */
634 if (!key_values) 624 if (!dst->key_values)
635 { 625 {
636 key_values = new_link; 626 dst->key_values = new_link;
637 tail = new_link; 627 tail = new_link;
638 } 628 }
639 else 629 else
640 { 630 {
641 tail->next = new_link; 631 tail->next = new_link;
642 tail = new_link; 632 tail = new_link;
643 } 633 }
644 } 634 }
645 } 635 }
646}
647
648/*
649 * copy_to first frees everything allocated by the dst object,
650 * and then copies the contents of itself into the second
651 * object, allocating what needs to be allocated. Basically, any
652 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
653 * if the first object is freed, the pointers in the new object
654 * will point at garbage.
655 */
656void
657object::copy_to (object *dst)
658{
659 *dst = *this;
660 636
661 if (speed < 0) 637 if (speed < 0)
662 dst->speed_left -= rndm (); 638 dst->speed_left -= rndm ();
663 639
664 dst->set_speed (dst->speed); 640 dst->set_speed (dst->speed);
… …
686object * 662object *
687object::clone () 663object::clone ()
688{ 664{
689 object *neu = create (); 665 object *neu = create ();
690 copy_to (neu); 666 copy_to (neu);
667 neu->map = map; // not copied by copy_to
691 return neu; 668 return neu;
692} 669}
693 670
694/* 671/*
695 * If an object with the IS_TURNABLE() flag needs to be turned due 672 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
746 * UP_OBJ_FACE: only the objects face has changed. 723 * UP_OBJ_FACE: only the objects face has changed.
747 */ 724 */
748void 725void
749update_object (object *op, int action) 726update_object (object *op, int action)
750{ 727{
751 if (op == NULL) 728 if (!op)
752 { 729 {
753 /* this should never happen */ 730 /* this should never happen */
754 LOG (llevDebug, "update_object() called for NULL object.\n"); 731 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
755 return; 732 return;
756 } 733 }
757 734
758 if (op->env) 735 if (!op->is_on_map ())
759 { 736 {
760 /* Animation is currently handled by client, so nothing 737 /* Animation is currently handled by client, so nothing
761 * to do in this case. 738 * to do in this case.
762 */ 739 */
763 return; 740 return;
764 } 741 }
765
766 /* If the map is saving, don't do anything as everything is
767 * going to get freed anyways.
768 */
769 if (!op->map || op->map->in_memory == MAP_SAVING)
770 return;
771 742
772 /* make sure the object is within map boundaries */ 743 /* make sure the object is within map boundaries */
773 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 744 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
774 { 745 {
775 LOG (llevError, "update_object() called for object out of map!\n"); 746 LOG (llevError, "update_object() called for object out of map!\n");
… …
965 object *op = new object; 936 object *op = new object;
966 op->link (); 937 op->link ();
967 return op; 938 return op;
968} 939}
969 940
941static struct freed_map : maptile
942{
943 freed_map ()
944 {
945 path = "<freed objects map>";
946 name = "/internal/freed_objects_map";
947 width = 3;
948 height = 3;
949 nodrop = 1;
950
951 alloc ();
952 in_memory = MAP_ACTIVE;
953 }
954
955 ~freed_map ()
956 {
957 destroy ();
958 }
959} freed_map; // freed objects are moved here to avoid crashes
960
970void 961void
971object::do_destroy () 962object::do_destroy ()
972{ 963{
973 if (flag [FLAG_IS_LINKED]) 964 if (flag [FLAG_IS_LINKED])
974 remove_button_link (this); 965 remove_button_link (this);
… …
984 unlink (); 975 unlink ();
985 976
986 flag [FLAG_FREED] = 1; 977 flag [FLAG_FREED] = 1;
987 978
988 // hack to ensure that freed objects still have a valid map 979 // hack to ensure that freed objects still have a valid map
989 {
990 static maptile *freed_map; // freed objects are moved here to avoid crashes
991
992 if (!freed_map)
993 {
994 freed_map = new maptile;
995
996 freed_map->path = "<freed objects map>";
997 freed_map->name = "/internal/freed_objects_map";
998 freed_map->width = 3;
999 freed_map->height = 3;
1000 freed_map->nodrop = 1;
1001
1002 freed_map->alloc ();
1003 freed_map->in_memory = MAP_ACTIVE;
1004 }
1005
1006 map = freed_map; 980 map = &freed_map;
1007 x = 1; 981 x = 1;
1008 y = 1; 982 y = 1;
1009 }
1010 983
1011 if (more) 984 if (more)
1012 { 985 {
1013 more->destroy (); 986 more->destroy ();
1014 more = 0; 987 more = 0;
… …
1031 1004
1032 if (!is_head () && !head->destroyed ()) 1005 if (!is_head () && !head->destroyed ())
1033 { 1006 {
1034 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1007 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1035 head->destroy (destroy_inventory); 1008 head->destroy (destroy_inventory);
1009 return;
1036 } 1010 }
1037 1011
1038 destroy_inv (!destroy_inventory); 1012 destroy_inv (!destroy_inventory);
1039 1013
1040 if (is_head ()) 1014 if (is_head ())
… …
1073 * In this case, the object to be removed is in someones 1047 * In this case, the object to be removed is in someones
1074 * inventory. 1048 * inventory.
1075 */ 1049 */
1076 if (env) 1050 if (env)
1077 { 1051 {
1052 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1078 if (object *pl = visible_to ()) 1053 if (object *pl = visible_to ())
1079 esrv_del_item (pl->contr, count); 1054 esrv_del_item (pl->contr, count);
1055 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1080 1056
1081 adjust_weight (env, -total_weight ()); 1057 adjust_weight (env, -total_weight ());
1082 1058
1083 *(above ? &above->below : &env->inv) = below; 1059 *(above ? &above->below : &env->inv) = below;
1084 1060
… …
1167 * appropriately. 1143 * appropriately.
1168 */ 1144 */
1169 pl->close_container (); 1145 pl->close_container ();
1170 1146
1171 //TODO: the floorbox prev/next might need updating 1147 //TODO: the floorbox prev/next might need updating
1172 esrv_del_item (pl->contr, count); 1148 //esrv_del_item (pl->contr, count);
1149 //TODO: update floorbox to preserve ordering
1150 if (pl->contr->ns)
1151 pl->contr->ns->floorbox_update ();
1173 } 1152 }
1174 1153
1175 for (tmp = ms.bot; tmp; tmp = tmp->above) 1154 for (tmp = ms.bot; tmp; tmp = tmp->above)
1176 { 1155 {
1177 /* No point updating the players look faces if he is the object 1156 /* No point updating the players look faces if he is the object
… …
1475 1454
1476 op->map->dirty = true; 1455 op->map->dirty = true;
1477 1456
1478 if (object *pl = ms.player ()) 1457 if (object *pl = ms.player ())
1479 //TODO: the floorbox prev/next might need updating 1458 //TODO: the floorbox prev/next might need updating
1480 esrv_send_item (pl, op); 1459 //esrv_send_item (pl, op);
1460 //TODO: update floorbox to preserve ordering
1461 if (pl->contr->ns)
1462 pl->contr->ns->floorbox_update ();
1481 1463
1482 /* If this object glows, it may affect lighting conditions that are 1464 /* If this object glows, it may affect lighting conditions that are
1483 * visible to others on this map. But update_all_los is really 1465 * visible to others on this map. But update_all_los is really
1484 * an inefficient way to do this, as it means los for all players 1466 * an inefficient way to do this, as it means los for all players
1485 * on the map will get recalculated. The players could very well 1467 * on the map will get recalculated. The players could very well
… …
2332 * create clone from object to another 2314 * create clone from object to another
2333 */ 2315 */
2334object * 2316object *
2335object_create_clone (object *asrc) 2317object_create_clone (object *asrc)
2336{ 2318{
2337 object *dst = 0, *tmp, *src, *prev, *item; 2319 object *dst = 0;
2338 2320
2339 if (!asrc) 2321 if (!asrc)
2340 return 0; 2322 return 0;
2341 2323
2342 src = asrc->head_ (); 2324 object *src = asrc->head_ ();
2343 2325
2344 prev = 0; 2326 object *prev = 0;
2345 for (object *part = src; part; part = part->more) 2327 for (object *part = src; part; part = part->more)
2346 { 2328 {
2347 tmp = part->clone (); 2329 object *tmp = part->clone ();
2330
2348 tmp->x -= src->x; 2331 tmp->x -= src->x;
2349 tmp->y -= src->y; 2332 tmp->y -= src->y;
2350 2333
2351 if (!part->head) 2334 if (!part->head)
2352 { 2335 {
… …
2362 prev->more = tmp; 2345 prev->more = tmp;
2363 2346
2364 prev = tmp; 2347 prev = tmp;
2365 } 2348 }
2366 2349
2367 for (item = src->inv; item; item = item->below) 2350 for (object *item = src->inv; item; item = item->below)
2368 insert_ob_in_ob (object_create_clone (item), dst); 2351 insert_ob_in_ob (object_create_clone (item), dst);
2369 2352
2370 return dst; 2353 return dst;
2371} 2354}
2372 2355
… …
2382 return tmp; 2365 return tmp;
2383 2366
2384 return 0; 2367 return 0;
2385} 2368}
2386 2369
2387/* If ob has a field named key, return the link from the list, 2370const shstr &
2388 * otherwise return NULL. 2371object::kv_get (const shstr &key) const
2389 *
2390 * key must be a passed in shared string - otherwise, this won't
2391 * do the desired thing.
2392 */
2393key_value *
2394get_ob_key_link (const object *ob, const char *key)
2395{ 2372{
2396 for (key_value *link = ob->key_values; link; link = link->next) 2373 for (key_value *kv = key_values; kv; kv = kv->next)
2397 if (link->key == key) 2374 if (kv->key == key)
2398 return link;
2399
2400 return 0;
2401}
2402
2403/*
2404 * Returns the value of op has an extra_field for key, or NULL.
2405 *
2406 * The argument doesn't need to be a shared string.
2407 *
2408 * The returned string is shared.
2409 */
2410const char *
2411get_ob_key_value (const object *op, const char *const key)
2412{
2413 key_value *link;
2414 shstr_cmp canonical_key (key);
2415
2416 if (!canonical_key)
2417 {
2418 /* 1. There being a field named key on any object
2419 * implies there'd be a shared string to find.
2420 * 2. Since there isn't, no object has this field.
2421 * 3. Therefore, *this* object doesn't have this field.
2422 */
2423 return 0;
2424 }
2425
2426 /* This is copied from get_ob_key_link() above -
2427 * only 4 lines, and saves the function call overhead.
2428 */
2429 for (link = op->key_values; link; link = link->next)
2430 if (link->key == canonical_key)
2431 return link->value; 2375 return kv->value;
2432 2376
2433 return 0; 2377 return shstr_null;
2434} 2378}
2435 2379
2436/* 2380void
2437 * Updates the canonical_key in op to value. 2381object::kv_set (const shstr &key, const shstr &value)
2438 *
2439 * canonical_key is a shared string (value doesn't have to be).
2440 *
2441 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2442 * keys.
2443 *
2444 * Returns TRUE on success.
2445 */
2446int
2447set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2448{ 2382{
2449 key_value *field = NULL, *last = NULL; 2383 for (key_value *kv = key_values; kv; kv = kv->next)
2450 2384 if (kv->key == key)
2451 for (field = op->key_values; field != NULL; field = field->next)
2452 {
2453 if (field->key != canonical_key)
2454 { 2385 {
2455 last = field; 2386 kv->value = value;
2456 continue; 2387 return;
2457 } 2388 }
2458 2389
2459 if (value) 2390 key_value *kv = new key_value;
2460 field->value = value; 2391
2461 else 2392 kv->next = key_values;
2393 kv->key = key;
2394 kv->value = value;
2395
2396 key_values = kv;
2397}
2398
2399void
2400object::kv_del (const shstr &key)
2401{
2402 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2403 if ((*kvp)->key == key)
2462 { 2404 {
2463 /* Basically, if the archetype has this key set, 2405 key_value *kv = *kvp;
2464 * we need to store the null value so when we save 2406 *kvp = (*kvp)->next;
2465 * it, we save the empty value so that when we load, 2407 delete kv;
2466 * we get this value back again. 2408 return;
2467 */
2468 if (get_ob_key_link (op->arch, canonical_key))
2469 field->value = 0;
2470 else
2471 {
2472 if (last)
2473 last->next = field->next;
2474 else
2475 op->key_values = field->next;
2476
2477 delete field;
2478 }
2479 } 2409 }
2480 return TRUE;
2481 }
2482 /* IF we get here, key doesn't exist */
2483
2484 /* No field, we'll have to add it. */
2485
2486 if (!add_key)
2487 return FALSE;
2488
2489 /* There isn't any good reason to store a null
2490 * value in the key/value list. If the archetype has
2491 * this key, then we should also have it, so shouldn't
2492 * be here. If user wants to store empty strings,
2493 * should pass in ""
2494 */
2495 if (value == NULL)
2496 return TRUE;
2497
2498 field = new key_value;
2499
2500 field->key = canonical_key;
2501 field->value = value;
2502 /* Usual prepend-addition. */
2503 field->next = op->key_values;
2504 op->key_values = field;
2505
2506 return TRUE;
2507}
2508
2509/*
2510 * Updates the key in op to value.
2511 *
2512 * If add_key is FALSE, this will only update existing keys,
2513 * and not add new ones.
2514 * In general, should be little reason FALSE is ever passed in for add_key
2515 *
2516 * Returns TRUE on success.
2517 */
2518int
2519set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2520{
2521 shstr key_ (key);
2522
2523 return set_ob_key_value_s (op, key_, value, add_key);
2524} 2410}
2525 2411
2526object::depth_iterator::depth_iterator (object *container) 2412object::depth_iterator::depth_iterator (object *container)
2527: iterator_base (container) 2413: iterator_base (container)
2528{ 2414{

Diff Legend

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