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.225 by root, Fri May 2 20:28:44 2008 UTC vs.
Revision 1.252 by root, Mon Aug 11 23:23:41 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 *
… …
220 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221 207
222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224 210
225 if (ob1->arch->name != ob2->arch->name 211 if (ob1->arch->archname != ob2->arch->archname
226 || ob1->name != ob2->name 212 || ob1->name != ob2->name
227 || ob1->title != ob2->title 213 || ob1->title != ob2->title
228 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
229 || ob1->weight != ob2->weight 215 || ob1->weight != ob2->weight
230 || ob1->attacktype != ob2->attacktype 216 || ob1->attacktype != ob2->attacktype
231 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
232 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
233 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
234 || ob1->value != ob2->value 220 || ob1->value != ob2->value
235 || ob1->animation_id != ob2->animation_id 221 || ob1->animation_id != ob2->animation_id
222 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236 || ob1->client_type != ob2->client_type 223 || ob1->client_type != ob2->client_type
237 || ob1->materialname != ob2->materialname 224 || ob1->materialname != ob2->materialname
238 || ob1->lore != ob2->lore 225 || ob1->lore != ob2->lore
239 || ob1->subtype != ob2->subtype 226 || ob1->subtype != ob2->subtype
240 || ob1->move_type != ob2->move_type 227 || ob1->move_type != ob2->move_type
… …
358 else 345 else
359 { 346 {
360 // maybe there is a player standing on the same mapspace 347 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player 348 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ()) 349 if (object *pl = ms ().player ())
350 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363 if (!pl->container || this == pl->container) 351 || this == pl->container)
364 return pl; 352 return pl;
365 } 353 }
366 } 354 }
367 355
368 return 0; 356 return 0;
369} 357}
370 358
371// adjust weight per container type ("of holding") 359// adjust weight per container type ("of holding")
372static sint32 360static sint32
373weight_adjust (object *op, sint32 weight) 361weight_adjust_for (object *op, sint32 weight)
374{ 362{
375 return op->type == CONTAINER 363 return op->type == CONTAINER
376 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 364 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377 : weight; 365 : weight;
378} 366}
… …
384static void 372static void
385adjust_weight (object *op, sint32 weight) 373adjust_weight (object *op, sint32 weight)
386{ 374{
387 while (op) 375 while (op)
388 { 376 {
377 // adjust by actual difference to account for rounding errors
378 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389 weight = weight_adjust (op, weight); 379 weight = weight_adjust_for (op, op->carrying)
380 - weight_adjust_for (op, op->carrying - weight);
390 381
391 if (!weight) 382 if (!weight)
392 return; 383 return;
393 384
394 op->carrying += weight; 385 op->carrying += weight;
… …
417 op->update_weight (); 408 op->update_weight ();
418 409
419 sum += op->total_weight (); 410 sum += op->total_weight ();
420 } 411 }
421 412
422 sum = weight_adjust (this, sum); 413 sum = weight_adjust_for (this, sum);
423 414
424 if (sum != carrying) 415 if (sum != carrying)
425 { 416 {
426 carrying = sum; 417 carrying = sum;
427 418
… …
489 */ 480 */
490object * 481object *
491find_object_name (const char *str) 482find_object_name (const char *str)
492{ 483{
493 shstr_cmp str_ (str); 484 shstr_cmp str_ (str);
494 object *op;
495 485
486 if (str_)
496 for_all_objects (op) 487 for_all_objects (op)
497 if (op->name == str_) 488 if (op->name == str_)
498 break; 489 return op;
499 490
500 return op; 491 return 0;
501} 492}
502 493
503/* 494/*
504 * Sets the owner and sets the skill and exp pointers to owner's current 495 * Sets the owner and sets the skill and exp pointers to owner's current
505 * skill and experience objects. 496 * skill and experience objects.
… …
603 } 594 }
604 595
605 op->key_values = 0; 596 op->key_values = 0;
606} 597}
607 598
608object & 599/*
609object::operator =(const object &src) 600 * copy_to first frees everything allocated by the dst object,
601 * and then copies the contents of itself into the second
602 * object, allocating what needs to be allocated. Basically, any
603 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
604 * if the first object is freed, the pointers in the new object
605 * will point at garbage.
606 */
607void
608object::copy_to (object *dst)
610{ 609{
611 remove (); 610 dst->remove ();
612
613 *(object_copy *)this = src; 611 *(object_copy *)dst = *this;
614
615 flag [FLAG_REMOVED] = true; 612 dst->flag [FLAG_REMOVED] = true;
616 613
617 /* Copy over key_values, if any. */ 614 /* Copy over key_values, if any. */
618 if (src.key_values) 615 if (key_values)
619 { 616 {
620 key_value *tail = 0; 617 key_value *tail = 0;
621 key_values = 0; 618 dst->key_values = 0;
622 619
623 for (key_value *i = src.key_values; i; i = i->next) 620 for (key_value *i = key_values; i; i = i->next)
624 { 621 {
625 key_value *new_link = new key_value; 622 key_value *new_link = new key_value;
626 623
627 new_link->next = 0; 624 new_link->next = 0;
628 new_link->key = i->key; 625 new_link->key = i->key;
629 new_link->value = i->value; 626 new_link->value = i->value;
630 627
631 /* Try and be clever here, too. */ 628 /* Try and be clever here, too. */
632 if (!key_values) 629 if (!dst->key_values)
633 { 630 {
634 key_values = new_link; 631 dst->key_values = new_link;
635 tail = new_link; 632 tail = new_link;
636 } 633 }
637 else 634 else
638 { 635 {
639 tail->next = new_link; 636 tail->next = new_link;
640 tail = new_link; 637 tail = new_link;
641 } 638 }
642 } 639 }
643 } 640 }
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 641
659 if (speed < 0) 642 if (speed < 0)
660 dst->speed_left -= rndm (); 643 dst->speed_left -= rndm ();
661 644
662 dst->set_speed (dst->speed); 645 dst->set_speed (dst->speed);
… …
779 else if (action == UP_OBJ_INSERT) 762 else if (action == UP_OBJ_INSERT)
780 { 763 {
781 // this is likely overkill, TODO: revisit (schmorp) 764 // this is likely overkill, TODO: revisit (schmorp)
782 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 765 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
783 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 766 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
784 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
785 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
786 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 768 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 769 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788 || (m.move_on | op->move_on ) != m.move_on 770 || (m.move_on | op->move_on ) != m.move_on
789 || (m.move_off | op->move_off ) != m.move_off 771 || (m.move_off | op->move_off ) != m.move_off
790 || (m.move_slow | op->move_slow) != m.move_slow 772 || (m.move_slow | op->move_slow) != m.move_slow
791 /* This isn't perfect, but I don't expect a lot of objects to 773 /* This isn't perfect, but I don't expect a lot of objects to
792 * to have move_allow right now. 774 * have move_allow right now.
793 */ 775 */
794 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 776 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
795 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 777 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
796 m.flags_ = 0; 778 m.flags_ = 0;
797 } 779 }
… …
923 * drop on that space. 905 * drop on that space.
924 */ 906 */
925 if (!drop_to_ground 907 if (!drop_to_ground
926 || !map 908 || !map
927 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
928 || map->nodrop 910 || map->no_drop
929 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
930 { 912 {
931 while (inv) 913 while (inv)
932 {
933 inv->destroy_inv (false);
934 inv->destroy (); 914 inv->destroy (true);
935 }
936 } 915 }
937 else 916 else
938 { /* Put objects in inventory onto this space */ 917 { /* Put objects in inventory onto this space */
939 while (inv) 918 while (inv)
940 { 919 {
… …
962 941
963static struct freed_map : maptile 942static struct freed_map : maptile
964{ 943{
965 freed_map () 944 freed_map ()
966 { 945 {
967 path = "<freed objects map>"; 946 path = "<freed objects map>";
968 name = "/internal/freed_objects_map"; 947 name = "/internal/freed_objects_map";
969 width = 3; 948 width = 3;
970 height = 3; 949 height = 3;
971 nodrop = 1; 950 no_drop = 1;
951 no_reset = 1;
972 952
973 alloc (); 953 alloc ();
974 in_memory = MAP_ACTIVE; 954 in_memory = MAP_ACTIVE;
955 }
956
957 ~freed_map ()
958 {
959 destroy ();
975 } 960 }
976} freed_map; // freed objects are moved here to avoid crashes 961} freed_map; // freed objects are moved here to avoid crashes
977 962
978void 963void
979object::do_destroy () 964object::do_destroy ()
… …
1070 if (object *pl = visible_to ()) 1055 if (object *pl = visible_to ())
1071 esrv_del_item (pl->contr, count); 1056 esrv_del_item (pl->contr, count);
1072 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1057 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1073 1058
1074 adjust_weight (env, -total_weight ()); 1059 adjust_weight (env, -total_weight ());
1075
1076 *(above ? &above->below : &env->inv) = below;
1077
1078 if (below)
1079 below->above = above;
1080 1060
1081 /* we set up values so that it could be inserted into 1061 /* we set up values so that it could be inserted into
1082 * the map, but we don't actually do that - it is up 1062 * the map, but we don't actually do that - it is up
1083 * to the caller to decide what we want to do. 1063 * to the caller to decide what we want to do.
1084 */ 1064 */
1085 map = env->map; 1065 map = env->map;
1086 x = env->x; 1066 x = env->x;
1087 y = env->y; 1067 y = env->y;
1068
1069 // make sure cmov optimisation is applicable
1070 *(above ? &above->below : &env->inv) = below;
1071 *(below ? &below->above : &above ) = above; // &above is just a dummy
1072
1088 above = 0; 1073 above = 0;
1089 below = 0; 1074 below = 0;
1090 env = 0; 1075 env = 0;
1091 1076
1092 /* NO_FIX_PLAYER is set when a great many changes are being 1077 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1122 1107
1123 esrv_del_item (pl->contr, count); 1108 esrv_del_item (pl->contr, count);
1124 } 1109 }
1125 1110
1126 /* link the object above us */ 1111 /* link the object above us */
1127 if (above) 1112 // re-link, make sure compiler can easily use cmove
1128 above->below = below; 1113 *(above ? &above->below : &ms.top) = below;
1129 else 1114 *(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 1115
1147 above = 0; 1116 above = 0;
1148 below = 0; 1117 below = 0;
1149 1118
1150 if (map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
… …
1160 * appropriately. 1129 * appropriately.
1161 */ 1130 */
1162 pl->close_container (); 1131 pl->close_container ();
1163 1132
1164 //TODO: the floorbox prev/next might need updating 1133 //TODO: the floorbox prev/next might need updating
1165 esrv_del_item (pl->contr, count); 1134 //esrv_del_item (pl->contr, count);
1135 //TODO: update floorbox to preserve ordering
1136 if (pl->contr->ns)
1137 pl->contr->ns->floorbox_update ();
1166 } 1138 }
1167 1139
1168 for (tmp = ms.bot; tmp; tmp = tmp->above) 1140 for (tmp = ms.bot; tmp; tmp = tmp->above)
1169 { 1141 {
1170 /* No point updating the players look faces if he is the object 1142 /* No point updating the players look faces if he is the object
… …
1262 * job preparing multi-part monsters. 1234 * job preparing multi-part monsters.
1263 */ 1235 */
1264object * 1236object *
1265insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1237insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1266{ 1238{
1239 op->remove ();
1240
1267 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1241 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1268 { 1242 {
1269 tmp->x = x + tmp->arch->x; 1243 tmp->x = x + tmp->arch->x;
1270 tmp->y = y + tmp->arch->y; 1244 tmp->y = y + tmp->arch->y;
1271 } 1245 }
… …
1294 * just 'op' otherwise 1268 * just 'op' otherwise
1295 */ 1269 */
1296object * 1270object *
1297insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298{ 1272{
1299 assert (!op->flag [FLAG_FREED]); 1273 if (op->is_on_map ())
1274 {
1275 LOG (llevError, "insert_ob_in_map called for object already on map");
1276 abort ();
1277 }
1300 1278
1279 if (op->env)
1280 {
1281 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1301 op->remove (); 1282 op->remove ();
1283 }
1284
1285 if (op->face && !face_info (op->face))//D TODO: remove soon
1286 {//D
1287 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1288 op->face = 1;//D
1289 }//D
1302 1290
1303 /* Ideally, the caller figures this out. However, it complicates a lot 1291 /* Ideally, the caller figures this out. However, it complicates a lot
1304 * of areas of callers (eg, anything that uses find_free_spot would now 1292 * of areas of callers (eg, anything that uses find_free_spot would now
1305 * need extra work 1293 * need extra work
1306 */ 1294 */
1307 if (!xy_normalise (m, op->x, op->y)) 1295 if (!xy_normalise (m, op->x, op->y))
1308 { 1296 {
1309 op->destroy (1); 1297 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1310 return 0; 1298 return 0;
1311 } 1299 }
1312 1300
1313 if (object *more = op->more) 1301 if (object *more = op->more)
1314 if (!insert_ob_in_map (more, m, originator, flag)) 1302 if (!insert_ob_in_map (more, m, originator, flag))
… …
1323 */ 1311 */
1324 if (op->nrof && !(flag & INS_NO_MERGE)) 1312 if (op->nrof && !(flag & INS_NO_MERGE))
1325 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1313 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1326 if (object::can_merge (op, tmp)) 1314 if (object::can_merge (op, tmp))
1327 { 1315 {
1328 // TODO: we atcually want to update tmp, not op, 1316 // TODO: we actually want to update tmp, not op,
1329 // but some caller surely breaks when we return tmp 1317 // but some caller surely breaks when we return tmp
1330 // from here :/ 1318 // from here :/
1331 op->nrof += tmp->nrof; 1319 op->nrof += tmp->nrof;
1332 tmp->destroy (1); 1320 tmp->destroy (1);
1333 } 1321 }
… …
1344 { 1332 {
1345 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1333 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1346 abort (); 1334 abort ();
1347 } 1335 }
1348 1336
1337 if (!originator->is_on_map ())
1338 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1339 op->debug_desc (), originator->debug_desc ());
1340
1349 op->above = originator; 1341 op->above = originator;
1350 op->below = originator->below; 1342 op->below = originator->below;
1351
1352 if (op->below)
1353 op->below->above = op;
1354 else
1355 ms.bot = op;
1356
1357 /* since *below* originator, no need to update top */
1358 originator->below = op; 1343 originator->below = op;
1344
1345 *(op->below ? &op->below->above : &ms.bot) = op;
1359 } 1346 }
1360 else 1347 else
1361 { 1348 {
1362 object *top, *floor = NULL; 1349 object *floor = 0;
1363 1350 object *top = ms.top;
1364 top = ms.bot;
1365 1351
1366 /* If there are other objects, then */ 1352 /* If there are other objects, then */
1367 if (top) 1353 if (top)
1368 { 1354 {
1369 object *last = 0;
1370
1371 /* 1355 /*
1372 * If there are multiple objects on this space, we do some trickier handling. 1356 * If there are multiple objects on this space, we do some trickier handling.
1373 * We've already dealt with merging if appropriate. 1357 * We've already dealt with merging if appropriate.
1374 * Generally, we want to put the new object on top. But if 1358 * Generally, we want to put the new object on top. But if
1375 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1359 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1378 * once we get to them. This reduces the need to traverse over all of 1362 * once we get to them. This reduces the need to traverse over all of
1379 * them when adding another one - this saves quite a bit of cpu time 1363 * them when adding another one - this saves quite a bit of cpu time
1380 * when lots of spells are cast in one area. Currently, it is presumed 1364 * when lots of spells are cast in one area. Currently, it is presumed
1381 * that flying non pickable objects are spell objects. 1365 * that flying non pickable objects are spell objects.
1382 */ 1366 */
1383 for (top = ms.bot; top; top = top->above) 1367 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1384 { 1368 {
1385 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1369 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1386 floor = top; 1370 floor = tmp;
1387 1371
1388 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1372 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1389 { 1373 {
1390 /* We insert above top, so we want this object below this */ 1374 /* We insert above top, so we want this object below this */
1391 top = top->below; 1375 top = tmp->below;
1392 break; 1376 break;
1393 } 1377 }
1394 1378
1395 last = top; 1379 top = tmp;
1396 } 1380 }
1397
1398 /* Don't want top to be NULL, so set it to the last valid object */
1399 top = last;
1400 1381
1401 /* We let update_position deal with figuring out what the space 1382 /* We let update_position deal with figuring out what the space
1402 * looks like instead of lots of conditions here. 1383 * looks like instead of lots of conditions here.
1403 * makes things faster, and effectively the same result. 1384 * makes things faster, and effectively the same result.
1404 */ 1385 */
… …
1411 */ 1392 */
1412 if (!(flag & INS_ON_TOP) 1393 if (!(flag & INS_ON_TOP)
1413 && ms.flags () & P_BLOCKSVIEW 1394 && ms.flags () & P_BLOCKSVIEW
1414 && (op->face && !faces [op->face].visibility)) 1395 && (op->face && !faces [op->face].visibility))
1415 { 1396 {
1397 object *last;
1398
1416 for (last = top; last != floor; last = last->below) 1399 for (last = top; last != floor; last = last->below)
1417 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1400 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418 break; 1401 break;
1419 1402
1420 /* Check to see if we found the object that blocks view, 1403 /* Check to see if we found the object that blocks view,
… …
1428 } /* If objects on this space */ 1411 } /* If objects on this space */
1429 1412
1430 if (flag & INS_ABOVE_FLOOR_ONLY) 1413 if (flag & INS_ABOVE_FLOOR_ONLY)
1431 top = floor; 1414 top = floor;
1432 1415
1433 /* Top is the object that our object (op) is going to get inserted above. 1416 // insert object above top, or bottom-most if top = 0
1434 */
1435
1436 /* First object on this space */
1437 if (!top) 1417 if (!top)
1438 { 1418 {
1419 op->below = 0;
1439 op->above = ms.bot; 1420 op->above = ms.bot;
1440
1441 if (op->above)
1442 op->above->below = op;
1443
1444 op->below = 0;
1445 ms.bot = op; 1421 ms.bot = op;
1422
1423 *(op->above ? &op->above->below : &ms.top) = op;
1446 } 1424 }
1447 else 1425 else
1448 { /* get inserted into the stack above top */ 1426 {
1449 op->above = top->above; 1427 op->above = top->above;
1450
1451 if (op->above)
1452 op->above->below = op; 1428 top->above = op;
1453 1429
1454 op->below = top; 1430 op->below = top;
1455 top->above = op; 1431 *(op->above ? &op->above->below : &ms.top) = op;
1456 } 1432 }
1457 1433 }
1458 if (!op->above)
1459 ms.top = op;
1460 } /* else not INS_BELOW_ORIGINATOR */
1461 1434
1462 if (op->type == PLAYER) 1435 if (op->type == PLAYER)
1463 { 1436 {
1464 op->contr->do_los = 1; 1437 op->contr->do_los = 1;
1465 ++op->map->players; 1438 ++op->map->players;
… …
1468 1441
1469 op->map->dirty = true; 1442 op->map->dirty = true;
1470 1443
1471 if (object *pl = ms.player ()) 1444 if (object *pl = ms.player ())
1472 //TODO: the floorbox prev/next might need updating 1445 //TODO: the floorbox prev/next might need updating
1473 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 ();
1474 1450
1475 /* If this object glows, it may affect lighting conditions that are 1451 /* If this object glows, it may affect lighting conditions that are
1476 * 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
1477 * 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
1478 * on the map will get recalculated. The players could very well 1454 * on the map will get recalculated. The players could very well
… …
1558 if (!nr) 1534 if (!nr)
1559 return true; 1535 return true;
1560 1536
1561 nr = min (nr, nrof); 1537 nr = min (nr, nrof);
1562 1538
1539 if (nrof > nr)
1540 {
1563 nrof -= nr; 1541 nrof -= nr;
1564
1565 if (nrof)
1566 {
1567 adjust_weight (env, -weight * nr); // carrying == 0 1542 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1568 1543
1569 if (object *pl = visible_to ()) 1544 if (object *pl = visible_to ())
1570 esrv_update_item (UPD_NROF, pl, this); 1545 esrv_update_item (UPD_NROF, pl, this);
1571 1546
1572 return true; 1547 return true;
1573 } 1548 }
1574 else 1549 else
1575 { 1550 {
1576 destroy (1); 1551 destroy ();
1577 return false; 1552 return false;
1578 } 1553 }
1579} 1554}
1580 1555
1581/* 1556/*
… …
1598 } 1573 }
1599 else 1574 else
1600 { 1575 {
1601 decrease (nr); 1576 decrease (nr);
1602 1577
1603 object *op = object_create_clone (this); 1578 object *op = deep_clone ();
1604 op->nrof = nr; 1579 op->nrof = nr;
1605 return op; 1580 return op;
1606 } 1581 }
1607} 1582}
1608 1583
… …
1829 LOG (llevError, "Present_arch called outside map.\n"); 1804 LOG (llevError, "Present_arch called outside map.\n");
1830 return NULL; 1805 return NULL;
1831 } 1806 }
1832 1807
1833 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1808 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1834 if (tmp->arch == at) 1809 if (tmp->arch->archname == at->archname)
1835 return tmp; 1810 return tmp;
1836 1811
1837 return NULL; 1812 return NULL;
1838} 1813}
1839 1814
… …
1903 * The first matching object is returned, or NULL if none. 1878 * The first matching object is returned, or NULL if none.
1904 */ 1879 */
1905object * 1880object *
1906present_arch_in_ob (const archetype *at, const object *op) 1881present_arch_in_ob (const archetype *at, const object *op)
1907{ 1882{
1908 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1883 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1909 if (tmp->arch == at) 1884 if (tmp->arch->archname == at->archname)
1910 return tmp; 1885 return tmp;
1911 1886
1912 return NULL; 1887 return NULL;
1913} 1888}
1914 1889
… …
2323 2298
2324/* 2299/*
2325 * create clone from object to another 2300 * create clone from object to another
2326 */ 2301 */
2327object * 2302object *
2328object_create_clone (object *asrc) 2303object::deep_clone ()
2329{ 2304{
2305 assert (("deep_clone called on non-head object", is_head ()));
2306
2330 object *dst = 0; 2307 object *dst = clone ();
2331 2308
2332 if (!asrc)
2333 return 0;
2334
2335 object *src = asrc->head_ ();
2336
2337 object *prev = 0; 2309 object *prev = dst;
2338 for (object *part = src; part; part = part->more) 2310 for (object *part = this->more; part; part = part->more)
2339 { 2311 {
2340 object *tmp = part->clone (); 2312 object *tmp = part->clone ();
2341
2342 tmp->x -= src->x;
2343 tmp->y -= src->y;
2344
2345 if (!part->head)
2346 {
2347 dst = tmp;
2348 tmp->head = 0;
2349 }
2350 else
2351 tmp->head = dst; 2313 tmp->head = dst;
2352
2353 tmp->more = 0;
2354
2355 if (prev)
2356 prev->more = tmp; 2314 prev->more = tmp;
2357
2358 prev = tmp; 2315 prev = tmp;
2359 } 2316 }
2360 2317
2361 for (object *item = src->inv; item; item = item->below) 2318 for (object *item = inv; item; item = item->below)
2362 insert_ob_in_ob (object_create_clone (item), dst); 2319 insert_ob_in_ob (item->deep_clone (), dst);
2363 2320
2364 return dst; 2321 return dst;
2365} 2322}
2366 2323
2367/* This returns the first object in who's inventory that 2324/* This returns the first object in who's inventory that
… …
2376 return tmp; 2333 return tmp;
2377 2334
2378 return 0; 2335 return 0;
2379} 2336}
2380 2337
2381/* If ob has a field named key, return the link from the list, 2338const shstr &
2382 * otherwise return NULL. 2339object::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 */
2387key_value *
2388get_ob_key_link (const object *ob, const char *key)
2389{ 2340{
2390 for (key_value *link = ob->key_values; link; link = link->next) 2341 for (key_value *kv = key_values; kv; kv = kv->next)
2391 if (link->key == key) 2342 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 */
2404const char *
2405get_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; 2343 return kv->value;
2426 2344
2427 return 0; 2345 return shstr_null;
2428} 2346}
2429 2347
2430/* 2348void
2431 * Updates the canonical_key in op to value. 2349object::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 */
2440int
2441set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2442{ 2350{
2443 key_value *field = NULL, *last = NULL; 2351 for (key_value *kv = key_values; kv; kv = kv->next)
2444 2352 if (kv->key == key)
2445 for (field = op->key_values; field != NULL; field = field->next)
2446 {
2447 if (field->key != canonical_key)
2448 { 2353 {
2449 last = field; 2354 kv->value = value;
2450 continue; 2355 return;
2451 } 2356 }
2452 2357
2453 if (value) 2358 key_value *kv = new key_value;
2454 field->value = value; 2359
2455 else 2360 kv->next = key_values;
2361 kv->key = key;
2362 kv->value = value;
2363
2364 key_values = kv;
2365}
2366
2367void
2368object::kv_del (const shstr &key)
2369{
2370 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2371 if ((*kvp)->key == key)
2456 { 2372 {
2457 /* Basically, if the archetype has this key set, 2373 key_value *kv = *kvp;
2458 * we need to store the null value so when we save 2374 *kvp = (*kvp)->next;
2459 * it, we save the empty value so that when we load, 2375 delete kv;
2460 * we get this value back again. 2376 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 } 2377 }
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 */
2512int
2513set_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} 2378}
2519 2379
2520object::depth_iterator::depth_iterator (object *container) 2380object::depth_iterator::depth_iterator (object *container)
2521: iterator_base (container) 2381: iterator_base (container)
2522{ 2382{
… …
2572{ 2432{
2573 char flagdesc[512]; 2433 char flagdesc[512];
2574 char info2[256 * 4]; 2434 char info2[256 * 4];
2575 char *p = info; 2435 char *p = info;
2576 2436
2577 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2437 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2578 count, 2438 count,
2579 uuid.c_str (), 2439 uuid.c_str (),
2580 &name, 2440 &name,
2581 title ? "\",title:\"" : "", 2441 title ? ",title:\"" : "",
2582 title ? (const char *)title : "", 2442 title ? (const char *)title : "",
2443 title ? "\"" : "",
2583 flag_desc (flagdesc, 512), type); 2444 flag_desc (flagdesc, 512), type);
2584 2445
2585 if (!flag[FLAG_REMOVED] && env) 2446 if (!flag[FLAG_REMOVED] && env)
2586 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2447 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2587 2448

Diff Legend

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