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.226 by root, Sat May 3 08:50:30 2008 UTC vs.
Revision 1.243 by root, Sat May 17 00:17:02 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 *
… …
200 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
201 || ob1->value != ob2->value 187 || ob1->value != ob2->value
202 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
203 return 0; 189 return 0;
204 190
191 // some objects are unmergable
192 if (!ob1->nrof || !ob2->nrof)
193 return 0;
194
205 /* Do not merge objects if nrof would overflow. First part checks 195 /* Do not merge objects if nrof would overflow. First part checks
206 * for unsigned overflow (2c), second part checks whether the result 196 * for unsigned overflow (2c), second part checks whether the result
207 * would fit into a 32 bit signed int, which is often used to hold 197 * would fit into a 32 bit signed int, which is often used to hold
208 * nrof values. 198 * nrof values.
209 */ 199 */
… …
220 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 210 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221 211
222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 212 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 213 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224 214
225 if (ob1->arch->name != ob2->arch->name 215 if (ob1->arch->archname != ob2->arch->archname
226 || ob1->name != ob2->name 216 || ob1->name != ob2->name
227 || ob1->title != ob2->title 217 || ob1->title != ob2->title
228 || ob1->msg != ob2->msg 218 || ob1->msg != ob2->msg
229 || ob1->weight != ob2->weight 219 || ob1->weight != ob2->weight
230 || ob1->attacktype != ob2->attacktype 220 || ob1->attacktype != ob2->attacktype
231 || ob1->magic != ob2->magic 221 || ob1->magic != ob2->magic
232 || ob1->slaying != ob2->slaying 222 || ob1->slaying != ob2->slaying
233 || ob1->skill != ob2->skill 223 || ob1->skill != ob2->skill
234 || ob1->value != ob2->value 224 || ob1->value != ob2->value
235 || ob1->animation_id != ob2->animation_id 225 || ob1->animation_id != ob2->animation_id
226 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236 || ob1->client_type != ob2->client_type 227 || ob1->client_type != ob2->client_type
237 || ob1->materialname != ob2->materialname 228 || ob1->materialname != ob2->materialname
238 || ob1->lore != ob2->lore 229 || ob1->lore != ob2->lore
239 || ob1->subtype != ob2->subtype 230 || ob1->subtype != ob2->subtype
240 || ob1->move_type != ob2->move_type 231 || ob1->move_type != ob2->move_type
… …
368 return 0; 359 return 0;
369} 360}
370 361
371// adjust weight per container type ("of holding") 362// adjust weight per container type ("of holding")
372static sint32 363static sint32
373weight_adjust (object *op, sint32 weight) 364weight_adjust_for (object *op, sint32 weight)
374{ 365{
375 return op->type == CONTAINER 366 return op->type == CONTAINER
376 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 367 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377 : weight; 368 : weight;
378} 369}
… …
384static void 375static void
385adjust_weight (object *op, sint32 weight) 376adjust_weight (object *op, sint32 weight)
386{ 377{
387 while (op) 378 while (op)
388 { 379 {
380 // adjust by actual difference to account for rounding errors
381 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389 weight = weight_adjust (op, weight); 382 weight = weight_adjust_for (op, op->carrying)
383 - weight_adjust_for (op, op->carrying - weight);
390 384
391 if (!weight) 385 if (!weight)
392 return; 386 return;
393 387
394 op->carrying += weight; 388 op->carrying += weight;
… …
417 op->update_weight (); 411 op->update_weight ();
418 412
419 sum += op->total_weight (); 413 sum += op->total_weight ();
420 } 414 }
421 415
422 sum = weight_adjust (this, sum); 416 sum = weight_adjust_for (this, sum);
423 417
424 if (sum != carrying) 418 if (sum != carrying)
425 { 419 {
426 carrying = sum; 420 carrying = sum;
427 421
… …
489 */ 483 */
490object * 484object *
491find_object_name (const char *str) 485find_object_name (const char *str)
492{ 486{
493 shstr_cmp str_ (str); 487 shstr_cmp str_ (str);
494 object *op;
495 488
489 if (str_)
496 for_all_objects (op) 490 for_all_objects (op)
497 if (op->name == str_) 491 if (op->name == str_)
498 break; 492 return op;
499 493
500 return op; 494 return 0;
501} 495}
502 496
503/* 497/*
504 * Sets the owner and sets the skill and exp pointers to owner's current 498 * Sets the owner and sets the skill and exp pointers to owner's current
505 * skill and experience objects. 499 * skill and experience objects.
… …
603 } 597 }
604 598
605 op->key_values = 0; 599 op->key_values = 0;
606} 600}
607 601
608object & 602/*
609object::operator =(const object &src) 603 * copy_to first frees everything allocated by the dst object,
604 * and then copies the contents of itself into the second
605 * object, allocating what needs to be allocated. Basically, any
606 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
607 * if the first object is freed, the pointers in the new object
608 * will point at garbage.
609 */
610void
611object::copy_to (object *dst)
610{ 612{
611 remove (); 613 dst->remove ();
612
613 *(object_copy *)this = src; 614 *(object_copy *)dst = *this;
614
615 flag [FLAG_REMOVED] = true; 615 dst->flag [FLAG_REMOVED] = true;
616 616
617 /* Copy over key_values, if any. */ 617 /* Copy over key_values, if any. */
618 if (src.key_values) 618 if (key_values)
619 { 619 {
620 key_value *tail = 0; 620 key_value *tail = 0;
621 key_values = 0; 621 dst->key_values = 0;
622 622
623 for (key_value *i = src.key_values; i; i = i->next) 623 for (key_value *i = key_values; i; i = i->next)
624 { 624 {
625 key_value *new_link = new key_value; 625 key_value *new_link = new key_value;
626 626
627 new_link->next = 0; 627 new_link->next = 0;
628 new_link->key = i->key; 628 new_link->key = i->key;
629 new_link->value = i->value; 629 new_link->value = i->value;
630 630
631 /* Try and be clever here, too. */ 631 /* Try and be clever here, too. */
632 if (!key_values) 632 if (!dst->key_values)
633 { 633 {
634 key_values = new_link; 634 dst->key_values = new_link;
635 tail = new_link; 635 tail = new_link;
636 } 636 }
637 else 637 else
638 { 638 {
639 tail->next = new_link; 639 tail->next = new_link;
640 tail = new_link; 640 tail = new_link;
641 } 641 }
642 } 642 }
643 } 643 }
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 644
659 if (speed < 0) 645 if (speed < 0)
660 dst->speed_left -= rndm (); 646 dst->speed_left -= rndm ();
661 647
662 dst->set_speed (dst->speed); 648 dst->set_speed (dst->speed);
… …
923 * drop on that space. 909 * drop on that space.
924 */ 910 */
925 if (!drop_to_ground 911 if (!drop_to_ground
926 || !map 912 || !map
927 || map->in_memory != MAP_ACTIVE 913 || map->in_memory != MAP_ACTIVE
928 || map->nodrop 914 || map->no_drop
929 || ms ().move_block == MOVE_ALL) 915 || ms ().move_block == MOVE_ALL)
930 { 916 {
931 while (inv) 917 while (inv)
932 { 918 {
933 inv->destroy_inv (false); 919 inv->destroy_inv (false);
… …
962 948
963static struct freed_map : maptile 949static struct freed_map : maptile
964{ 950{
965 freed_map () 951 freed_map ()
966 { 952 {
967 path = "<freed objects map>"; 953 path = "<freed objects map>";
968 name = "/internal/freed_objects_map"; 954 name = "/internal/freed_objects_map";
969 width = 3; 955 width = 3;
970 height = 3; 956 height = 3;
971 nodrop = 1; 957 no_drop = 1;
958 no_reset = 1;
972 959
973 alloc (); 960 alloc ();
974 in_memory = MAP_ACTIVE; 961 in_memory = MAP_ACTIVE;
962 }
963
964 ~freed_map ()
965 {
966 destroy ();
975 } 967 }
976} freed_map; // freed objects are moved here to avoid crashes 968} freed_map; // freed objects are moved here to avoid crashes
977 969
978void 970void
979object::do_destroy () 971object::do_destroy ()
… …
1070 if (object *pl = visible_to ()) 1062 if (object *pl = visible_to ())
1071 esrv_del_item (pl->contr, count); 1063 esrv_del_item (pl->contr, count);
1072 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1064 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1073 1065
1074 adjust_weight (env, -total_weight ()); 1066 adjust_weight (env, -total_weight ());
1075
1076 *(above ? &above->below : &env->inv) = below;
1077
1078 if (below)
1079 below->above = above;
1080 1067
1081 /* we set up values so that it could be inserted into 1068 /* we set up values so that it could be inserted into
1082 * the map, but we don't actually do that - it is up 1069 * the map, but we don't actually do that - it is up
1083 * to the caller to decide what we want to do. 1070 * to the caller to decide what we want to do.
1084 */ 1071 */
1085 map = env->map; 1072 map = env->map;
1086 x = env->x; 1073 x = env->x;
1087 y = env->y; 1074 y = env->y;
1075
1076 // make sure cmov optimisation is applicable
1077 *(above ? &above->below : &env->inv) = below;
1078 *(below ? &below->above : &above ) = above; // &above is just a dummy
1079
1088 above = 0; 1080 above = 0;
1089 below = 0; 1081 below = 0;
1090 env = 0; 1082 env = 0;
1091 1083
1092 /* NO_FIX_PLAYER is set when a great many changes are being 1084 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1122 1114
1123 esrv_del_item (pl->contr, count); 1115 esrv_del_item (pl->contr, count);
1124 } 1116 }
1125 1117
1126 /* link the object above us */ 1118 /* link the object above us */
1127 if (above) 1119 // re-link, make sure compiler can easily use cmove
1128 above->below = below; 1120 *(above ? &above->below : &ms.top) = below;
1129 else 1121 *(below ? &below->above : &ms.bot) = above;
1130 ms.top = below; /* we were top, set new top */
1131
1132 /* Relink the object below us, if there is one */
1133 if (below)
1134 below->above = above;
1135 else
1136 {
1137 /* Nothing below, which means we need to relink map object for this space
1138 * use translated coordinates in case some oddness with map tiling is
1139 * evident
1140 */
1141 if (GET_MAP_OB (map, x, y) != this)
1142 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 ());
1143
1144 ms.bot = above; /* goes on above it. */
1145 }
1146 1122
1147 above = 0; 1123 above = 0;
1148 below = 0; 1124 below = 0;
1149 1125
1150 if (map->in_memory == MAP_SAVING) 1126 if (map->in_memory == MAP_SAVING)
… …
1297 * just 'op' otherwise 1273 * just 'op' otherwise
1298 */ 1274 */
1299object * 1275object *
1300insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1276insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301{ 1277{
1302 assert (!op->flag [FLAG_FREED]);
1303
1304 op->remove (); 1278 op->remove ();
1305 1279
1306 /* Ideally, the caller figures this out. However, it complicates a lot 1280 /* Ideally, the caller figures this out. However, it complicates a lot
1307 * of areas of callers (eg, anything that uses find_free_spot would now 1281 * of areas of callers (eg, anything that uses find_free_spot would now
1308 * need extra work 1282 * need extra work
1309 */ 1283 */
1310 if (!xy_normalise (m, op->x, op->y)) 1284 if (!xy_normalise (m, op->x, op->y))
1311 { 1285 {
1312 op->destroy (1); 1286 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1313 return 0; 1287 return 0;
1314 } 1288 }
1315 1289
1316 if (object *more = op->more) 1290 if (object *more = op->more)
1317 if (!insert_ob_in_map (more, m, originator, flag)) 1291 if (!insert_ob_in_map (more, m, originator, flag))
… …
1326 */ 1300 */
1327 if (op->nrof && !(flag & INS_NO_MERGE)) 1301 if (op->nrof && !(flag & INS_NO_MERGE))
1328 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1302 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329 if (object::can_merge (op, tmp)) 1303 if (object::can_merge (op, tmp))
1330 { 1304 {
1331 // TODO: we atcually want to update tmp, not op, 1305 // TODO: we actually want to update tmp, not op,
1332 // but some caller surely breaks when we return tmp 1306 // but some caller surely breaks when we return tmp
1333 // from here :/ 1307 // from here :/
1334 op->nrof += tmp->nrof; 1308 op->nrof += tmp->nrof;
1335 tmp->destroy (1); 1309 tmp->destroy (1);
1336 } 1310 }
… …
1347 { 1321 {
1348 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1322 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1349 abort (); 1323 abort ();
1350 } 1324 }
1351 1325
1326 if (!originator->is_on_map ())
1327 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1328 op->debug_desc (), originator->debug_desc ());
1329
1352 op->above = originator; 1330 op->above = originator;
1353 op->below = originator->below; 1331 op->below = originator->below;
1354
1355 if (op->below)
1356 op->below->above = op;
1357 else
1358 ms.bot = op;
1359
1360 /* since *below* originator, no need to update top */
1361 originator->below = op; 1332 originator->below = op;
1333
1334 *(op->below ? &op->below->above : &ms.bot) = op;
1362 } 1335 }
1363 else 1336 else
1364 { 1337 {
1365 object *top, *floor = NULL; 1338 object *floor = 0;
1366 1339 object *top = ms.top;
1367 top = ms.bot;
1368 1340
1369 /* If there are other objects, then */ 1341 /* If there are other objects, then */
1370 if (top) 1342 if (top)
1371 { 1343 {
1372 object *last = 0;
1373
1374 /* 1344 /*
1375 * If there are multiple objects on this space, we do some trickier handling. 1345 * If there are multiple objects on this space, we do some trickier handling.
1376 * We've already dealt with merging if appropriate. 1346 * We've already dealt with merging if appropriate.
1377 * Generally, we want to put the new object on top. But if 1347 * Generally, we want to put the new object on top. But if
1378 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1348 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1381 * once we get to them. This reduces the need to traverse over all of 1351 * once we get to them. This reduces the need to traverse over all of
1382 * them when adding another one - this saves quite a bit of cpu time 1352 * them when adding another one - this saves quite a bit of cpu time
1383 * when lots of spells are cast in one area. Currently, it is presumed 1353 * when lots of spells are cast in one area. Currently, it is presumed
1384 * that flying non pickable objects are spell objects. 1354 * that flying non pickable objects are spell objects.
1385 */ 1355 */
1386 for (top = ms.bot; top; top = top->above) 1356 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1387 { 1357 {
1388 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1358 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1389 floor = top; 1359 floor = tmp;
1390 1360
1391 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1361 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1392 { 1362 {
1393 /* We insert above top, so we want this object below this */ 1363 /* We insert above top, so we want this object below this */
1394 top = top->below; 1364 top = tmp->below;
1395 break; 1365 break;
1396 } 1366 }
1397 1367
1398 last = top; 1368 top = tmp;
1399 } 1369 }
1400
1401 /* Don't want top to be NULL, so set it to the last valid object */
1402 top = last;
1403 1370
1404 /* We let update_position deal with figuring out what the space 1371 /* We let update_position deal with figuring out what the space
1405 * looks like instead of lots of conditions here. 1372 * looks like instead of lots of conditions here.
1406 * makes things faster, and effectively the same result. 1373 * makes things faster, and effectively the same result.
1407 */ 1374 */
… …
1414 */ 1381 */
1415 if (!(flag & INS_ON_TOP) 1382 if (!(flag & INS_ON_TOP)
1416 && ms.flags () & P_BLOCKSVIEW 1383 && ms.flags () & P_BLOCKSVIEW
1417 && (op->face && !faces [op->face].visibility)) 1384 && (op->face && !faces [op->face].visibility))
1418 { 1385 {
1386 object *last;
1387
1419 for (last = top; last != floor; last = last->below) 1388 for (last = top; last != floor; last = last->below)
1420 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1389 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1421 break; 1390 break;
1422 1391
1423 /* Check to see if we found the object that blocks view, 1392 /* Check to see if we found the object that blocks view,
… …
1431 } /* If objects on this space */ 1400 } /* If objects on this space */
1432 1401
1433 if (flag & INS_ABOVE_FLOOR_ONLY) 1402 if (flag & INS_ABOVE_FLOOR_ONLY)
1434 top = floor; 1403 top = floor;
1435 1404
1436 /* Top is the object that our object (op) is going to get inserted above. 1405 // insert object above top, or bottom-most if top = 0
1437 */
1438
1439 /* First object on this space */
1440 if (!top) 1406 if (!top)
1441 { 1407 {
1408 op->below = 0;
1442 op->above = ms.bot; 1409 op->above = ms.bot;
1443
1444 if (op->above)
1445 op->above->below = op;
1446
1447 op->below = 0;
1448 ms.bot = op; 1410 ms.bot = op;
1411
1412 *(op->above ? &op->above->below : &ms.top) = op;
1449 } 1413 }
1450 else 1414 else
1451 { /* get inserted into the stack above top */ 1415 {
1452 op->above = top->above; 1416 op->above = top->above;
1453
1454 if (op->above)
1455 op->above->below = op; 1417 top->above = op;
1456 1418
1457 op->below = top; 1419 op->below = top;
1458 top->above = op; 1420 *(op->above ? &op->above->below : &ms.top) = op;
1459 } 1421 }
1460 1422 }
1461 if (!op->above)
1462 ms.top = op;
1463 } /* else not INS_BELOW_ORIGINATOR */
1464 1423
1465 if (op->type == PLAYER) 1424 if (op->type == PLAYER)
1466 { 1425 {
1467 op->contr->do_los = 1; 1426 op->contr->do_los = 1;
1468 ++op->map->players; 1427 ++op->map->players;
… …
1604 } 1563 }
1605 else 1564 else
1606 { 1565 {
1607 decrease (nr); 1566 decrease (nr);
1608 1567
1609 object *op = object_create_clone (this); 1568 object *op = deep_clone ();
1610 op->nrof = nr; 1569 op->nrof = nr;
1611 return op; 1570 return op;
1612 } 1571 }
1613} 1572}
1614 1573
… …
1835 LOG (llevError, "Present_arch called outside map.\n"); 1794 LOG (llevError, "Present_arch called outside map.\n");
1836 return NULL; 1795 return NULL;
1837 } 1796 }
1838 1797
1839 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1798 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1840 if (tmp->arch == at) 1799 if (tmp->arch->archname == at->archname)
1841 return tmp; 1800 return tmp;
1842 1801
1843 return NULL; 1802 return NULL;
1844} 1803}
1845 1804
… …
1909 * The first matching object is returned, or NULL if none. 1868 * The first matching object is returned, or NULL if none.
1910 */ 1869 */
1911object * 1870object *
1912present_arch_in_ob (const archetype *at, const object *op) 1871present_arch_in_ob (const archetype *at, const object *op)
1913{ 1872{
1914 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1873 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1915 if (tmp->arch == at) 1874 if (tmp->arch->archname == at->archname)
1916 return tmp; 1875 return tmp;
1917 1876
1918 return NULL; 1877 return NULL;
1919} 1878}
1920 1879
… …
2329 2288
2330/* 2289/*
2331 * create clone from object to another 2290 * create clone from object to another
2332 */ 2291 */
2333object * 2292object *
2334object_create_clone (object *asrc) 2293object::deep_clone ()
2335{ 2294{
2295 assert (("deep_clone called on non-head object", is_head ()));
2296
2336 object *dst = 0; 2297 object *dst = clone ();
2337 2298
2338 if (!asrc)
2339 return 0;
2340
2341 object *src = asrc->head_ ();
2342
2343 object *prev = 0; 2299 object *prev = dst;
2344 for (object *part = src; part; part = part->more) 2300 for (object *part = this->more; part; part = part->more)
2345 { 2301 {
2346 object *tmp = part->clone (); 2302 object *tmp = part->clone ();
2347
2348 tmp->x -= src->x;
2349 tmp->y -= src->y;
2350
2351 if (!part->head)
2352 {
2353 dst = tmp;
2354 tmp->head = 0;
2355 }
2356 else
2357 tmp->head = dst; 2303 tmp->head = dst;
2358
2359 tmp->more = 0;
2360
2361 if (prev)
2362 prev->more = tmp; 2304 prev->more = tmp;
2363
2364 prev = tmp; 2305 prev = tmp;
2365 } 2306 }
2366 2307
2367 for (object *item = src->inv; item; item = item->below) 2308 for (object *item = inv; item; item = item->below)
2368 insert_ob_in_ob (object_create_clone (item), dst); 2309 insert_ob_in_ob (item->deep_clone (), dst);
2369 2310
2370 return dst; 2311 return dst;
2371} 2312}
2372 2313
2373/* This returns the first object in who's inventory that 2314/* This returns the first object in who's inventory that
… …
2382 return tmp; 2323 return tmp;
2383 2324
2384 return 0; 2325 return 0;
2385} 2326}
2386 2327
2387/* If ob has a field named key, return the link from the list, 2328const shstr &
2388 * otherwise return NULL. 2329object::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{ 2330{
2396 for (key_value *link = ob->key_values; link; link = link->next) 2331 for (key_value *kv = key_values; kv; kv = kv->next)
2397 if (link->key == key) 2332 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; 2333 return kv->value;
2432 2334
2433 return 0; 2335 return shstr_null;
2434} 2336}
2435 2337
2436/* 2338void
2437 * Updates the canonical_key in op to value. 2339object::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{ 2340{
2449 key_value *field = NULL, *last = NULL; 2341 for (key_value *kv = key_values; kv; kv = kv->next)
2450 2342 if (kv->key == key)
2451 for (field = op->key_values; field != NULL; field = field->next)
2452 {
2453 if (field->key != canonical_key)
2454 { 2343 {
2455 last = field; 2344 kv->value = value;
2456 continue; 2345 return;
2457 } 2346 }
2458 2347
2459 if (value) 2348 key_value *kv = new key_value;
2460 field->value = value; 2349
2461 else 2350 kv->next = key_values;
2351 kv->key = key;
2352 kv->value = value;
2353
2354 key_values = kv;
2355}
2356
2357void
2358object::kv_del (const shstr &key)
2359{
2360 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2361 if ((*kvp)->key == key)
2462 { 2362 {
2463 /* Basically, if the archetype has this key set, 2363 key_value *kv = *kvp;
2464 * we need to store the null value so when we save 2364 *kvp = (*kvp)->next;
2465 * it, we save the empty value so that when we load, 2365 delete kv;
2466 * we get this value back again. 2366 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 } 2367 }
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} 2368}
2525 2369
2526object::depth_iterator::depth_iterator (object *container) 2370object::depth_iterator::depth_iterator (object *container)
2527: iterator_base (container) 2371: iterator_base (container)
2528{ 2372{
… …
2578{ 2422{
2579 char flagdesc[512]; 2423 char flagdesc[512];
2580 char info2[256 * 4]; 2424 char info2[256 * 4];
2581 char *p = info; 2425 char *p = info;
2582 2426
2583 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2427 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2584 count, 2428 count,
2585 uuid.c_str (), 2429 uuid.c_str (),
2586 &name, 2430 &name,
2587 title ? "\",title:\"" : "", 2431 title ? ",title:\"" : "",
2588 title ? (const char *)title : "", 2432 title ? (const char *)title : "",
2433 title ? "\"" : "",
2589 flag_desc (flagdesc, 512), type); 2434 flag_desc (flagdesc, 512), type);
2590 2435
2591 if (!flag[FLAG_REMOVED] && env) 2436 if (!flag[FLAG_REMOVED] && env)
2592 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2437 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2593 2438

Diff Legend

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