… | |
… | |
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 | // some objects are unmergable |
|
|
192 | if (!ob1->nrof || !ob2->nrof) |
|
|
193 | return 0; |
|
|
194 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
195 | /* Do not merge objects if nrof would overflow. First part checks |
192 | * for unsigned overflow (2c), second part checks whether the result |
196 | * for unsigned overflow (2c), second part checks whether the result |
193 | * would fit into a 32 bit signed int, which is often used to hold |
197 | * would fit into a 32 bit signed int, which is often used to hold |
194 | * nrof values. |
198 | * nrof values. |
195 | */ |
199 | */ |
… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
210 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
211 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
212 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
213 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
214 | |
211 | if (ob1->arch->name != ob2->arch->name |
215 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
216 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
217 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
218 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
219 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
220 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
221 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
222 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
223 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
224 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
225 | || ob1->animation_id != ob2->animation_id |
|
|
226 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
222 | || ob1->client_type != ob2->client_type |
227 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
228 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
229 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
230 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
231 | || ob1->move_type != ob2->move_type |
… | |
… | |
478 | */ |
483 | */ |
479 | object * |
484 | object * |
480 | find_object_name (const char *str) |
485 | find_object_name (const char *str) |
481 | { |
486 | { |
482 | shstr_cmp str_ (str); |
487 | shstr_cmp str_ (str); |
483 | object *op; |
|
|
484 | |
488 | |
|
|
489 | if (str_) |
485 | for_all_objects (op) |
490 | for_all_objects (op) |
486 | if (op->name == str_) |
491 | if (op->name == str_) |
487 | break; |
492 | return op; |
488 | |
493 | |
489 | return op; |
494 | return 0; |
490 | } |
495 | } |
491 | |
496 | |
492 | /* |
497 | /* |
493 | * Sets the owner and sets the skill and exp pointers to owner's current |
498 | * Sets the owner and sets the skill and exp pointers to owner's current |
494 | * skill and experience objects. |
499 | * skill and experience objects. |
… | |
… | |
1236 | * job preparing multi-part monsters. |
1241 | * job preparing multi-part monsters. |
1237 | */ |
1242 | */ |
1238 | object * |
1243 | object * |
1239 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1244 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1240 | { |
1245 | { |
|
|
1246 | op->remove (); |
|
|
1247 | |
1241 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1248 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1242 | { |
1249 | { |
1243 | tmp->x = x + tmp->arch->x; |
1250 | tmp->x = x + tmp->arch->x; |
1244 | tmp->y = y + tmp->arch->y; |
1251 | tmp->y = y + tmp->arch->y; |
1245 | } |
1252 | } |
… | |
… | |
1268 | * just 'op' otherwise |
1275 | * just 'op' otherwise |
1269 | */ |
1276 | */ |
1270 | object * |
1277 | object * |
1271 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1278 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1272 | { |
1279 | { |
|
|
1280 | if (op->is_on_map ()) |
|
|
1281 | { |
|
|
1282 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1283 | abort (); |
|
|
1284 | } |
|
|
1285 | |
|
|
1286 | if (op->env) |
|
|
1287 | { |
|
|
1288 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
1273 | op->remove (); |
1289 | op->remove (); |
|
|
1290 | } |
|
|
1291 | |
|
|
1292 | if (op->face && !face_info (op->face))//D TODO: remove soon |
|
|
1293 | {//D |
|
|
1294 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
|
|
1295 | op->face = 1;//D |
|
|
1296 | }//D |
1274 | |
1297 | |
1275 | /* Ideally, the caller figures this out. However, it complicates a lot |
1298 | /* 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 |
1299 | * of areas of callers (eg, anything that uses find_free_spot would now |
1277 | * need extra work |
1300 | * need extra work |
1278 | */ |
1301 | */ |
… | |
… | |
1310 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1333 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1311 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1334 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1312 | |
1335 | |
1313 | if (flag & INS_BELOW_ORIGINATOR) |
1336 | if (flag & INS_BELOW_ORIGINATOR) |
1314 | { |
1337 | { |
1315 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ()) |
1338 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1316 | { |
1339 | { |
1317 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1340 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1318 | abort (); |
1341 | abort (); |
1319 | } |
1342 | } |
|
|
1343 | |
|
|
1344 | if (!originator->is_on_map ()) |
|
|
1345 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1346 | op->debug_desc (), originator->debug_desc ()); |
1320 | |
1347 | |
1321 | op->above = originator; |
1348 | op->above = originator; |
1322 | op->below = originator->below; |
1349 | op->below = originator->below; |
1323 | originator->below = op; |
1350 | originator->below = op; |
1324 | |
1351 | |
… | |
… | |
1391 | } /* If objects on this space */ |
1418 | } /* If objects on this space */ |
1392 | |
1419 | |
1393 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1420 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1394 | top = floor; |
1421 | top = floor; |
1395 | |
1422 | |
1396 | /* Top is the object that our object (op) is going to get inserted above. |
1423 | // insert object above top, or bottom-most if top = 0 |
1397 | */ |
|
|
1398 | |
|
|
1399 | /* no top found, insert on top */ |
|
|
1400 | if (!top) |
1424 | if (!top) |
1401 | { |
1425 | { |
1402 | op->above = 0; |
1426 | op->below = 0; |
1403 | op->below = ms.top; |
1427 | op->above = ms.bot; |
1404 | ms.top = op; |
1428 | ms.bot = op; |
1405 | |
1429 | |
1406 | *(op->below ? &op->below->above : &ms.bot) = op; |
1430 | *(op->above ? &op->above->below : &ms.top) = op; |
1407 | } |
1431 | } |
1408 | else |
1432 | else |
1409 | { /* get inserted into the stack above top */ |
1433 | { |
1410 | op->above = top->above; |
1434 | op->above = top->above; |
1411 | top->above = op; |
1435 | top->above = op; |
1412 | |
1436 | |
1413 | op->below = top; |
1437 | op->below = top; |
1414 | *(op->above ? &op->above->below : &ms.top) = op; |
1438 | *(op->above ? &op->above->below : &ms.top) = op; |
1415 | } |
1439 | } |
1416 | } /* else not INS_BELOW_ORIGINATOR */ |
1440 | } |
1417 | |
1441 | |
1418 | if (op->type == PLAYER) |
1442 | if (op->type == PLAYER) |
1419 | { |
1443 | { |
1420 | op->contr->do_los = 1; |
1444 | op->contr->do_los = 1; |
1421 | ++op->map->players; |
1445 | ++op->map->players; |
… | |
… | |
2416 | { |
2440 | { |
2417 | char flagdesc[512]; |
2441 | char flagdesc[512]; |
2418 | char info2[256 * 4]; |
2442 | char info2[256 * 4]; |
2419 | char *p = info; |
2443 | char *p = info; |
2420 | |
2444 | |
2421 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2445 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2422 | count, |
2446 | count, |
2423 | uuid.c_str (), |
2447 | uuid.c_str (), |
2424 | &name, |
2448 | &name, |
2425 | title ? "\",title:\"" : "", |
2449 | title ? ",title:\"" : "", |
2426 | title ? (const char *)title : "", |
2450 | title ? (const char *)title : "", |
|
|
2451 | title ? "\"" : "", |
2427 | flag_desc (flagdesc, 512), type); |
2452 | flag_desc (flagdesc, 512), type); |
2428 | |
2453 | |
2429 | if (!flag[FLAG_REMOVED] && env) |
2454 | if (!flag[FLAG_REMOVED] && env) |
2430 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2455 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2431 | |
2456 | |