… | |
… | |
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 |
… | |
… | |
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
235 | return 0; |
233 | return 0; |
236 | |
234 | |
237 | if ((ob1->flag ^ ob2->flag) |
235 | if ((ob1->flag ^ ob2->flag) |
238 | .reset (FLAG_INV_LOCKED) |
236 | .reset (FLAG_INV_LOCKED) |
239 | .reset (FLAG_CLIENT_SENT) |
|
|
240 | .reset (FLAG_REMOVED) |
237 | .reset (FLAG_REMOVED) |
241 | .any ()) |
238 | .any ()) |
242 | return 0; |
239 | return 0; |
243 | |
240 | |
244 | /* This is really a spellbook check - we should in general |
241 | /* This is really a spellbook check - we should in general |
… | |
… | |
344 | else |
341 | else |
345 | { |
342 | { |
346 | // maybe there is a player standing on the same mapspace |
343 | // maybe there is a player standing on the same mapspace |
347 | // this will catch the case where "this" is a player |
344 | // this will catch the case where "this" is a player |
348 | if (object *pl = ms ().player ()) |
345 | if (object *pl = ms ().player ()) |
|
|
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
349 | if (!pl->container || this == pl->container) |
347 | || this == pl->container) |
350 | return pl; |
348 | return pl; |
351 | } |
349 | } |
352 | } |
350 | } |
353 | |
351 | |
354 | return 0; |
352 | return 0; |
… | |
… | |
478 | */ |
476 | */ |
479 | object * |
477 | object * |
480 | find_object_name (const char *str) |
478 | find_object_name (const char *str) |
481 | { |
479 | { |
482 | shstr_cmp str_ (str); |
480 | shstr_cmp str_ (str); |
483 | object *op; |
|
|
484 | |
481 | |
|
|
482 | if (str_) |
485 | for_all_objects (op) |
483 | for_all_objects (op) |
486 | if (op->name == str_) |
484 | if (op->name == str_) |
487 | break; |
485 | return op; |
488 | |
486 | |
489 | return op; |
487 | return 0; |
490 | } |
488 | } |
491 | |
489 | |
492 | /* |
490 | /* |
493 | * Sets the owner and sets the skill and exp pointers to owner's current |
491 | * Sets the owner and sets the skill and exp pointers to owner's current |
494 | * skill and experience objects. |
492 | * skill and experience objects. |
… | |
… | |
638 | } |
636 | } |
639 | |
637 | |
640 | if (speed < 0) |
638 | if (speed < 0) |
641 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
642 | |
640 | |
643 | dst->set_speed (dst->speed); |
641 | dst->activate (); |
644 | } |
642 | } |
645 | |
643 | |
646 | void |
644 | void |
647 | object::instantiate () |
645 | object::instantiate () |
648 | { |
646 | { |
… | |
… | |
768 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
769 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
770 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
771 | || (m.move_slow | op->move_slow) != m.move_slow |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
772 | /* This isn't perfect, but I don't expect a lot of objects to |
770 | /* This isn't perfect, but I don't expect a lot of objects to |
773 | * to have move_allow right now. |
771 | * have move_allow right now. |
774 | */ |
772 | */ |
775 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
773 | || ((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) |
774 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
777 | m.flags_ = 0; |
775 | m.flags_ = 0; |
778 | } |
776 | } |
… | |
… | |
832 | { |
830 | { |
833 | /* If already on active list, don't do anything */ |
831 | /* If already on active list, don't do anything */ |
834 | if (active) |
832 | if (active) |
835 | return; |
833 | return; |
836 | |
834 | |
|
|
835 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
836 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
|
|
837 | |
837 | if (has_active_speed ()) |
838 | if (has_active_speed ()) |
838 | actives.insert (this); |
839 | actives.insert (this); |
839 | } |
840 | } |
840 | |
841 | |
841 | void |
842 | void |
… | |
… | |
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 (); |
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 | { |
… | |
… | |
925 | || op->flag [FLAG_NO_DROP] |
923 | || op->flag [FLAG_NO_DROP] |
926 | || op->type == RUNE |
924 | || op->type == RUNE |
927 | || op->type == TRAP |
925 | || op->type == TRAP |
928 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_IS_A_TEMPLATE] |
929 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
930 | op->destroy (true); |
928 | op->destroy (); |
931 | else |
929 | else |
932 | map->insert (op, x, y); |
930 | map->insert (op, x, y); |
933 | } |
931 | } |
934 | } |
932 | } |
935 | } |
933 | } |
… | |
… | |
999 | attacked_by = 0; |
997 | attacked_by = 0; |
1000 | current_weapon = 0; |
998 | current_weapon = 0; |
1001 | } |
999 | } |
1002 | |
1000 | |
1003 | void |
1001 | void |
1004 | object::destroy (bool destroy_inventory) |
1002 | object::destroy () |
1005 | { |
1003 | { |
1006 | if (destroyed ()) |
1004 | if (destroyed ()) |
1007 | return; |
1005 | return; |
1008 | |
1006 | |
1009 | if (!is_head () && !head->destroyed ()) |
1007 | if (!is_head () && !head->destroyed ()) |
1010 | { |
1008 | { |
1011 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1009 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1012 | head->destroy (destroy_inventory); |
1010 | head->destroy (); |
1013 | return; |
1011 | return; |
1014 | } |
1012 | } |
1015 | |
1013 | |
1016 | destroy_inv (!destroy_inventory); |
1014 | destroy_inv (false); |
1017 | |
1015 | |
1018 | if (is_head ()) |
1016 | if (is_head ()) |
1019 | if (sound_destroy) |
1017 | if (sound_destroy) |
1020 | play_sound (sound_destroy); |
1018 | play_sound (sound_destroy); |
1021 | else if (flag [FLAG_MONSTER]) |
1019 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1116 | *(below ? &below->above : &ms.bot) = above; |
1114 | *(below ? &below->above : &ms.bot) = above; |
1117 | |
1115 | |
1118 | above = 0; |
1116 | above = 0; |
1119 | below = 0; |
1117 | below = 0; |
1120 | |
1118 | |
|
|
1119 | ms.flags_ = 0; |
|
|
1120 | |
1121 | if (map->in_memory == MAP_SAVING) |
1121 | if (map->in_memory == MAP_SAVING) |
1122 | return; |
1122 | return; |
1123 | |
1123 | |
1124 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1124 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1125 | |
1125 | |
… | |
… | |
1157 | } |
1157 | } |
1158 | |
1158 | |
1159 | last = tmp; |
1159 | last = tmp; |
1160 | } |
1160 | } |
1161 | |
1161 | |
1162 | /* last == NULL if there are no objects on this space */ |
1162 | if (map->darkness && (glow_radius || flag [FLAG_BLOCKSVIEW])) |
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) |
|
|
1170 | update_all_los (map, x, y); |
1163 | update_all_los (map, x, y); |
1171 | } |
1164 | } |
1172 | } |
1165 | } |
1173 | |
1166 | |
1174 | /* |
1167 | /* |
… | |
… | |
1198 | esrv_update_item (UPD_NROF, pl, top); |
1191 | esrv_update_item (UPD_NROF, pl, top); |
1199 | |
1192 | |
1200 | op->weight = 0; // cancel the addition above |
1193 | op->weight = 0; // cancel the addition above |
1201 | op->carrying = 0; // must be 0 already |
1194 | op->carrying = 0; // must be 0 already |
1202 | |
1195 | |
1203 | op->destroy (1); |
1196 | op->destroy (); |
1204 | |
1197 | |
1205 | return top; |
1198 | return top; |
1206 | } |
1199 | } |
1207 | |
1200 | |
1208 | return 0; |
1201 | return 0; |
… | |
… | |
1236 | * job preparing multi-part monsters. |
1229 | * job preparing multi-part monsters. |
1237 | */ |
1230 | */ |
1238 | object * |
1231 | object * |
1239 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1232 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | { |
1233 | { |
|
|
1234 | op->remove (); |
|
|
1235 | |
1241 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1236 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1242 | { |
1237 | { |
1243 | tmp->x = x + tmp->arch->x; |
1238 | tmp->x = x + tmp->arch->x; |
1244 | tmp->y = y + tmp->arch->y; |
1239 | tmp->y = y + tmp->arch->y; |
1245 | } |
1240 | } |
… | |
… | |
1270 | object * |
1265 | object * |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1266 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1272 | { |
1267 | { |
1273 | op->remove (); |
1268 | op->remove (); |
1274 | |
1269 | |
|
|
1270 | if (m == &freed_map)//D TODO: remove soon |
|
|
1271 | {//D |
|
|
1272 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1273 | }//D |
|
|
1274 | |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1275 | /* 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 |
1276 | * of areas of callers (eg, anything that uses find_free_spot would now |
1277 | * need extra work |
1277 | * need extra work |
1278 | */ |
1278 | */ |
1279 | if (!xy_normalise (m, op->x, op->y)) |
1279 | if (!xy_normalise (m, op->x, op->y)) |
1280 | { |
1280 | { |
1281 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1281 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1282 | return 0; |
1282 | return 0; |
1283 | } |
1283 | } |
1284 | |
1284 | |
1285 | if (object *more = op->more) |
1285 | if (object *more = op->more) |
1286 | if (!insert_ob_in_map (more, m, originator, flag)) |
1286 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1299 | { |
1299 | { |
1300 | // TODO: we actually want to update tmp, not op, |
1300 | // TODO: we actually want to update tmp, not op, |
1301 | // but some caller surely breaks when we return tmp |
1301 | // but some caller surely breaks when we return tmp |
1302 | // from here :/ |
1302 | // from here :/ |
1303 | op->nrof += tmp->nrof; |
1303 | op->nrof += tmp->nrof; |
1304 | tmp->destroy (1); |
1304 | tmp->destroy (); |
1305 | } |
1305 | } |
1306 | |
1306 | |
1307 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1307 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1308 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1308 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1309 | |
1309 | |
… | |
… | |
1439 | * be far away from this change and not affected in any way - |
1439 | * be far away from this change and not affected in any way - |
1440 | * this should get redone to only look for players within range, |
1440 | * this should get redone to only look for players within range, |
1441 | * or just updating the P_UPTODATE for spaces within this area |
1441 | * or just updating the P_UPTODATE for spaces within this area |
1442 | * of effect may be sufficient. |
1442 | * of effect may be sufficient. |
1443 | */ |
1443 | */ |
1444 | if (op->map->darkness && (op->glow_radius != 0)) |
1444 | if (op->map->darkness && (op->glow_radius || op->flag [FLAG_BLOCKSVIEW])) |
1445 | update_all_los (op->map, op->x, op->y); |
1445 | update_all_los (op->map, op->x, op->y); |
1446 | |
1446 | |
1447 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1447 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1448 | update_object (op, UP_OBJ_INSERT); |
1448 | update_object (op, UP_OBJ_INSERT); |
1449 | |
1449 | |
… | |
… | |
1484 | { |
1484 | { |
1485 | /* first search for itself and remove any old instances */ |
1485 | /* first search for itself and remove any old instances */ |
1486 | |
1486 | |
1487 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1487 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1488 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1488 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1489 | tmp->destroy (1); |
1489 | tmp->destroy (); |
1490 | |
1490 | |
1491 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1491 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1492 | |
1492 | |
1493 | tmp->x = op->x; |
1493 | tmp->x = op->x; |
1494 | tmp->y = op->y; |
1494 | tmp->y = op->y; |
… | |
… | |
1518 | if (!nr) |
1518 | if (!nr) |
1519 | return true; |
1519 | return true; |
1520 | |
1520 | |
1521 | nr = min (nr, nrof); |
1521 | nr = min (nr, nrof); |
1522 | |
1522 | |
|
|
1523 | if (nrof > nr) |
|
|
1524 | { |
1523 | nrof -= nr; |
1525 | nrof -= nr; |
1524 | |
|
|
1525 | if (nrof) |
|
|
1526 | { |
|
|
1527 | adjust_weight (env, -weight * nr); // carrying == 0 |
1526 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1528 | |
1527 | |
1529 | if (object *pl = visible_to ()) |
1528 | if (object *pl = visible_to ()) |
1530 | esrv_update_item (UPD_NROF, pl, this); |
1529 | esrv_update_item (UPD_NROF, pl, this); |
1531 | |
1530 | |
1532 | return true; |
1531 | return true; |
1533 | } |
1532 | } |
1534 | else |
1533 | else |
1535 | { |
1534 | { |
1536 | destroy (1); |
1535 | destroy (); |
1537 | return false; |
1536 | return false; |
1538 | } |
1537 | } |
1539 | } |
1538 | } |
1540 | |
1539 | |
1541 | /* |
1540 | /* |
… | |
… | |
1618 | if (object *pl = tmp->visible_to ()) |
1617 | if (object *pl = tmp->visible_to ()) |
1619 | esrv_update_item (UPD_NROF, pl, tmp); |
1618 | esrv_update_item (UPD_NROF, pl, tmp); |
1620 | |
1619 | |
1621 | adjust_weight (this, op->total_weight ()); |
1620 | adjust_weight (this, op->total_weight ()); |
1622 | |
1621 | |
1623 | op->destroy (1); |
1622 | op->destroy (); |
1624 | op = tmp; |
1623 | op = tmp; |
1625 | goto inserted; |
1624 | goto inserted; |
1626 | } |
1625 | } |
1627 | |
1626 | |
1628 | op->owner = 0; // it's his/hers now. period. |
1627 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1962 | * head of the object should correspond for the entire object. |
1961 | * head of the object should correspond for the entire object. |
1963 | */ |
1962 | */ |
1964 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1963 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1965 | continue; |
1964 | continue; |
1966 | |
1965 | |
1967 | if (ob->blocked (m, pos.x, pos.y)) |
1966 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1968 | continue; |
1967 | continue; |
1969 | |
1968 | |
1970 | altern [index++] = i; |
1969 | altern [index++] = i; |
1971 | } |
1970 | } |
1972 | |
1971 | |