… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
207 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
210 | |
211 | if (ob1->arch->name != ob2->arch->name |
211 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
212 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
213 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
214 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
215 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
216 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
217 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
218 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
219 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
220 | || ob1->value != ob2->value |
221 | || 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 |
222 | || ob1->client_type != ob2->client_type |
223 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
224 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
225 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
226 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
227 | || ob1->move_type != ob2->move_type |
… | |
… | |
344 | else |
345 | else |
345 | { |
346 | { |
346 | // maybe there is a player standing on the same mapspace |
347 | // maybe there is a player standing on the same mapspace |
347 | // this will catch the case where "this" is a player |
348 | // this will catch the case where "this" is a player |
348 | if (object *pl = ms ().player ()) |
349 | if (object *pl = ms ().player ()) |
|
|
350 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
349 | if (!pl->container || this == pl->container) |
351 | || this == pl->container) |
350 | return pl; |
352 | return pl; |
351 | } |
353 | } |
352 | } |
354 | } |
353 | |
355 | |
354 | return 0; |
356 | return 0; |
… | |
… | |
478 | */ |
480 | */ |
479 | object * |
481 | object * |
480 | find_object_name (const char *str) |
482 | find_object_name (const char *str) |
481 | { |
483 | { |
482 | shstr_cmp str_ (str); |
484 | shstr_cmp str_ (str); |
483 | object *op; |
|
|
484 | |
485 | |
|
|
486 | if (str_) |
485 | for_all_objects (op) |
487 | for_all_objects (op) |
486 | if (op->name == str_) |
488 | if (op->name == str_) |
487 | break; |
489 | return op; |
488 | |
490 | |
489 | return op; |
491 | return 0; |
490 | } |
492 | } |
491 | |
493 | |
492 | /* |
494 | /* |
493 | * 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 |
494 | * skill and experience objects. |
496 | * skill and experience objects. |
… | |
… | |
760 | else if (action == UP_OBJ_INSERT) |
762 | else if (action == UP_OBJ_INSERT) |
761 | { |
763 | { |
762 | // this is likely overkill, TODO: revisit (schmorp) |
764 | // this is likely overkill, TODO: revisit (schmorp) |
763 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
765 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
764 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
766 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
765 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
|
|
766 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
767 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
768 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
769 | || (m.move_on | op->move_on ) != m.move_on |
770 | || (m.move_on | op->move_on ) != m.move_on |
770 | || (m.move_off | op->move_off ) != m.move_off |
771 | || (m.move_off | op->move_off ) != m.move_off |
771 | || (m.move_slow | op->move_slow) != m.move_slow |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
772 | /* 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 |
773 | * to have move_allow right now. |
774 | * have move_allow right now. |
774 | */ |
775 | */ |
775 | || ((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 |
776 | || 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) |
777 | m.flags_ = 0; |
778 | m.flags_ = 0; |
778 | } |
779 | } |
… | |
… | |
908 | || map->in_memory != MAP_ACTIVE |
909 | || map->in_memory != MAP_ACTIVE |
909 | || map->no_drop |
910 | || map->no_drop |
910 | || ms ().move_block == MOVE_ALL) |
911 | || ms ().move_block == MOVE_ALL) |
911 | { |
912 | { |
912 | while (inv) |
913 | while (inv) |
913 | { |
|
|
914 | inv->destroy_inv (false); |
|
|
915 | inv->destroy (); |
914 | inv->destroy (true); |
916 | } |
|
|
917 | } |
915 | } |
918 | else |
916 | else |
919 | { /* Put objects in inventory onto this space */ |
917 | { /* Put objects in inventory onto this space */ |
920 | while (inv) |
918 | while (inv) |
921 | { |
919 | { |
… | |
… | |
1236 | * job preparing multi-part monsters. |
1234 | * job preparing multi-part monsters. |
1237 | */ |
1235 | */ |
1238 | object * |
1236 | object * |
1239 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1237 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | { |
1238 | { |
|
|
1239 | op->remove (); |
|
|
1240 | |
1241 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1241 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1242 | { |
1242 | { |
1243 | tmp->x = x + tmp->arch->x; |
1243 | tmp->x = x + tmp->arch->x; |
1244 | tmp->y = y + tmp->arch->y; |
1244 | tmp->y = y + tmp->arch->y; |
1245 | } |
1245 | } |
… | |
… | |
1268 | * just 'op' otherwise |
1268 | * just 'op' otherwise |
1269 | */ |
1269 | */ |
1270 | object * |
1270 | object * |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1272 | { |
1272 | { |
|
|
1273 | if (op->is_on_map ()) |
|
|
1274 | { |
|
|
1275 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1276 | abort (); |
|
|
1277 | } |
|
|
1278 | |
|
|
1279 | if (op->env) |
|
|
1280 | { |
|
|
1281 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1273 | 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 |
1274 | |
1290 | |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1291 | /* Ideally, the caller figures this out. However, it complicates a lot |
1276 | * 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 |
1277 | * need extra work |
1293 | * need extra work |
1278 | */ |
1294 | */ |
… | |
… | |
1518 | if (!nr) |
1534 | if (!nr) |
1519 | return true; |
1535 | return true; |
1520 | |
1536 | |
1521 | nr = min (nr, nrof); |
1537 | nr = min (nr, nrof); |
1522 | |
1538 | |
|
|
1539 | if (nrof > nr) |
|
|
1540 | { |
1523 | nrof -= nr; |
1541 | nrof -= nr; |
1524 | |
|
|
1525 | if (nrof) |
|
|
1526 | { |
|
|
1527 | adjust_weight (env, -weight * nr); // carrying == 0 |
1542 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1528 | |
1543 | |
1529 | if (object *pl = visible_to ()) |
1544 | if (object *pl = visible_to ()) |
1530 | esrv_update_item (UPD_NROF, pl, this); |
1545 | esrv_update_item (UPD_NROF, pl, this); |
1531 | |
1546 | |
1532 | return true; |
1547 | return true; |
1533 | } |
1548 | } |
1534 | else |
1549 | else |
1535 | { |
1550 | { |
1536 | destroy (1); |
1551 | destroy (); |
1537 | return false; |
1552 | return false; |
1538 | } |
1553 | } |
1539 | } |
1554 | } |
1540 | |
1555 | |
1541 | /* |
1556 | /* |