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

Diff Legend

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