| … | |
… | |
| 792 | |
792 | |
| 793 | object::object () |
793 | object::object () |
| 794 | { |
794 | { |
| 795 | SET_FLAG (this, FLAG_REMOVED); |
795 | SET_FLAG (this, FLAG_REMOVED); |
| 796 | |
796 | |
| 797 | expmul = 1.0; |
797 | //expmul = 1.0; declared const for the time being |
| 798 | face = blank_face; |
798 | face = blank_face; |
| 799 | } |
799 | } |
| 800 | |
800 | |
| 801 | object::~object () |
801 | object::~object () |
| 802 | { |
802 | { |
| … | |
… | |
| 1297 | |
1297 | |
| 1298 | if (object *more = op->more) |
1298 | if (object *more = op->more) |
| 1299 | if (!insert_ob_in_map (more, m, originator, flag)) |
1299 | if (!insert_ob_in_map (more, m, originator, flag)) |
| 1300 | return 0; |
1300 | return 0; |
| 1301 | |
1301 | |
| 1302 | CLEAR_FLAG (op, FLAG_REMOVED); |
1302 | op->flag [FLAG_REMOVED] = false; |
| 1303 | |
1303 | op->env = 0; |
| 1304 | op->map = newmap; |
1304 | op->map = newmap; |
|
|
1305 | |
| 1305 | mapspace &ms = op->ms (); |
1306 | mapspace &ms = op->ms (); |
| 1306 | |
1307 | |
| 1307 | /* this has to be done after we translate the coordinates. |
1308 | /* this has to be done after we translate the coordinates. |
| 1308 | */ |
1309 | */ |
| 1309 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1310 | if (op->nrof && !(flag & INS_NO_MERGE)) |
| … | |
… | |
| 1330 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1331 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
| 1331 | abort (); |
1332 | abort (); |
| 1332 | } |
1333 | } |
| 1333 | |
1334 | |
| 1334 | if (!originator->is_on_map ()) |
1335 | if (!originator->is_on_map ()) |
|
|
1336 | { |
| 1335 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1337 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
| 1336 | op->debug_desc (), originator->debug_desc ()); |
1338 | op->debug_desc (), originator->debug_desc ()); |
|
|
1339 | abort (); |
|
|
1340 | } |
| 1337 | |
1341 | |
| 1338 | op->above = originator; |
1342 | op->above = originator; |
| 1339 | op->below = originator->below; |
1343 | op->below = originator->below; |
| 1340 | originator->below = op; |
1344 | originator->below = op; |
| 1341 | |
1345 | |
