| … | |
… | |
| 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 | * |
| … | |
… | |
| 368 | return 0; |
354 | return 0; |
| 369 | } |
355 | } |
| 370 | |
356 | |
| 371 | // adjust weight per container type ("of holding") |
357 | // adjust weight per container type ("of holding") |
| 372 | static sint32 |
358 | static sint32 |
| 373 | weight_adjust (object *op, sint32 weight) |
359 | weight_adjust_for (object *op, sint32 weight) |
| 374 | { |
360 | { |
| 375 | return op->type == CONTAINER |
361 | return op->type == CONTAINER |
| 376 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
362 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
| 377 | : weight; |
363 | : weight; |
| 378 | } |
364 | } |
| … | |
… | |
| 384 | static void |
370 | static void |
| 385 | adjust_weight (object *op, sint32 weight) |
371 | adjust_weight (object *op, sint32 weight) |
| 386 | { |
372 | { |
| 387 | while (op) |
373 | while (op) |
| 388 | { |
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 |
| 389 | weight = weight_adjust (op, weight); |
377 | weight = weight_adjust_for (op, op->carrying) |
|
|
378 | - weight_adjust_for (op, op->carrying - weight); |
| 390 | |
379 | |
| 391 | if (!weight) |
380 | if (!weight) |
| 392 | return; |
381 | return; |
| 393 | |
382 | |
| 394 | op->carrying += weight; |
383 | op->carrying += weight; |
| … | |
… | |
| 417 | op->update_weight (); |
406 | op->update_weight (); |
| 418 | |
407 | |
| 419 | sum += op->total_weight (); |
408 | sum += op->total_weight (); |
| 420 | } |
409 | } |
| 421 | |
410 | |
| 422 | sum = weight_adjust (this, sum); |
411 | sum = weight_adjust_for (this, sum); |
| 423 | |
412 | |
| 424 | if (sum != carrying) |
413 | if (sum != carrying) |
| 425 | { |
414 | { |
| 426 | carrying = sum; |
415 | carrying = sum; |
| 427 | |
416 | |
| … | |
… | |
| 963 | nodrop = 1; |
952 | nodrop = 1; |
| 964 | |
953 | |
| 965 | alloc (); |
954 | alloc (); |
| 966 | in_memory = MAP_ACTIVE; |
955 | in_memory = MAP_ACTIVE; |
| 967 | } |
956 | } |
|
|
957 | |
|
|
958 | ~freed_map () |
|
|
959 | { |
|
|
960 | destroy (); |
|
|
961 | } |
| 968 | } freed_map; // freed objects are moved here to avoid crashes |
962 | } freed_map; // freed objects are moved here to avoid crashes |
| 969 | |
963 | |
| 970 | void |
964 | void |
| 971 | object::do_destroy () |
965 | object::do_destroy () |
| 972 | { |
966 | { |
| … | |
… | |
| 1123 | |
1117 | |
| 1124 | /* Relink the object below us, if there is one */ |
1118 | /* Relink the object below us, if there is one */ |
| 1125 | if (below) |
1119 | if (below) |
| 1126 | below->above = above; |
1120 | below->above = above; |
| 1127 | else |
1121 | else |
| 1128 | { |
1122 | ms.bot = above; |
| 1129 | /* Nothing below, which means we need to relink map object for this space |
|
|
| 1130 | * use translated coordinates in case some oddness with map tiling is |
|
|
| 1131 | * evident |
|
|
| 1132 | */ |
|
|
| 1133 | if (GET_MAP_OB (map, x, y) != this) |
|
|
| 1134 | 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 ()); |
|
|
| 1135 | |
|
|
| 1136 | ms.bot = above; /* goes on above it. */ |
|
|
| 1137 | } |
|
|
| 1138 | |
1123 | |
| 1139 | above = 0; |
1124 | above = 0; |
| 1140 | below = 0; |
1125 | below = 0; |
| 1141 | |
1126 | |
| 1142 | if (map->in_memory == MAP_SAVING) |
1127 | if (map->in_memory == MAP_SAVING) |
| … | |
… | |
| 1299 | * 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 |
| 1300 | * need extra work |
1285 | * need extra work |
| 1301 | */ |
1286 | */ |
| 1302 | if (!xy_normalise (m, op->x, op->y)) |
1287 | if (!xy_normalise (m, op->x, op->y)) |
| 1303 | { |
1288 | { |
| 1304 | op->destroy (1); |
1289 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
| 1305 | return 0; |
1290 | return 0; |
| 1306 | } |
1291 | } |
| 1307 | |
1292 | |
| 1308 | if (object *more = op->more) |
1293 | if (object *more = op->more) |
| 1309 | if (!insert_ob_in_map (more, m, originator, flag)) |
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
| … | |
… | |
| 1596 | } |
1581 | } |
| 1597 | else |
1582 | else |
| 1598 | { |
1583 | { |
| 1599 | decrease (nr); |
1584 | decrease (nr); |
| 1600 | |
1585 | |
| 1601 | object *op = object_create_clone (this); |
1586 | object *op = deep_clone (); |
| 1602 | op->nrof = nr; |
1587 | op->nrof = nr; |
| 1603 | return op; |
1588 | return op; |
| 1604 | } |
1589 | } |
| 1605 | } |
1590 | } |
| 1606 | |
1591 | |
| … | |
… | |
| 1827 | LOG (llevError, "Present_arch called outside map.\n"); |
1812 | LOG (llevError, "Present_arch called outside map.\n"); |
| 1828 | return NULL; |
1813 | return NULL; |
| 1829 | } |
1814 | } |
| 1830 | |
1815 | |
| 1831 | 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) |
| 1832 | if (tmp->arch == at) |
1817 | if (tmp->arch->archname == at->archname) |
| 1833 | return tmp; |
1818 | return tmp; |
| 1834 | |
1819 | |
| 1835 | return NULL; |
1820 | return NULL; |
| 1836 | } |
1821 | } |
| 1837 | |
1822 | |
| … | |
… | |
| 1901 | * The first matching object is returned, or NULL if none. |
1886 | * The first matching object is returned, or NULL if none. |
| 1902 | */ |
1887 | */ |
| 1903 | object * |
1888 | object * |
| 1904 | present_arch_in_ob (const archetype *at, const object *op) |
1889 | present_arch_in_ob (const archetype *at, const object *op) |
| 1905 | { |
1890 | { |
| 1906 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1891 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1907 | if (tmp->arch == at) |
1892 | if (tmp->arch->archname == at->archname) |
| 1908 | return tmp; |
1893 | return tmp; |
| 1909 | |
1894 | |
| 1910 | return NULL; |
1895 | return NULL; |
| 1911 | } |
1896 | } |
| 1912 | |
1897 | |
| … | |
… | |
| 2321 | |
2306 | |
| 2322 | /* |
2307 | /* |
| 2323 | * create clone from object to another |
2308 | * create clone from object to another |
| 2324 | */ |
2309 | */ |
| 2325 | object * |
2310 | object * |
| 2326 | object_create_clone (object *asrc) |
2311 | object::deep_clone () |
| 2327 | { |
2312 | { |
|
|
2313 | assert (("deep_clone called on non-head object", is_head ())); |
|
|
2314 | |
| 2328 | object *dst = 0; |
2315 | object *dst = clone (); |
| 2329 | |
2316 | |
| 2330 | if (!asrc) |
|
|
| 2331 | return 0; |
|
|
| 2332 | |
|
|
| 2333 | object *src = asrc->head_ (); |
|
|
| 2334 | |
|
|
| 2335 | object *prev = 0; |
2317 | object *prev = dst; |
| 2336 | for (object *part = src; part; part = part->more) |
2318 | for (object *part = this->more; part; part = part->more) |
| 2337 | { |
2319 | { |
| 2338 | object *tmp = part->clone (); |
2320 | object *tmp = part->clone (); |
| 2339 | |
|
|
| 2340 | tmp->x -= src->x; |
|
|
| 2341 | tmp->y -= src->y; |
|
|
| 2342 | |
|
|
| 2343 | if (!part->head) |
|
|
| 2344 | { |
|
|
| 2345 | dst = tmp; |
|
|
| 2346 | tmp->head = 0; |
|
|
| 2347 | } |
|
|
| 2348 | else |
|
|
| 2349 | tmp->head = dst; |
2321 | tmp->head = dst; |
| 2350 | |
|
|
| 2351 | tmp->more = 0; |
|
|
| 2352 | |
|
|
| 2353 | if (prev) |
|
|
| 2354 | prev->more = tmp; |
2322 | prev->more = tmp; |
| 2355 | |
|
|
| 2356 | prev = tmp; |
2323 | prev = tmp; |
| 2357 | } |
2324 | } |
| 2358 | |
2325 | |
| 2359 | for (object *item = src->inv; item; item = item->below) |
2326 | for (object *item = inv; item; item = item->below) |
| 2360 | insert_ob_in_ob (object_create_clone (item), dst); |
2327 | insert_ob_in_ob (item->deep_clone (), dst); |
| 2361 | |
2328 | |
| 2362 | return dst; |
2329 | return dst; |
| 2363 | } |
2330 | } |
| 2364 | |
2331 | |
| 2365 | /* This returns the first object in who's inventory that |
2332 | /* This returns the first object in who's inventory that |
| … | |
… | |
| 2374 | return tmp; |
2341 | return tmp; |
| 2375 | |
2342 | |
| 2376 | return 0; |
2343 | return 0; |
| 2377 | } |
2344 | } |
| 2378 | |
2345 | |
| 2379 | /* If ob has a field named key, return the link from the list, |
2346 | const shstr & |
| 2380 | * otherwise return NULL. |
2347 | object::kv_get (const shstr &key) const |
| 2381 | * |
|
|
| 2382 | * key must be a passed in shared string - otherwise, this won't |
|
|
| 2383 | * do the desired thing. |
|
|
| 2384 | */ |
|
|
| 2385 | key_value * |
|
|
| 2386 | get_ob_key_link (const object *ob, const char *key) |
|
|
| 2387 | { |
2348 | { |
| 2388 | for (key_value *link = ob->key_values; link; link = link->next) |
2349 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2389 | if (link->key == key) |
2350 | if (kv->key == key) |
| 2390 | return link; |
|
|
| 2391 | |
|
|
| 2392 | return 0; |
|
|
| 2393 | } |
|
|
| 2394 | |
|
|
| 2395 | /* |
|
|
| 2396 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
| 2397 | * |
|
|
| 2398 | * The argument doesn't need to be a shared string. |
|
|
| 2399 | * |
|
|
| 2400 | * The returned string is shared. |
|
|
| 2401 | */ |
|
|
| 2402 | const char * |
|
|
| 2403 | get_ob_key_value (const object *op, const char *const key) |
|
|
| 2404 | { |
|
|
| 2405 | key_value *link; |
|
|
| 2406 | shstr_cmp canonical_key (key); |
|
|
| 2407 | |
|
|
| 2408 | if (!canonical_key) |
|
|
| 2409 | { |
|
|
| 2410 | /* 1. There being a field named key on any object |
|
|
| 2411 | * implies there'd be a shared string to find. |
|
|
| 2412 | * 2. Since there isn't, no object has this field. |
|
|
| 2413 | * 3. Therefore, *this* object doesn't have this field. |
|
|
| 2414 | */ |
|
|
| 2415 | return 0; |
|
|
| 2416 | } |
|
|
| 2417 | |
|
|
| 2418 | /* This is copied from get_ob_key_link() above - |
|
|
| 2419 | * only 4 lines, and saves the function call overhead. |
|
|
| 2420 | */ |
|
|
| 2421 | for (link = op->key_values; link; link = link->next) |
|
|
| 2422 | if (link->key == canonical_key) |
|
|
| 2423 | return link->value; |
2351 | return kv->value; |
| 2424 | |
2352 | |
| 2425 | return 0; |
2353 | return shstr_null; |
| 2426 | } |
2354 | } |
| 2427 | |
2355 | |
| 2428 | /* |
2356 | void |
| 2429 | * Updates the canonical_key in op to value. |
2357 | object::kv_set (const shstr &key, const shstr &value) |
| 2430 | * |
|
|
| 2431 | * canonical_key is a shared string (value doesn't have to be). |
|
|
| 2432 | * |
|
|
| 2433 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
| 2434 | * keys. |
|
|
| 2435 | * |
|
|
| 2436 | * Returns TRUE on success. |
|
|
| 2437 | */ |
|
|
| 2438 | int |
|
|
| 2439 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
| 2440 | { |
2358 | { |
| 2441 | key_value *field = NULL, *last = NULL; |
2359 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2442 | |
2360 | if (kv->key == key) |
| 2443 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
| 2444 | { |
|
|
| 2445 | if (field->key != canonical_key) |
|
|
| 2446 | { |
2361 | { |
| 2447 | last = field; |
2362 | kv->value = value; |
| 2448 | continue; |
2363 | return; |
| 2449 | } |
2364 | } |
| 2450 | |
2365 | |
| 2451 | if (value) |
2366 | key_value *kv = new key_value; |
| 2452 | field->value = value; |
2367 | |
| 2453 | else |
2368 | kv->next = key_values; |
|
|
2369 | kv->key = key; |
|
|
2370 | kv->value = value; |
|
|
2371 | |
|
|
2372 | key_values = kv; |
|
|
2373 | } |
|
|
2374 | |
|
|
2375 | void |
|
|
2376 | object::kv_del (const shstr &key) |
|
|
2377 | { |
|
|
2378 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2379 | if ((*kvp)->key == key) |
| 2454 | { |
2380 | { |
| 2455 | /* Basically, if the archetype has this key set, |
2381 | key_value *kv = *kvp; |
| 2456 | * we need to store the null value so when we save |
2382 | *kvp = (*kvp)->next; |
| 2457 | * it, we save the empty value so that when we load, |
2383 | delete kv; |
| 2458 | * we get this value back again. |
2384 | return; |
| 2459 | */ |
|
|
| 2460 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
| 2461 | field->value = 0; |
|
|
| 2462 | else |
|
|
| 2463 | { |
|
|
| 2464 | if (last) |
|
|
| 2465 | last->next = field->next; |
|
|
| 2466 | else |
|
|
| 2467 | op->key_values = field->next; |
|
|
| 2468 | |
|
|
| 2469 | delete field; |
|
|
| 2470 | } |
|
|
| 2471 | } |
2385 | } |
| 2472 | return TRUE; |
|
|
| 2473 | } |
|
|
| 2474 | /* IF we get here, key doesn't exist */ |
|
|
| 2475 | |
|
|
| 2476 | /* No field, we'll have to add it. */ |
|
|
| 2477 | |
|
|
| 2478 | if (!add_key) |
|
|
| 2479 | return FALSE; |
|
|
| 2480 | |
|
|
| 2481 | /* There isn't any good reason to store a null |
|
|
| 2482 | * value in the key/value list. If the archetype has |
|
|
| 2483 | * this key, then we should also have it, so shouldn't |
|
|
| 2484 | * be here. If user wants to store empty strings, |
|
|
| 2485 | * should pass in "" |
|
|
| 2486 | */ |
|
|
| 2487 | if (value == NULL) |
|
|
| 2488 | return TRUE; |
|
|
| 2489 | |
|
|
| 2490 | field = new key_value; |
|
|
| 2491 | |
|
|
| 2492 | field->key = canonical_key; |
|
|
| 2493 | field->value = value; |
|
|
| 2494 | /* Usual prepend-addition. */ |
|
|
| 2495 | field->next = op->key_values; |
|
|
| 2496 | op->key_values = field; |
|
|
| 2497 | |
|
|
| 2498 | return TRUE; |
|
|
| 2499 | } |
|
|
| 2500 | |
|
|
| 2501 | /* |
|
|
| 2502 | * Updates the key in op to value. |
|
|
| 2503 | * |
|
|
| 2504 | * If add_key is FALSE, this will only update existing keys, |
|
|
| 2505 | * and not add new ones. |
|
|
| 2506 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
| 2507 | * |
|
|
| 2508 | * Returns TRUE on success. |
|
|
| 2509 | */ |
|
|
| 2510 | int |
|
|
| 2511 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
| 2512 | { |
|
|
| 2513 | shstr key_ (key); |
|
|
| 2514 | |
|
|
| 2515 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
| 2516 | } |
2386 | } |
| 2517 | |
2387 | |
| 2518 | object::depth_iterator::depth_iterator (object *container) |
2388 | object::depth_iterator::depth_iterator (object *container) |
| 2519 | : iterator_base (container) |
2389 | : iterator_base (container) |
| 2520 | { |
2390 | { |
