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.227 by root, Sat May 3 09:04:17 2008 UTC vs.
Revision 1.230 by root, Sun May 4 08:25:32 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 *
963 nodrop = 1; 949 nodrop = 1;
964 950
965 alloc (); 951 alloc ();
966 in_memory = MAP_ACTIVE; 952 in_memory = MAP_ACTIVE;
967 } 953 }
954
955 ~freed_map ()
956 {
957 destroy ();
958 }
968} freed_map; // freed objects are moved here to avoid crashes 959} freed_map; // freed objects are moved here to avoid crashes
969 960
970void 961void
971object::do_destroy () 962object::do_destroy ()
972{ 963{
1596 } 1587 }
1597 else 1588 else
1598 { 1589 {
1599 decrease (nr); 1590 decrease (nr);
1600 1591
1601 object *op = object_create_clone (this); 1592 object *op = deep_clone ();
1602 op->nrof = nr; 1593 op->nrof = nr;
1603 return op; 1594 return op;
1604 } 1595 }
1605} 1596}
1606 1597
2321 2312
2322/* 2313/*
2323 * create clone from object to another 2314 * create clone from object to another
2324 */ 2315 */
2325object * 2316object *
2326object_create_clone (object *asrc) 2317object::deep_clone ()
2327{ 2318{
2319 assert (("deep_clone called on non-head object", is_head ()));
2320
2328 object *dst = 0; 2321 object *dst = clone ();
2329 2322
2330 if (!asrc)
2331 return 0;
2332
2333 object *src = asrc->head_ ();
2334
2335 object *prev = 0; 2323 object *prev = dst;
2336 for (object *part = src; part; part = part->more) 2324 for (object *part = this->more; part; part = part->more)
2337 { 2325 {
2338 object *tmp = part->clone (); 2326 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; 2327 tmp->head = dst;
2350
2351 tmp->more = 0;
2352
2353 if (prev)
2354 prev->more = tmp; 2328 prev->more = tmp;
2355
2356 prev = tmp; 2329 prev = tmp;
2357 } 2330 }
2358 2331
2359 for (object *item = src->inv; item; item = item->below) 2332 for (object *item = inv; item; item = item->below)
2360 insert_ob_in_ob (object_create_clone (item), dst); 2333 insert_ob_in_ob (item->deep_clone (), dst);
2361 2334
2362 return dst; 2335 return dst;
2363} 2336}
2364 2337
2365/* This returns the first object in who's inventory that 2338/* This returns the first object in who's inventory that
2374 return tmp; 2347 return tmp;
2375 2348
2376 return 0; 2349 return 0;
2377} 2350}
2378 2351
2379/* If ob has a field named key, return the link from the list, 2352const shstr &
2380 * otherwise return NULL. 2353object::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 */
2385key_value *
2386get_ob_key_link (const object *ob, const char *key)
2387{ 2354{
2388 for (key_value *link = ob->key_values; link; link = link->next) 2355 for (key_value *kv = key_values; kv; kv = kv->next)
2389 if (link->key == key) 2356 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 */
2402const char *
2403get_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; 2357 return kv->value;
2424 2358
2425 return 0; 2359 return shstr_null;
2426} 2360}
2427 2361
2428/* 2362void
2429 * Updates the canonical_key in op to value. 2363object::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 */
2438int
2439set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2440{ 2364{
2441 key_value *field = NULL, *last = NULL; 2365 for (key_value *kv = key_values; kv; kv = kv->next)
2442 2366 if (kv->key == key)
2443 for (field = op->key_values; field != NULL; field = field->next)
2444 {
2445 if (field->key != canonical_key)
2446 { 2367 {
2447 last = field; 2368 kv->value = value;
2448 continue; 2369 return;
2449 } 2370 }
2450 2371
2451 if (value) 2372 key_value *kv = new key_value;
2452 field->value = value; 2373
2453 else 2374 kv->next = key_values;
2375 kv->key = key;
2376 kv->value = value;
2377
2378 key_values = kv;
2379}
2380
2381void
2382object::kv_del (const shstr &key)
2383{
2384 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2385 if ((*kvp)->key == key)
2454 { 2386 {
2455 /* Basically, if the archetype has this key set, 2387 key_value *kv = *kvp;
2456 * we need to store the null value so when we save 2388 *kvp = (*kvp)->next;
2457 * it, we save the empty value so that when we load, 2389 delete kv;
2458 * we get this value back again. 2390 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 } 2391 }
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 */
2510int
2511set_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} 2392}
2517 2393
2518object::depth_iterator::depth_iterator (object *container) 2394object::depth_iterator::depth_iterator (object *container)
2519: iterator_base (container) 2395: iterator_base (container)
2520{ 2396{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines