… | |
… | |
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 |
… | |
… | |
235 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
236 | return 0; |
233 | return 0; |
237 | |
234 | |
238 | if ((ob1->flag ^ ob2->flag) |
235 | if ((ob1->flag ^ ob2->flag) |
239 | .reset (FLAG_INV_LOCKED) |
236 | .reset (FLAG_INV_LOCKED) |
240 | .reset (FLAG_CLIENT_SENT) |
|
|
241 | .reset (FLAG_REMOVED) |
237 | .reset (FLAG_REMOVED) |
242 | .any ()) |
238 | .any ()) |
243 | return 0; |
239 | return 0; |
244 | |
240 | |
245 | /* This is really a spellbook check - we should in general |
241 | /* This is really a spellbook check - we should in general |
… | |
… | |
640 | } |
636 | } |
641 | |
637 | |
642 | if (speed < 0) |
638 | if (speed < 0) |
643 | dst->speed_left -= rndm (); |
639 | dst->speed_left -= rndm (); |
644 | |
640 | |
645 | dst->set_speed (dst->speed); |
641 | dst->activate (); |
646 | } |
642 | } |
647 | |
643 | |
648 | void |
644 | void |
649 | object::instantiate () |
645 | object::instantiate () |
650 | { |
646 | { |
… | |
… | |
762 | else if (action == UP_OBJ_INSERT) |
758 | else if (action == UP_OBJ_INSERT) |
763 | { |
759 | { |
764 | // this is likely overkill, TODO: revisit (schmorp) |
760 | // this is likely overkill, TODO: revisit (schmorp) |
765 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
761 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
766 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
762 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
|
|
763 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
764 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
765 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
767 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
768 | || (m.move_off | op->move_off ) != m.move_off |
… | |
… | |
833 | { |
830 | { |
834 | /* If already on active list, don't do anything */ |
831 | /* If already on active list, don't do anything */ |
835 | if (active) |
832 | if (active) |
836 | return; |
833 | return; |
837 | |
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 | |
838 | if (has_active_speed ()) |
838 | if (has_active_speed ()) |
839 | actives.insert (this); |
839 | actives.insert (this); |
840 | } |
840 | } |
841 | |
841 | |
842 | void |
842 | void |
… | |
… | |
983 | x = 1; |
983 | x = 1; |
984 | y = 1; |
984 | y = 1; |
985 | |
985 | |
986 | if (more) |
986 | if (more) |
987 | { |
987 | { |
988 | more->destroy (); |
988 | more->destroy (true); |
989 | more = 0; |
989 | more = 0; |
990 | } |
990 | } |
991 | |
991 | |
992 | head = 0; |
992 | head = 0; |
993 | |
993 | |
… | |
… | |
1114 | *(below ? &below->above : &ms.bot) = above; |
1114 | *(below ? &below->above : &ms.bot) = above; |
1115 | |
1115 | |
1116 | above = 0; |
1116 | above = 0; |
1117 | below = 0; |
1117 | below = 0; |
1118 | |
1118 | |
|
|
1119 | ms.flags_ = 0; |
|
|
1120 | |
1119 | if (map->in_memory == MAP_SAVING) |
1121 | if (map->in_memory == MAP_SAVING) |
1120 | return; |
1122 | return; |
1121 | |
1123 | |
1122 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1124 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1123 | |
1125 | |
… | |
… | |
1155 | } |
1157 | } |
1156 | |
1158 | |
1157 | last = tmp; |
1159 | last = tmp; |
1158 | } |
1160 | } |
1159 | |
1161 | |
1160 | /* last == NULL if there are no objects on this space */ |
|
|
1161 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1162 | if (!last) |
|
|
1163 | map->at (x, y).flags_ = 0; |
|
|
1164 | else |
|
|
1165 | update_object (last, UP_OBJ_REMOVE); |
|
|
1166 | |
|
|
1167 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1162 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1168 | update_all_los (map, x, y); |
1163 | update_all_los (map, x, y); |
1169 | } |
1164 | } |
1170 | } |
1165 | } |
1171 | |
1166 | |
… | |
… | |
1196 | esrv_update_item (UPD_NROF, pl, top); |
1191 | esrv_update_item (UPD_NROF, pl, top); |
1197 | |
1192 | |
1198 | op->weight = 0; // cancel the addition above |
1193 | op->weight = 0; // cancel the addition above |
1199 | op->carrying = 0; // must be 0 already |
1194 | op->carrying = 0; // must be 0 already |
1200 | |
1195 | |
1201 | op->destroy (1); |
1196 | op->destroy (true); |
1202 | |
1197 | |
1203 | return top; |
1198 | return top; |
1204 | } |
1199 | } |
1205 | |
1200 | |
1206 | return 0; |
1201 | return 0; |
… | |
… | |
1280 | { |
1275 | { |
1281 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1276 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1282 | op->remove (); |
1277 | op->remove (); |
1283 | } |
1278 | } |
1284 | |
1279 | |
1285 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1280 | if (m == &freed_map)//D TODO: remove soon |
1286 | {//D |
1281 | {//D |
1287 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
1282 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1288 | op->face = 1;//D |
|
|
1289 | }//D |
1283 | }//D |
1290 | |
1284 | |
1291 | /* Ideally, the caller figures this out. However, it complicates a lot |
1285 | /* Ideally, the caller figures this out. However, it complicates a lot |
1292 | * of areas of callers (eg, anything that uses find_free_spot would now |
1286 | * of areas of callers (eg, anything that uses find_free_spot would now |
1293 | * need extra work |
1287 | * need extra work |
1294 | */ |
1288 | */ |
1295 | if (!xy_normalise (m, op->x, op->y)) |
1289 | if (!xy_normalise (m, op->x, op->y)) |
1296 | { |
1290 | { |
1297 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1291 | op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found |
1298 | return 0; |
1292 | return 0; |
1299 | } |
1293 | } |
1300 | |
1294 | |
1301 | if (object *more = op->more) |
1295 | if (object *more = op->more) |
1302 | if (!insert_ob_in_map (more, m, originator, flag)) |
1296 | if (!insert_ob_in_map (more, m, originator, flag)) |
… | |
… | |
1315 | { |
1309 | { |
1316 | // TODO: we actually want to update tmp, not op, |
1310 | // TODO: we actually want to update tmp, not op, |
1317 | // but some caller surely breaks when we return tmp |
1311 | // but some caller surely breaks when we return tmp |
1318 | // from here :/ |
1312 | // from here :/ |
1319 | op->nrof += tmp->nrof; |
1313 | op->nrof += tmp->nrof; |
1320 | tmp->destroy (1); |
1314 | tmp->destroy (true); |
1321 | } |
1315 | } |
1322 | |
1316 | |
1323 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1317 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1324 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1318 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1325 | |
1319 | |
… | |
… | |
1500 | { |
1494 | { |
1501 | /* first search for itself and remove any old instances */ |
1495 | /* first search for itself and remove any old instances */ |
1502 | |
1496 | |
1503 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1497 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1504 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1498 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1505 | tmp->destroy (1); |
1499 | tmp->destroy (true); |
1506 | |
1500 | |
1507 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1501 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1508 | |
1502 | |
1509 | tmp->x = op->x; |
1503 | tmp->x = op->x; |
1510 | tmp->y = op->y; |
1504 | tmp->y = op->y; |
… | |
… | |
1633 | if (object *pl = tmp->visible_to ()) |
1627 | if (object *pl = tmp->visible_to ()) |
1634 | esrv_update_item (UPD_NROF, pl, tmp); |
1628 | esrv_update_item (UPD_NROF, pl, tmp); |
1635 | |
1629 | |
1636 | adjust_weight (this, op->total_weight ()); |
1630 | adjust_weight (this, op->total_weight ()); |
1637 | |
1631 | |
1638 | op->destroy (1); |
1632 | op->destroy (true); |
1639 | op = tmp; |
1633 | op = tmp; |
1640 | goto inserted; |
1634 | goto inserted; |
1641 | } |
1635 | } |
1642 | |
1636 | |
1643 | op->owner = 0; // it's his/hers now. period. |
1637 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
2492 | |
2486 | |
2493 | #if 0 |
2487 | #if 0 |
2494 | // remove the "Close old_container" object. |
2488 | // remove the "Close old_container" object. |
2495 | if (object *closer = old_container->inv) |
2489 | if (object *closer = old_container->inv) |
2496 | if (closer->type == CLOSE_CON) |
2490 | if (closer->type == CLOSE_CON) |
2497 | closer->destroy (); |
2491 | closer->destroy (true); |
2498 | #endif |
2492 | #endif |
2499 | |
2493 | |
2500 | // make sure the container is available |
2494 | // make sure the container is available |
2501 | esrv_send_item (this, old_container); |
2495 | esrv_send_item (this, old_container); |
2502 | |
2496 | |
… | |
… | |
2558 | |
2552 | |
2559 | void |
2553 | void |
2560 | object::force_add (const shstr name, int duration) |
2554 | object::force_add (const shstr name, int duration) |
2561 | { |
2555 | { |
2562 | if (object *force = force_find (name)) |
2556 | if (object *force = force_find (name)) |
2563 | force->destroy (); |
2557 | force->destroy (true); |
2564 | |
2558 | |
2565 | object *force = get_archetype (FORCE_NAME); |
2559 | object *force = get_archetype (FORCE_NAME); |
2566 | |
2560 | |
2567 | force->slaying = name; |
2561 | force->slaying = name; |
2568 | force->stats.food = 1; |
2562 | force->stats.food = 1; |