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.224 by root, Fri May 2 20:16:24 2008 UTC vs.
Revision 1.236 by root, Tue May 6 20:08:37 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 *
… …
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")
372static sint32 358static sint32
373weight_adjust (object *op, sint32 weight) 359weight_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}
… …
384static void 370static void
385adjust_weight (object *op, sint32 weight) 371adjust_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
… …
603 } 592 }
604 593
605 op->key_values = 0; 594 op->key_values = 0;
606} 595}
607 596
608object & 597/*
609object::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)
610{ 607{
611 remove (); 608 dst->remove ();
612
613 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
614
615 flag [FLAG_REMOVED] = true; 610 dst->flag [FLAG_REMOVED] = true;
616 611
617 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
618 if (src.key_values) 613 if (key_values)
619 { 614 {
620 key_value *tail = 0; 615 key_value *tail = 0;
621 key_values = 0; 616 dst->key_values = 0;
622 617
623 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
624 { 619 {
625 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
626 621
627 new_link->next = 0; 622 new_link->next = 0;
628 new_link->key = i->key; 623 new_link->key = i->key;
629 new_link->value = i->value; 624 new_link->value = i->value;
630 625
631 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
632 if (!key_values) 627 if (!dst->key_values)
633 { 628 {
634 key_values = new_link; 629 dst->key_values = new_link;
635 tail = new_link; 630 tail = new_link;
636 } 631 }
637 else 632 else
638 { 633 {
639 tail->next = new_link; 634 tail->next = new_link;
640 tail = new_link; 635 tail = new_link;
641 } 636 }
642 } 637 }
643 } 638 }
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 */
654void
655object::copy_to (object *dst)
656{
657 *dst = *this;
658 639
659 if (speed < 0) 640 if (speed < 0)
660 dst->speed_left -= rndm (); 641 dst->speed_left -= rndm ();
661 642
662 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
… …
684object * 665object *
685object::clone () 666object::clone ()
686{ 667{
687 object *neu = create (); 668 object *neu = create ();
688 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
689 return neu; 671 return neu;
690} 672}
691 673
692/* 674/*
693 * 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
… …
970 nodrop = 1; 952 nodrop = 1;
971 953
972 alloc (); 954 alloc ();
973 in_memory = MAP_ACTIVE; 955 in_memory = MAP_ACTIVE;
974 } 956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
975} freed_map; // freed objects are moved here to avoid crashes 962} freed_map; // freed objects are moved here to avoid crashes
976 963
977void 964void
978object::do_destroy () 965object::do_destroy ()
979{ 966{
… …
1070 esrv_del_item (pl->contr, count); 1057 esrv_del_item (pl->contr, count);
1071 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1072 1059
1073 adjust_weight (env, -total_weight ()); 1060 adjust_weight (env, -total_weight ());
1074 1061
1062 // make sure cmov optimisation is applicable
1075 *(above ? &above->below : &env->inv) = below; 1063 *(above ? &above->below : &env->inv) = below;
1064 *(below ? &below->above : &above ) = above; // &above is just a dummy
1076 1065
1077 if (below) 1066 above = 0;
1078 below->above = above; 1067 below = 0;
1068 env = 0;
1079 1069
1080 /* we set up values so that it could be inserted into 1070 /* we set up values so that it could be inserted into
1081 * the map, but we don't actually do that - it is up 1071 * the map, but we don't actually do that - it is up
1082 * to the caller to decide what we want to do. 1072 * to the caller to decide what we want to do.
1083 */ 1073 */
1084 map = env->map; 1074 map = env->map;
1085 x = env->x; 1075 x = env->x;
1086 y = env->y; 1076 y = env->y;
1087 above = 0;
1088 below = 0;
1089 env = 0;
1090 1077
1091 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
1092 * made to players inventory. If set, avoiding the call 1079 * made to players inventory. If set, avoiding the call
1093 * to save cpu time. 1080 * to save cpu time.
1094 */ 1081 */
… …
1121 1108
1122 esrv_del_item (pl->contr, count); 1109 esrv_del_item (pl->contr, count);
1123 } 1110 }
1124 1111
1125 /* link the object above us */ 1112 /* link the object above us */
1126 if (above) 1113 // re-link, make sure compiler can easily use cmove
1127 above->below = below; 1114 *(above ? &above->below : &ms.top) = below;
1128 else 1115 *(below ? &below->above : &ms.bot) = above;
1129 ms.top = below; /* we were top, set new top */
1130
1131 /* Relink the object below us, if there is one */
1132 if (below)
1133 below->above = above;
1134 else
1135 {
1136 /* Nothing below, which means we need to relink map object for this space
1137 * use translated coordinates in case some oddness with map tiling is
1138 * evident
1139 */
1140 if (GET_MAP_OB (map, x, y) != this)
1141 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 ());
1142
1143 ms.bot = above; /* goes on above it. */
1144 }
1145 1116
1146 above = 0; 1117 above = 0;
1147 below = 0; 1118 below = 0;
1148 1119
1149 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
… …
1159 * appropriately. 1130 * appropriately.
1160 */ 1131 */
1161 pl->close_container (); 1132 pl->close_container ();
1162 1133
1163 //TODO: the floorbox prev/next might need updating 1134 //TODO: the floorbox prev/next might need updating
1164 esrv_del_item (pl->contr, count); 1135 //esrv_del_item (pl->contr, count);
1136 //TODO: update floorbox to preserve ordering
1137 if (pl->contr->ns)
1138 pl->contr->ns->floorbox_update ();
1165 } 1139 }
1166 1140
1167 for (tmp = ms.bot; tmp; tmp = tmp->above) 1141 for (tmp = ms.bot; tmp; tmp = tmp->above)
1168 { 1142 {
1169 /* No point updating the players look faces if he is the object 1143 /* No point updating the players look faces if he is the object
… …
1303 * of areas of callers (eg, anything that uses find_free_spot would now 1277 * of areas of callers (eg, anything that uses find_free_spot would now
1304 * need extra work 1278 * need extra work
1305 */ 1279 */
1306 if (!xy_normalise (m, op->x, op->y)) 1280 if (!xy_normalise (m, op->x, op->y))
1307 { 1281 {
1308 op->destroy (1); 1282 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1309 return 0; 1283 return 0;
1310 } 1284 }
1311 1285
1312 if (object *more = op->more) 1286 if (object *more = op->more)
1313 if (!insert_ob_in_map (more, m, originator, flag)) 1287 if (!insert_ob_in_map (more, m, originator, flag))
… …
1467 1441
1468 op->map->dirty = true; 1442 op->map->dirty = true;
1469 1443
1470 if (object *pl = ms.player ()) 1444 if (object *pl = ms.player ())
1471 //TODO: the floorbox prev/next might need updating 1445 //TODO: the floorbox prev/next might need updating
1472 esrv_send_item (pl, op); 1446 //esrv_send_item (pl, op);
1447 //TODO: update floorbox to preserve ordering
1448 if (pl->contr->ns)
1449 pl->contr->ns->floorbox_update ();
1473 1450
1474 /* If this object glows, it may affect lighting conditions that are 1451 /* If this object glows, it may affect lighting conditions that are
1475 * visible to others on this map. But update_all_los is really 1452 * visible to others on this map. But update_all_los is really
1476 * an inefficient way to do this, as it means los for all players 1453 * an inefficient way to do this, as it means los for all players
1477 * on the map will get recalculated. The players could very well 1454 * on the map will get recalculated. The players could very well
… …
1597 } 1574 }
1598 else 1575 else
1599 { 1576 {
1600 decrease (nr); 1577 decrease (nr);
1601 1578
1602 object *op = object_create_clone (this); 1579 object *op = deep_clone ();
1603 op->nrof = nr; 1580 op->nrof = nr;
1604 return op; 1581 return op;
1605 } 1582 }
1606} 1583}
1607 1584
… …
1828 LOG (llevError, "Present_arch called outside map.\n"); 1805 LOG (llevError, "Present_arch called outside map.\n");
1829 return NULL; 1806 return NULL;
1830 } 1807 }
1831 1808
1832 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1809 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1833 if (tmp->arch == at) 1810 if (tmp->arch->archname == at->archname)
1834 return tmp; 1811 return tmp;
1835 1812
1836 return NULL; 1813 return NULL;
1837} 1814}
1838 1815
… …
1902 * The first matching object is returned, or NULL if none. 1879 * The first matching object is returned, or NULL if none.
1903 */ 1880 */
1904object * 1881object *
1905present_arch_in_ob (const archetype *at, const object *op) 1882present_arch_in_ob (const archetype *at, const object *op)
1906{ 1883{
1907 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1884 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1908 if (tmp->arch == at) 1885 if (tmp->arch->archname == at->archname)
1909 return tmp; 1886 return tmp;
1910 1887
1911 return NULL; 1888 return NULL;
1912} 1889}
1913 1890
… …
2322 2299
2323/* 2300/*
2324 * create clone from object to another 2301 * create clone from object to another
2325 */ 2302 */
2326object * 2303object *
2327object_create_clone (object *asrc) 2304object::deep_clone ()
2328{ 2305{
2306 assert (("deep_clone called on non-head object", is_head ()));
2307
2329 object *dst = 0; 2308 object *dst = clone ();
2330 2309
2331 if (!asrc)
2332 return 0;
2333
2334 object *src = asrc->head_ ();
2335
2336 object *prev = 0; 2310 object *prev = dst;
2337 for (object *part = src; part; part = part->more) 2311 for (object *part = this->more; part; part = part->more)
2338 { 2312 {
2339 object *tmp = part->clone (); 2313 object *tmp = part->clone ();
2340
2341 tmp->x -= src->x;
2342 tmp->y -= src->y;
2343
2344 if (!part->head)
2345 {
2346 dst = tmp;
2347 tmp->head = 0;
2348 }
2349 else
2350 tmp->head = dst; 2314 tmp->head = dst;
2351
2352 tmp->more = 0;
2353
2354 if (prev)
2355 prev->more = tmp; 2315 prev->more = tmp;
2356
2357 prev = tmp; 2316 prev = tmp;
2358 } 2317 }
2359 2318
2360 for (object *item = src->inv; item; item = item->below) 2319 for (object *item = inv; item; item = item->below)
2361 insert_ob_in_ob (object_create_clone (item), dst); 2320 insert_ob_in_ob (item->deep_clone (), dst);
2362 2321
2363 return dst; 2322 return dst;
2364} 2323}
2365 2324
2366/* This returns the first object in who's inventory that 2325/* This returns the first object in who's inventory that
… …
2375 return tmp; 2334 return tmp;
2376 2335
2377 return 0; 2336 return 0;
2378} 2337}
2379 2338
2380/* If ob has a field named key, return the link from the list, 2339const shstr &
2381 * otherwise return NULL. 2340object::kv_get (const shstr &key) const
2382 *
2383 * key must be a passed in shared string - otherwise, this won't
2384 * do the desired thing.
2385 */
2386key_value *
2387get_ob_key_link (const object *ob, const char *key)
2388{ 2341{
2389 for (key_value *link = ob->key_values; link; link = link->next) 2342 for (key_value *kv = key_values; kv; kv = kv->next)
2390 if (link->key == key) 2343 if (kv->key == key)
2391 return link;
2392
2393 return 0;
2394}
2395
2396/*
2397 * Returns the value of op has an extra_field for key, or NULL.
2398 *
2399 * The argument doesn't need to be a shared string.
2400 *
2401 * The returned string is shared.
2402 */
2403const char *
2404get_ob_key_value (const object *op, const char *const key)
2405{
2406 key_value *link;
2407 shstr_cmp canonical_key (key);
2408
2409 if (!canonical_key)
2410 {
2411 /* 1. There being a field named key on any object
2412 * implies there'd be a shared string to find.
2413 * 2. Since there isn't, no object has this field.
2414 * 3. Therefore, *this* object doesn't have this field.
2415 */
2416 return 0;
2417 }
2418
2419 /* This is copied from get_ob_key_link() above -
2420 * only 4 lines, and saves the function call overhead.
2421 */
2422 for (link = op->key_values; link; link = link->next)
2423 if (link->key == canonical_key)
2424 return link->value; 2344 return kv->value;
2425 2345
2426 return 0; 2346 return shstr_null;
2427} 2347}
2428 2348
2429/* 2349void
2430 * Updates the canonical_key in op to value. 2350object::kv_set (const shstr &key, const shstr &value)
2431 *
2432 * canonical_key is a shared string (value doesn't have to be).
2433 *
2434 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2435 * keys.
2436 *
2437 * Returns TRUE on success.
2438 */
2439int
2440set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2441{ 2351{
2442 key_value *field = NULL, *last = NULL; 2352 for (key_value *kv = key_values; kv; kv = kv->next)
2443 2353 if (kv->key == key)
2444 for (field = op->key_values; field != NULL; field = field->next)
2445 {
2446 if (field->key != canonical_key)
2447 { 2354 {
2448 last = field; 2355 kv->value = value;
2449 continue; 2356 return;
2450 } 2357 }
2451 2358
2452 if (value) 2359 key_value *kv = new key_value;
2453 field->value = value; 2360
2454 else 2361 kv->next = key_values;
2362 kv->key = key;
2363 kv->value = value;
2364
2365 key_values = kv;
2366}
2367
2368void
2369object::kv_del (const shstr &key)
2370{
2371 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2372 if ((*kvp)->key == key)
2455 { 2373 {
2456 /* Basically, if the archetype has this key set, 2374 key_value *kv = *kvp;
2457 * we need to store the null value so when we save 2375 *kvp = (*kvp)->next;
2458 * it, we save the empty value so that when we load, 2376 delete kv;
2459 * we get this value back again. 2377 return;
2460 */
2461 if (get_ob_key_link (op->arch, canonical_key))
2462 field->value = 0;
2463 else
2464 {
2465 if (last)
2466 last->next = field->next;
2467 else
2468 op->key_values = field->next;
2469
2470 delete field;
2471 }
2472 } 2378 }
2473 return TRUE;
2474 }
2475 /* IF we get here, key doesn't exist */
2476
2477 /* No field, we'll have to add it. */
2478
2479 if (!add_key)
2480 return FALSE;
2481
2482 /* There isn't any good reason to store a null
2483 * value in the key/value list. If the archetype has
2484 * this key, then we should also have it, so shouldn't
2485 * be here. If user wants to store empty strings,
2486 * should pass in ""
2487 */
2488 if (value == NULL)
2489 return TRUE;
2490
2491 field = new key_value;
2492
2493 field->key = canonical_key;
2494 field->value = value;
2495 /* Usual prepend-addition. */
2496 field->next = op->key_values;
2497 op->key_values = field;
2498
2499 return TRUE;
2500}
2501
2502/*
2503 * Updates the key in op to value.
2504 *
2505 * If add_key is FALSE, this will only update existing keys,
2506 * and not add new ones.
2507 * In general, should be little reason FALSE is ever passed in for add_key
2508 *
2509 * Returns TRUE on success.
2510 */
2511int
2512set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2513{
2514 shstr key_ (key);
2515
2516 return set_ob_key_value_s (op, key_, value, add_key);
2517} 2379}
2518 2380
2519object::depth_iterator::depth_iterator (object *container) 2381object::depth_iterator::depth_iterator (object *container)
2520: iterator_base (container) 2382: iterator_base (container)
2521{ 2383{

Diff Legend

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