| … | |
… | |
| 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 | * |
| … | |
… | |
| 603 | } |
589 | } |
| 604 | |
590 | |
| 605 | op->key_values = 0; |
591 | op->key_values = 0; |
| 606 | } |
592 | } |
| 607 | |
593 | |
| 608 | object & |
594 | /* |
| 609 | object::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 | */ |
|
|
602 | void |
|
|
603 | object::copy_to (object *dst) |
| 610 | { |
604 | { |
| 611 | remove (); |
605 | dst->remove (); |
| 612 | |
|
|
| 613 | *(object_copy *)this = src; |
606 | *(object_copy *)dst = *this; |
| 614 | |
|
|
| 615 | flag [FLAG_REMOVED] = true; |
607 | dst->flag [FLAG_REMOVED] = true; |
| 616 | |
608 | |
| 617 | /* Copy over key_values, if any. */ |
609 | /* Copy over key_values, if any. */ |
| 618 | if (src.key_values) |
610 | if (key_values) |
| 619 | { |
611 | { |
| 620 | key_value *tail = 0; |
612 | key_value *tail = 0; |
| 621 | key_values = 0; |
613 | dst->key_values = 0; |
| 622 | |
614 | |
| 623 | for (key_value *i = src.key_values; i; i = i->next) |
615 | for (key_value *i = key_values; i; i = i->next) |
| 624 | { |
616 | { |
| 625 | key_value *new_link = new key_value; |
617 | key_value *new_link = new key_value; |
| 626 | |
618 | |
| 627 | new_link->next = 0; |
619 | new_link->next = 0; |
| 628 | new_link->key = i->key; |
620 | new_link->key = i->key; |
| 629 | new_link->value = i->value; |
621 | new_link->value = i->value; |
| 630 | |
622 | |
| 631 | /* Try and be clever here, too. */ |
623 | /* Try and be clever here, too. */ |
| 632 | if (!key_values) |
624 | if (!dst->key_values) |
| 633 | { |
625 | { |
| 634 | key_values = new_link; |
626 | dst->key_values = new_link; |
| 635 | tail = new_link; |
627 | tail = new_link; |
| 636 | } |
628 | } |
| 637 | else |
629 | else |
| 638 | { |
630 | { |
| 639 | tail->next = new_link; |
631 | tail->next = new_link; |
| 640 | tail = new_link; |
632 | tail = new_link; |
| 641 | } |
633 | } |
| 642 | } |
634 | } |
| 643 | } |
635 | } |
| 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 | |
636 | |
| 659 | if (speed < 0) |
637 | if (speed < 0) |
| 660 | dst->speed_left -= rndm (); |
638 | dst->speed_left -= rndm (); |
| 661 | |
639 | |
| 662 | dst->set_speed (dst->speed); |
640 | dst->set_speed (dst->speed); |
| … | |
… | |
| 1160 | * appropriately. |
1138 | * appropriately. |
| 1161 | */ |
1139 | */ |
| 1162 | pl->close_container (); |
1140 | pl->close_container (); |
| 1163 | |
1141 | |
| 1164 | //TODO: the floorbox prev/next might need updating |
1142 | //TODO: the floorbox prev/next might need updating |
| 1165 | esrv_del_item (pl->contr, count); |
1143 | //esrv_del_item (pl->contr, count); |
|
|
1144 | //TODO: update floorbox to preserve ordering |
|
|
1145 | if (pl->contr->ns) |
|
|
1146 | pl->contr->ns->floorbox_update (); |
| 1166 | } |
1147 | } |
| 1167 | |
1148 | |
| 1168 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1149 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
| 1169 | { |
1150 | { |
| 1170 | /* No point updating the players look faces if he is the object |
1151 | /* No point updating the players look faces if he is the object |
| … | |
… | |
| 1468 | |
1449 | |
| 1469 | op->map->dirty = true; |
1450 | op->map->dirty = true; |
| 1470 | |
1451 | |
| 1471 | if (object *pl = ms.player ()) |
1452 | if (object *pl = ms.player ()) |
| 1472 | //TODO: the floorbox prev/next might need updating |
1453 | //TODO: the floorbox prev/next might need updating |
| 1473 | esrv_send_item (pl, op); |
1454 | //esrv_send_item (pl, op); |
|
|
1455 | //TODO: update floorbox to preserve ordering |
|
|
1456 | if (pl->contr->ns) |
|
|
1457 | pl->contr->ns->floorbox_update (); |
| 1474 | |
1458 | |
| 1475 | /* If this object glows, it may affect lighting conditions that are |
1459 | /* If this object glows, it may affect lighting conditions that are |
| 1476 | * visible to others on this map. But update_all_los is really |
1460 | * 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 |
1461 | * 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 |
1462 | * on the map will get recalculated. The players could very well |
| … | |
… | |
| 2376 | return tmp; |
2360 | return tmp; |
| 2377 | |
2361 | |
| 2378 | return 0; |
2362 | return 0; |
| 2379 | } |
2363 | } |
| 2380 | |
2364 | |
| 2381 | /* If ob has a field named key, return the link from the list, |
2365 | const shstr & |
| 2382 | * otherwise return NULL. |
2366 | 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 | { |
2367 | { |
| 2390 | for (key_value *link = ob->key_values; link; link = link->next) |
2368 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2391 | if (link->key == key) |
2369 | 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; |
2370 | return kv->value; |
| 2426 | |
2371 | |
| 2427 | return 0; |
2372 | return shstr_null; |
| 2428 | } |
2373 | } |
| 2429 | |
2374 | |
| 2430 | /* |
2375 | void |
| 2431 | * Updates the canonical_key in op to value. |
2376 | 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 | { |
2377 | { |
| 2443 | key_value *field = NULL, *last = NULL; |
2378 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2444 | |
2379 | if (kv->key == key) |
| 2445 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
| 2446 | { |
|
|
| 2447 | if (field->key != canonical_key) |
|
|
| 2448 | { |
2380 | { |
| 2449 | last = field; |
2381 | kv->value = value; |
| 2450 | continue; |
2382 | return; |
| 2451 | } |
2383 | } |
| 2452 | |
2384 | |
| 2453 | if (value) |
2385 | key_value *kv = new key_value; |
| 2454 | field->value = value; |
2386 | |
| 2455 | else |
2387 | kv->next = key_values; |
|
|
2388 | kv->key = key; |
|
|
2389 | kv->value = value; |
|
|
2390 | |
|
|
2391 | key_values = kv; |
|
|
2392 | } |
|
|
2393 | |
|
|
2394 | void |
|
|
2395 | object::kv_del (const shstr &key) |
|
|
2396 | { |
|
|
2397 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2398 | if ((*kvp)->key == key) |
| 2456 | { |
2399 | { |
| 2457 | /* Basically, if the archetype has this key set, |
2400 | key_value *kv = *kvp; |
| 2458 | * we need to store the null value so when we save |
2401 | *kvp = (*kvp)->next; |
| 2459 | * it, we save the empty value so that when we load, |
2402 | delete kv; |
| 2460 | * we get this value back again. |
2403 | 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 | } |
2404 | } |
| 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 | } |
2405 | } |
| 2519 | |
2406 | |
| 2520 | object::depth_iterator::depth_iterator (object *container) |
2407 | object::depth_iterator::depth_iterator (object *container) |
| 2521 | : iterator_base (container) |
2408 | : iterator_base (container) |
| 2522 | { |
2409 | { |
