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.221 by root, Thu Apr 24 12:06:01 2008 UTC vs.
Revision 1.244 by root, Sun May 18 17:52:53 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 bool is_freed = flag [FLAG_FREED]; 613 dst->remove ();
612 bool is_removed = flag [FLAG_REMOVED];
613
614 *(object_copy *)this = src; 614 *(object_copy *)dst = *this;
615
616 flag [FLAG_FREED] = is_freed;
617 flag [FLAG_REMOVED] = is_removed; 615 dst->flag [FLAG_REMOVED] = true;
618 616
619 /* Copy over key_values, if any. */ 617 /* Copy over key_values, if any. */
620 if (src.key_values) 618 if (key_values)
621 { 619 {
622 key_value *tail = 0; 620 key_value *tail = 0;
623 key_values = 0; 621 dst->key_values = 0;
624 622
625 for (key_value *i = src.key_values; i; i = i->next) 623 for (key_value *i = key_values; i; i = i->next)
626 { 624 {
627 key_value *new_link = new key_value; 625 key_value *new_link = new key_value;
628 626
629 new_link->next = 0; 627 new_link->next = 0;
630 new_link->key = i->key; 628 new_link->key = i->key;
631 new_link->value = i->value; 629 new_link->value = i->value;
632 630
633 /* Try and be clever here, too. */ 631 /* Try and be clever here, too. */
634 if (!key_values) 632 if (!dst->key_values)
635 { 633 {
636 key_values = new_link; 634 dst->key_values = new_link;
637 tail = new_link; 635 tail = new_link;
638 } 636 }
639 else 637 else
640 { 638 {
641 tail->next = new_link; 639 tail->next = new_link;
642 tail = new_link; 640 tail = new_link;
643 } 641 }
644 } 642 }
645 } 643 }
646}
647
648/*
649 * copy_to first frees everything allocated by the dst object,
650 * and then copies the contents of itself into the second
651 * object, allocating what needs to be allocated. Basically, any
652 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
653 * if the first object is freed, the pointers in the new object
654 * will point at garbage.
655 */
656void
657object::copy_to (object *dst)
658{
659 *dst = *this;
660 644
661 if (speed < 0) 645 if (speed < 0)
662 dst->speed_left -= rndm (); 646 dst->speed_left -= rndm ();
663 647
664 dst->set_speed (dst->speed); 648 dst->set_speed (dst->speed);
… …
686object * 670object *
687object::clone () 671object::clone ()
688{ 672{
689 object *neu = create (); 673 object *neu = create ();
690 copy_to (neu); 674 copy_to (neu);
675 neu->map = map; // not copied by copy_to
691 return neu; 676 return neu;
692} 677}
693 678
694/* 679/*
695 * If an object with the IS_TURNABLE() flag needs to be turned due 680 * If an object with the IS_TURNABLE() flag needs to be turned due
… …
746 * UP_OBJ_FACE: only the objects face has changed. 731 * UP_OBJ_FACE: only the objects face has changed.
747 */ 732 */
748void 733void
749update_object (object *op, int action) 734update_object (object *op, int action)
750{ 735{
751 if (op == NULL) 736 if (!op)
752 { 737 {
753 /* this should never happen */ 738 /* this should never happen */
754 LOG (llevDebug, "update_object() called for NULL object.\n"); 739 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
755 return; 740 return;
756 } 741 }
757 742
758 if (op->env) 743 if (!op->is_on_map ())
759 { 744 {
760 /* Animation is currently handled by client, so nothing 745 /* Animation is currently handled by client, so nothing
761 * to do in this case. 746 * to do in this case.
762 */ 747 */
763 return; 748 return;
764 } 749 }
765
766 /* If the map is saving, don't do anything as everything is
767 * going to get freed anyways.
768 */
769 if (!op->map || op->map->in_memory == MAP_SAVING)
770 return;
771 750
772 /* make sure the object is within map boundaries */ 751 /* make sure the object is within map boundaries */
773 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 752 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
774 { 753 {
775 LOG (llevError, "update_object() called for object out of map!\n"); 754 LOG (llevError, "update_object() called for object out of map!\n");
… …
930 * drop on that space. 909 * drop on that space.
931 */ 910 */
932 if (!drop_to_ground 911 if (!drop_to_ground
933 || !map 912 || !map
934 || map->in_memory != MAP_ACTIVE 913 || map->in_memory != MAP_ACTIVE
935 || map->nodrop 914 || map->no_drop
936 || ms ().move_block == MOVE_ALL) 915 || ms ().move_block == MOVE_ALL)
937 { 916 {
938 while (inv) 917 while (inv)
939 { 918 {
940 inv->destroy_inv (false); 919 inv->destroy_inv (false);
… …
965 object *op = new object; 944 object *op = new object;
966 op->link (); 945 op->link ();
967 return op; 946 return op;
968} 947}
969 948
949static struct freed_map : maptile
950{
951 freed_map ()
952 {
953 path = "<freed objects map>";
954 name = "/internal/freed_objects_map";
955 width = 3;
956 height = 3;
957 no_drop = 1;
958 no_reset = 1;
959
960 alloc ();
961 in_memory = MAP_ACTIVE;
962 }
963
964 ~freed_map ()
965 {
966 destroy ();
967 }
968} freed_map; // freed objects are moved here to avoid crashes
969
970void 970void
971object::do_destroy () 971object::do_destroy ()
972{ 972{
973 if (flag [FLAG_IS_LINKED]) 973 if (flag [FLAG_IS_LINKED])
974 remove_button_link (this); 974 remove_button_link (this);
… …
984 unlink (); 984 unlink ();
985 985
986 flag [FLAG_FREED] = 1; 986 flag [FLAG_FREED] = 1;
987 987
988 // hack to ensure that freed objects still have a valid map 988 // hack to ensure that freed objects still have a valid map
989 {
990 static maptile *freed_map; // freed objects are moved here to avoid crashes
991
992 if (!freed_map)
993 {
994 freed_map = new maptile;
995
996 freed_map->path = "<freed objects map>";
997 freed_map->name = "/internal/freed_objects_map";
998 freed_map->width = 3;
999 freed_map->height = 3;
1000 freed_map->nodrop = 1;
1001
1002 freed_map->alloc ();
1003 freed_map->in_memory = MAP_ACTIVE;
1004 }
1005
1006 map = freed_map; 989 map = &freed_map;
1007 x = 1; 990 x = 1;
1008 y = 1; 991 y = 1;
1009 }
1010 992
1011 if (more) 993 if (more)
1012 { 994 {
1013 more->destroy (); 995 more->destroy ();
1014 more = 0; 996 more = 0;
… …
1031 1013
1032 if (!is_head () && !head->destroyed ()) 1014 if (!is_head () && !head->destroyed ())
1033 { 1015 {
1034 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1016 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1035 head->destroy (destroy_inventory); 1017 head->destroy (destroy_inventory);
1018 return;
1036 } 1019 }
1037 1020
1038 destroy_inv (!destroy_inventory); 1021 destroy_inv (!destroy_inventory);
1039 1022
1040 if (is_head ()) 1023 if (is_head ())
… …
1079 if (object *pl = visible_to ()) 1062 if (object *pl = visible_to ())
1080 esrv_del_item (pl->contr, count); 1063 esrv_del_item (pl->contr, count);
1081 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
1082 1065
1083 adjust_weight (env, -total_weight ()); 1066 adjust_weight (env, -total_weight ());
1084
1085 *(above ? &above->below : &env->inv) = below;
1086
1087 if (below)
1088 below->above = above;
1089 1067
1090 /* we set up values so that it could be inserted into 1068 /* we set up values so that it could be inserted into
1091 * 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
1092 * to the caller to decide what we want to do. 1070 * to the caller to decide what we want to do.
1093 */ 1071 */
1094 map = env->map; 1072 map = env->map;
1095 x = env->x; 1073 x = env->x;
1096 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
1097 above = 0; 1080 above = 0;
1098 below = 0; 1081 below = 0;
1099 env = 0; 1082 env = 0;
1100 1083
1101 /* 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
… …
1131 1114
1132 esrv_del_item (pl->contr, count); 1115 esrv_del_item (pl->contr, count);
1133 } 1116 }
1134 1117
1135 /* link the object above us */ 1118 /* link the object above us */
1136 if (above) 1119 // re-link, make sure compiler can easily use cmove
1137 above->below = below; 1120 *(above ? &above->below : &ms.top) = below;
1138 else 1121 *(below ? &below->above : &ms.bot) = above;
1139 ms.top = below; /* we were top, set new top */
1140
1141 /* Relink the object below us, if there is one */
1142 if (below)
1143 below->above = above;
1144 else
1145 {
1146 /* Nothing below, which means we need to relink map object for this space
1147 * use translated coordinates in case some oddness with map tiling is
1148 * evident
1149 */
1150 if (GET_MAP_OB (map, x, y) != this)
1151 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 ());
1152
1153 ms.bot = above; /* goes on above it. */
1154 }
1155 1122
1156 above = 0; 1123 above = 0;
1157 below = 0; 1124 below = 0;
1158 1125
1159 if (map->in_memory == MAP_SAVING) 1126 if (map->in_memory == MAP_SAVING)
… …
1169 * appropriately. 1136 * appropriately.
1170 */ 1137 */
1171 pl->close_container (); 1138 pl->close_container ();
1172 1139
1173 //TODO: the floorbox prev/next might need updating 1140 //TODO: the floorbox prev/next might need updating
1174 esrv_del_item (pl->contr, count); 1141 //esrv_del_item (pl->contr, count);
1142 //TODO: update floorbox to preserve ordering
1143 if (pl->contr->ns)
1144 pl->contr->ns->floorbox_update ();
1175 } 1145 }
1176 1146
1177 for (tmp = ms.bot; tmp; tmp = tmp->above) 1147 for (tmp = ms.bot; tmp; tmp = tmp->above)
1178 { 1148 {
1179 /* No point updating the players look faces if he is the object 1149 /* No point updating the players look faces if he is the object
… …
1271 * job preparing multi-part monsters. 1241 * job preparing multi-part monsters.
1272 */ 1242 */
1273object * 1243object *
1274insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1244insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1275{ 1245{
1246 op->remove ();
1247
1276 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1248 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1277 { 1249 {
1278 tmp->x = x + tmp->arch->x; 1250 tmp->x = x + tmp->arch->x;
1279 tmp->y = y + tmp->arch->y; 1251 tmp->y = y + tmp->arch->y;
1280 } 1252 }
… …
1303 * just 'op' otherwise 1275 * just 'op' otherwise
1304 */ 1276 */
1305object * 1277object *
1306insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1278insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1307{ 1279{
1308 assert (!op->flag [FLAG_FREED]); 1280 if (op->is_on_map ())
1281 {
1282 LOG (llevError, "insert_ob_in_map called for object already on map");
1283 abort ();
1284 }
1309 1285
1286 if (op->env)
1287 {
1288 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1310 op->remove (); 1289 op->remove ();
1290 }
1311 1291
1312 /* Ideally, the caller figures this out. However, it complicates a lot 1292 /* Ideally, the caller figures this out. However, it complicates a lot
1313 * of areas of callers (eg, anything that uses find_free_spot would now 1293 * of areas of callers (eg, anything that uses find_free_spot would now
1314 * need extra work 1294 * need extra work
1315 */ 1295 */
1316 if (!xy_normalise (m, op->x, op->y)) 1296 if (!xy_normalise (m, op->x, op->y))
1317 { 1297 {
1318 op->destroy (1); 1298 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1319 return 0; 1299 return 0;
1320 } 1300 }
1321 1301
1322 if (object *more = op->more) 1302 if (object *more = op->more)
1323 if (!insert_ob_in_map (more, m, originator, flag)) 1303 if (!insert_ob_in_map (more, m, originator, flag))
… …
1332 */ 1312 */
1333 if (op->nrof && !(flag & INS_NO_MERGE)) 1313 if (op->nrof && !(flag & INS_NO_MERGE))
1334 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1314 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1335 if (object::can_merge (op, tmp)) 1315 if (object::can_merge (op, tmp))
1336 { 1316 {
1337 // TODO: we atcually want to update tmp, not op, 1317 // TODO: we actually want to update tmp, not op,
1338 // but some caller surely breaks when we return tmp 1318 // but some caller surely breaks when we return tmp
1339 // from here :/ 1319 // from here :/
1340 op->nrof += tmp->nrof; 1320 op->nrof += tmp->nrof;
1341 tmp->destroy (1); 1321 tmp->destroy (1);
1342 } 1322 }
… …
1353 { 1333 {
1354 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1334 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1355 abort (); 1335 abort ();
1356 } 1336 }
1357 1337
1338 if (!originator->is_on_map ())
1339 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1340 op->debug_desc (), originator->debug_desc ());
1341
1358 op->above = originator; 1342 op->above = originator;
1359 op->below = originator->below; 1343 op->below = originator->below;
1360
1361 if (op->below)
1362 op->below->above = op;
1363 else
1364 ms.bot = op;
1365
1366 /* since *below* originator, no need to update top */
1367 originator->below = op; 1344 originator->below = op;
1345
1346 *(op->below ? &op->below->above : &ms.bot) = op;
1368 } 1347 }
1369 else 1348 else
1370 { 1349 {
1371 object *top, *floor = NULL; 1350 object *floor = 0;
1372 1351 object *top = ms.top;
1373 top = ms.bot;
1374 1352
1375 /* If there are other objects, then */ 1353 /* If there are other objects, then */
1376 if (top) 1354 if (top)
1377 { 1355 {
1378 object *last = 0;
1379
1380 /* 1356 /*
1381 * If there are multiple objects on this space, we do some trickier handling. 1357 * If there are multiple objects on this space, we do some trickier handling.
1382 * We've already dealt with merging if appropriate. 1358 * We've already dealt with merging if appropriate.
1383 * Generally, we want to put the new object on top. But if 1359 * Generally, we want to put the new object on top. But if
1384 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1360 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1387 * once we get to them. This reduces the need to traverse over all of 1363 * once we get to them. This reduces the need to traverse over all of
1388 * them when adding another one - this saves quite a bit of cpu time 1364 * them when adding another one - this saves quite a bit of cpu time
1389 * when lots of spells are cast in one area. Currently, it is presumed 1365 * when lots of spells are cast in one area. Currently, it is presumed
1390 * that flying non pickable objects are spell objects. 1366 * that flying non pickable objects are spell objects.
1391 */ 1367 */
1392 for (top = ms.bot; top; top = top->above) 1368 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1393 { 1369 {
1394 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1370 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1395 floor = top; 1371 floor = tmp;
1396 1372
1397 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1373 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1398 { 1374 {
1399 /* We insert above top, so we want this object below this */ 1375 /* We insert above top, so we want this object below this */
1400 top = top->below; 1376 top = tmp->below;
1401 break; 1377 break;
1402 } 1378 }
1403 1379
1404 last = top; 1380 top = tmp;
1405 } 1381 }
1406
1407 /* Don't want top to be NULL, so set it to the last valid object */
1408 top = last;
1409 1382
1410 /* We let update_position deal with figuring out what the space 1383 /* We let update_position deal with figuring out what the space
1411 * looks like instead of lots of conditions here. 1384 * looks like instead of lots of conditions here.
1412 * makes things faster, and effectively the same result. 1385 * makes things faster, and effectively the same result.
1413 */ 1386 */
… …
1420 */ 1393 */
1421 if (!(flag & INS_ON_TOP) 1394 if (!(flag & INS_ON_TOP)
1422 && ms.flags () & P_BLOCKSVIEW 1395 && ms.flags () & P_BLOCKSVIEW
1423 && (op->face && !faces [op->face].visibility)) 1396 && (op->face && !faces [op->face].visibility))
1424 { 1397 {
1398 object *last;
1399
1425 for (last = top; last != floor; last = last->below) 1400 for (last = top; last != floor; last = last->below)
1426 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1401 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1427 break; 1402 break;
1428 1403
1429 /* Check to see if we found the object that blocks view, 1404 /* Check to see if we found the object that blocks view,
… …
1437 } /* If objects on this space */ 1412 } /* If objects on this space */
1438 1413
1439 if (flag & INS_ABOVE_FLOOR_ONLY) 1414 if (flag & INS_ABOVE_FLOOR_ONLY)
1440 top = floor; 1415 top = floor;
1441 1416
1442 /* Top is the object that our object (op) is going to get inserted above. 1417 // insert object above top, or bottom-most if top = 0
1443 */
1444
1445 /* First object on this space */
1446 if (!top) 1418 if (!top)
1447 { 1419 {
1420 op->below = 0;
1448 op->above = ms.bot; 1421 op->above = ms.bot;
1449
1450 if (op->above)
1451 op->above->below = op;
1452
1453 op->below = 0;
1454 ms.bot = op; 1422 ms.bot = op;
1423
1424 *(op->above ? &op->above->below : &ms.top) = op;
1455 } 1425 }
1456 else 1426 else
1457 { /* get inserted into the stack above top */ 1427 {
1458 op->above = top->above; 1428 op->above = top->above;
1459
1460 if (op->above)
1461 op->above->below = op; 1429 top->above = op;
1462 1430
1463 op->below = top; 1431 op->below = top;
1464 top->above = op; 1432 *(op->above ? &op->above->below : &ms.top) = op;
1465 } 1433 }
1466 1434 }
1467 if (!op->above)
1468 ms.top = op;
1469 } /* else not INS_BELOW_ORIGINATOR */
1470 1435
1471 if (op->type == PLAYER) 1436 if (op->type == PLAYER)
1472 { 1437 {
1473 op->contr->do_los = 1; 1438 op->contr->do_los = 1;
1474 ++op->map->players; 1439 ++op->map->players;
… …
1477 1442
1478 op->map->dirty = true; 1443 op->map->dirty = true;
1479 1444
1480 if (object *pl = ms.player ()) 1445 if (object *pl = ms.player ())
1481 //TODO: the floorbox prev/next might need updating 1446 //TODO: the floorbox prev/next might need updating
1482 esrv_send_item (pl, op); 1447 //esrv_send_item (pl, op);
1448 //TODO: update floorbox to preserve ordering
1449 if (pl->contr->ns)
1450 pl->contr->ns->floorbox_update ();
1483 1451
1484 /* If this object glows, it may affect lighting conditions that are 1452 /* If this object glows, it may affect lighting conditions that are
1485 * visible to others on this map. But update_all_los is really 1453 * visible to others on this map. But update_all_los is really
1486 * an inefficient way to do this, as it means los for all players 1454 * an inefficient way to do this, as it means los for all players
1487 * on the map will get recalculated. The players could very well 1455 * on the map will get recalculated. The players could very well
… …
1607 } 1575 }
1608 else 1576 else
1609 { 1577 {
1610 decrease (nr); 1578 decrease (nr);
1611 1579
1612 object *op = object_create_clone (this); 1580 object *op = deep_clone ();
1613 op->nrof = nr; 1581 op->nrof = nr;
1614 return op; 1582 return op;
1615 } 1583 }
1616} 1584}
1617 1585
… …
1838 LOG (llevError, "Present_arch called outside map.\n"); 1806 LOG (llevError, "Present_arch called outside map.\n");
1839 return NULL; 1807 return NULL;
1840 } 1808 }
1841 1809
1842 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1810 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1843 if (tmp->arch == at) 1811 if (tmp->arch->archname == at->archname)
1844 return tmp; 1812 return tmp;
1845 1813
1846 return NULL; 1814 return NULL;
1847} 1815}
1848 1816
… …
1912 * The first matching object is returned, or NULL if none. 1880 * The first matching object is returned, or NULL if none.
1913 */ 1881 */
1914object * 1882object *
1915present_arch_in_ob (const archetype *at, const object *op) 1883present_arch_in_ob (const archetype *at, const object *op)
1916{ 1884{
1917 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1885 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1918 if (tmp->arch == at) 1886 if (tmp->arch->archname == at->archname)
1919 return tmp; 1887 return tmp;
1920 1888
1921 return NULL; 1889 return NULL;
1922} 1890}
1923 1891
… …
2332 2300
2333/* 2301/*
2334 * create clone from object to another 2302 * create clone from object to another
2335 */ 2303 */
2336object * 2304object *
2337object_create_clone (object *asrc) 2305object::deep_clone ()
2338{ 2306{
2339 object *dst = 0, *tmp, *src, *prev, *item; 2307 assert (("deep_clone called on non-head object", is_head ()));
2340 2308
2341 if (!asrc) 2309 object *dst = clone ();
2342 return 0;
2343 2310
2344 src = asrc->head_ (); 2311 object *prev = dst;
2345
2346 prev = 0;
2347 for (object *part = src; part; part = part->more) 2312 for (object *part = this->more; part; part = part->more)
2348 { 2313 {
2349 tmp = part->clone (); 2314 object *tmp = part->clone ();
2350 tmp->x -= src->x;
2351 tmp->y -= src->y;
2352
2353 if (!part->head)
2354 {
2355 dst = tmp;
2356 tmp->head = 0;
2357 }
2358 else
2359 tmp->head = dst; 2315 tmp->head = dst;
2360
2361 tmp->more = 0;
2362
2363 if (prev)
2364 prev->more = tmp; 2316 prev->more = tmp;
2365
2366 prev = tmp; 2317 prev = tmp;
2367 } 2318 }
2368 2319
2369 for (item = src->inv; item; item = item->below) 2320 for (object *item = inv; item; item = item->below)
2370 insert_ob_in_ob (object_create_clone (item), dst); 2321 insert_ob_in_ob (item->deep_clone (), dst);
2371 2322
2372 return dst; 2323 return dst;
2373} 2324}
2374 2325
2375/* This returns the first object in who's inventory that 2326/* This returns the first object in who's inventory that
… …
2384 return tmp; 2335 return tmp;
2385 2336
2386 return 0; 2337 return 0;
2387} 2338}
2388 2339
2389/* If ob has a field named key, return the link from the list, 2340const shstr &
2390 * otherwise return NULL. 2341object::kv_get (const shstr &key) const
2391 *
2392 * key must be a passed in shared string - otherwise, this won't
2393 * do the desired thing.
2394 */
2395key_value *
2396get_ob_key_link (const object *ob, const char *key)
2397{ 2342{
2398 for (key_value *link = ob->key_values; link; link = link->next) 2343 for (key_value *kv = key_values; kv; kv = kv->next)
2399 if (link->key == key) 2344 if (kv->key == key)
2400 return link;
2401
2402 return 0;
2403}
2404
2405/*
2406 * Returns the value of op has an extra_field for key, or NULL.
2407 *
2408 * The argument doesn't need to be a shared string.
2409 *
2410 * The returned string is shared.
2411 */
2412const char *
2413get_ob_key_value (const object *op, const char *const key)
2414{
2415 key_value *link;
2416 shstr_cmp canonical_key (key);
2417
2418 if (!canonical_key)
2419 {
2420 /* 1. There being a field named key on any object
2421 * implies there'd be a shared string to find.
2422 * 2. Since there isn't, no object has this field.
2423 * 3. Therefore, *this* object doesn't have this field.
2424 */
2425 return 0;
2426 }
2427
2428 /* This is copied from get_ob_key_link() above -
2429 * only 4 lines, and saves the function call overhead.
2430 */
2431 for (link = op->key_values; link; link = link->next)
2432 if (link->key == canonical_key)
2433 return link->value; 2345 return kv->value;
2434 2346
2435 return 0; 2347 return shstr_null;
2436} 2348}
2437 2349
2438/* 2350void
2439 * Updates the canonical_key in op to value. 2351object::kv_set (const shstr &key, const shstr &value)
2440 *
2441 * canonical_key is a shared string (value doesn't have to be).
2442 *
2443 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2444 * keys.
2445 *
2446 * Returns TRUE on success.
2447 */
2448int
2449set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2450{ 2352{
2451 key_value *field = NULL, *last = NULL; 2353 for (key_value *kv = key_values; kv; kv = kv->next)
2452 2354 if (kv->key == key)
2453 for (field = op->key_values; field != NULL; field = field->next)
2454 {
2455 if (field->key != canonical_key)
2456 { 2355 {
2457 last = field; 2356 kv->value = value;
2458 continue; 2357 return;
2459 } 2358 }
2460 2359
2461 if (value) 2360 key_value *kv = new key_value;
2462 field->value = value; 2361
2463 else 2362 kv->next = key_values;
2363 kv->key = key;
2364 kv->value = value;
2365
2366 key_values = kv;
2367}
2368
2369void
2370object::kv_del (const shstr &key)
2371{
2372 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2373 if ((*kvp)->key == key)
2464 { 2374 {
2465 /* Basically, if the archetype has this key set, 2375 key_value *kv = *kvp;
2466 * we need to store the null value so when we save 2376 *kvp = (*kvp)->next;
2467 * it, we save the empty value so that when we load, 2377 delete kv;
2468 * we get this value back again. 2378 return;
2469 */
2470 if (get_ob_key_link (op->arch, canonical_key))
2471 field->value = 0;
2472 else
2473 {
2474 if (last)
2475 last->next = field->next;
2476 else
2477 op->key_values = field->next;
2478
2479 delete field;
2480 }
2481 } 2379 }
2482 return TRUE;
2483 }
2484 /* IF we get here, key doesn't exist */
2485
2486 /* No field, we'll have to add it. */
2487
2488 if (!add_key)
2489 return FALSE;
2490
2491 /* There isn't any good reason to store a null
2492 * value in the key/value list. If the archetype has
2493 * this key, then we should also have it, so shouldn't
2494 * be here. If user wants to store empty strings,
2495 * should pass in ""
2496 */
2497 if (value == NULL)
2498 return TRUE;
2499
2500 field = new key_value;
2501
2502 field->key = canonical_key;
2503 field->value = value;
2504 /* Usual prepend-addition. */
2505 field->next = op->key_values;
2506 op->key_values = field;
2507
2508 return TRUE;
2509}
2510
2511/*
2512 * Updates the key in op to value.
2513 *
2514 * If add_key is FALSE, this will only update existing keys,
2515 * and not add new ones.
2516 * In general, should be little reason FALSE is ever passed in for add_key
2517 *
2518 * Returns TRUE on success.
2519 */
2520int
2521set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2522{
2523 shstr key_ (key);
2524
2525 return set_ob_key_value_s (op, key_, value, add_key);
2526} 2380}
2527 2381
2528object::depth_iterator::depth_iterator (object *container) 2382object::depth_iterator::depth_iterator (object *container)
2529: iterator_base (container) 2383: iterator_base (container)
2530{ 2384{
… …
2580{ 2434{
2581 char flagdesc[512]; 2435 char flagdesc[512];
2582 char info2[256 * 4]; 2436 char info2[256 * 4];
2583 char *p = info; 2437 char *p = info;
2584 2438
2585 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2439 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2586 count, 2440 count,
2587 uuid.c_str (), 2441 uuid.c_str (),
2588 &name, 2442 &name,
2589 title ? "\",title:\"" : "", 2443 title ? ",title:\"" : "",
2590 title ? (const char *)title : "", 2444 title ? (const char *)title : "",
2445 title ? "\"" : "",
2591 flag_desc (flagdesc, 512), type); 2446 flag_desc (flagdesc, 512), type);
2592 2447
2593 if (!flag[FLAG_REMOVED] && env) 2448 if (!flag[FLAG_REMOVED] && env)
2594 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2449 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2595 2450

Diff Legend

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