… | |
… | |
186 | || ob1->speed != ob2->speed |
186 | || ob1->speed != ob2->speed |
187 | || ob1->value != ob2->value |
187 | || ob1->value != ob2->value |
188 | || ob1->name != ob2->name) |
188 | || ob1->name != ob2->name) |
189 | return 0; |
189 | return 0; |
190 | |
190 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
191 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * for unsigned overflow (2c), second part checks whether the result |
192 | * is always 0 .. 2**31-1 */ |
193 | * would fit into a 32 bit signed int, which is often used to hold |
193 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
194 | * nrof values. |
|
|
195 | */ |
|
|
196 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
197 | return 0; |
194 | return 0; |
198 | |
195 | |
199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
196 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
200 | * 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 |
201 | * 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 |
… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
203 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
204 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
205 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
206 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
207 | |
211 | if (ob1->arch->name != ob2->arch->name |
208 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
209 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
210 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
211 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
212 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
213 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
214 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
215 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
216 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
217 | || ob1->value != ob2->value |
221 | || 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 |
222 | || ob1->client_type != ob2->client_type |
220 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
221 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
222 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
223 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
224 | || ob1->move_type != ob2->move_type |
… | |
… | |
344 | else |
342 | else |
345 | { |
343 | { |
346 | // maybe there is a player standing on the same mapspace |
344 | // maybe there is a player standing on the same mapspace |
347 | // this will catch the case where "this" is a player |
345 | // this will catch the case where "this" is a player |
348 | if (object *pl = ms ().player ()) |
346 | if (object *pl = ms ().player ()) |
|
|
347 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
349 | if (!pl->container || this == pl->container) |
348 | || this == pl->container) |
350 | return pl; |
349 | return pl; |
351 | } |
350 | } |
352 | } |
351 | } |
353 | |
352 | |
354 | return 0; |
353 | return 0; |
… | |
… | |
478 | */ |
477 | */ |
479 | object * |
478 | object * |
480 | find_object_name (const char *str) |
479 | find_object_name (const char *str) |
481 | { |
480 | { |
482 | shstr_cmp str_ (str); |
481 | shstr_cmp str_ (str); |
483 | object *op; |
|
|
484 | |
482 | |
|
|
483 | if (str_) |
485 | for_all_objects (op) |
484 | for_all_objects (op) |
486 | if (op->name == str_) |
485 | if (op->name == str_) |
487 | break; |
486 | return op; |
488 | |
487 | |
489 | return op; |
488 | return 0; |
490 | } |
489 | } |
491 | |
490 | |
492 | /* |
491 | /* |
493 | * 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 |
494 | * skill and experience objects. |
493 | * skill and experience objects. |
… | |
… | |
768 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
769 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_on | op->move_on ) != m.move_on |
770 | || (m.move_off | op->move_off ) != m.move_off |
769 | || (m.move_off | op->move_off ) != m.move_off |
771 | || (m.move_slow | op->move_slow) != m.move_slow |
770 | || (m.move_slow | op->move_slow) != m.move_slow |
772 | /* 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 |
773 | * to have move_allow right now. |
772 | * have move_allow right now. |
774 | */ |
773 | */ |
775 | || ((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 |
776 | || 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) |
777 | m.flags_ = 0; |
776 | m.flags_ = 0; |
778 | } |
777 | } |
… | |
… | |
908 | || map->in_memory != MAP_ACTIVE |
907 | || map->in_memory != MAP_ACTIVE |
909 | || map->no_drop |
908 | || map->no_drop |
910 | || ms ().move_block == MOVE_ALL) |
909 | || ms ().move_block == MOVE_ALL) |
911 | { |
910 | { |
912 | while (inv) |
911 | while (inv) |
913 | { |
|
|
914 | inv->destroy_inv (false); |
|
|
915 | inv->destroy (); |
912 | inv->destroy (true); |
916 | } |
|
|
917 | } |
913 | } |
918 | else |
914 | else |
919 | { /* Put objects in inventory onto this space */ |
915 | { /* Put objects in inventory onto this space */ |
920 | while (inv) |
916 | while (inv) |
921 | { |
917 | { |
… | |
… | |
1116 | *(below ? &below->above : &ms.bot) = above; |
1112 | *(below ? &below->above : &ms.bot) = above; |
1117 | |
1113 | |
1118 | above = 0; |
1114 | above = 0; |
1119 | below = 0; |
1115 | below = 0; |
1120 | |
1116 | |
|
|
1117 | ms.flags_ = 0; |
|
|
1118 | |
1121 | if (map->in_memory == MAP_SAVING) |
1119 | if (map->in_memory == MAP_SAVING) |
1122 | return; |
1120 | return; |
1123 | |
1121 | |
1124 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1122 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1125 | |
1123 | |
… | |
… | |
1157 | } |
1155 | } |
1158 | |
1156 | |
1159 | last = tmp; |
1157 | last = tmp; |
1160 | } |
1158 | } |
1161 | |
1159 | |
1162 | /* last == NULL if there are no objects on this space */ |
|
|
1163 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1164 | if (!last) |
|
|
1165 | map->at (x, y).flags_ = 0; |
|
|
1166 | else |
|
|
1167 | update_object (last, UP_OBJ_REMOVE); |
|
|
1168 | |
|
|
1169 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1160 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1170 | update_all_los (map, x, y); |
1161 | update_all_los (map, x, y); |
1171 | } |
1162 | } |
1172 | } |
1163 | } |
1173 | |
1164 | |
… | |
… | |
1236 | * job preparing multi-part monsters. |
1227 | * job preparing multi-part monsters. |
1237 | */ |
1228 | */ |
1238 | object * |
1229 | object * |
1239 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1230 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | { |
1231 | { |
|
|
1232 | op->remove (); |
|
|
1233 | |
1241 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1234 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1242 | { |
1235 | { |
1243 | tmp->x = x + tmp->arch->x; |
1236 | tmp->x = x + tmp->arch->x; |
1244 | tmp->y = y + tmp->arch->y; |
1237 | tmp->y = y + tmp->arch->y; |
1245 | } |
1238 | } |
… | |
… | |
1268 | * just 'op' otherwise |
1261 | * just 'op' otherwise |
1269 | */ |
1262 | */ |
1270 | object * |
1263 | object * |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1264 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1272 | { |
1265 | { |
|
|
1266 | if (op->is_on_map ()) |
|
|
1267 | { |
|
|
1268 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1269 | abort (); |
|
|
1270 | } |
|
|
1271 | |
|
|
1272 | if (op->env) |
|
|
1273 | { |
|
|
1274 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1273 | 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 |
1274 | |
1283 | |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1284 | /* 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 |
1285 | * of areas of callers (eg, anything that uses find_free_spot would now |
1277 | * need extra work |
1286 | * need extra work |
1278 | */ |
1287 | */ |
… | |
… | |
1518 | if (!nr) |
1527 | if (!nr) |
1519 | return true; |
1528 | return true; |
1520 | |
1529 | |
1521 | nr = min (nr, nrof); |
1530 | nr = min (nr, nrof); |
1522 | |
1531 | |
|
|
1532 | if (nrof > nr) |
|
|
1533 | { |
1523 | nrof -= nr; |
1534 | nrof -= nr; |
1524 | |
|
|
1525 | if (nrof) |
|
|
1526 | { |
|
|
1527 | adjust_weight (env, -weight * nr); // carrying == 0 |
1535 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1528 | |
1536 | |
1529 | if (object *pl = visible_to ()) |
1537 | if (object *pl = visible_to ()) |
1530 | esrv_update_item (UPD_NROF, pl, this); |
1538 | esrv_update_item (UPD_NROF, pl, this); |
1531 | |
1539 | |
1532 | return true; |
1540 | return true; |
1533 | } |
1541 | } |
1534 | else |
1542 | else |
1535 | { |
1543 | { |
1536 | destroy (1); |
1544 | destroy (); |
1537 | return false; |
1545 | return false; |
1538 | } |
1546 | } |
1539 | } |
1547 | } |
1540 | |
1548 | |
1541 | /* |
1549 | /* |