| … | |
… | |
| 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. |
| … | |
… | |
| 904 | * drop on that space. |
909 | * drop on that space. |
| 905 | */ |
910 | */ |
| 906 | if (!drop_to_ground |
911 | if (!drop_to_ground |
| 907 | || !map |
912 | || !map |
| 908 | || map->in_memory != MAP_ACTIVE |
913 | || map->in_memory != MAP_ACTIVE |
| 909 | || map->nodrop |
914 | || map->no_drop |
| 910 | || ms ().move_block == MOVE_ALL) |
915 | || ms ().move_block == MOVE_ALL) |
| 911 | { |
916 | { |
| 912 | while (inv) |
917 | while (inv) |
| 913 | { |
918 | { |
| 914 | inv->destroy_inv (false); |
919 | inv->destroy_inv (false); |
| … | |
… | |
| 943 | |
948 | |
| 944 | static struct freed_map : maptile |
949 | static struct freed_map : maptile |
| 945 | { |
950 | { |
| 946 | freed_map () |
951 | freed_map () |
| 947 | { |
952 | { |
| 948 | path = "<freed objects map>"; |
953 | path = "<freed objects map>"; |
| 949 | name = "/internal/freed_objects_map"; |
954 | name = "/internal/freed_objects_map"; |
| 950 | width = 3; |
955 | width = 3; |
| 951 | height = 3; |
956 | height = 3; |
| 952 | nodrop = 1; |
957 | no_drop = 1; |
|
|
958 | no_reset = 1; |
| 953 | |
959 | |
| 954 | alloc (); |
960 | alloc (); |
| 955 | in_memory = MAP_ACTIVE; |
961 | in_memory = MAP_ACTIVE; |
| 956 | } |
962 | } |
| 957 | |
963 | |
| … | |
… | |
| 1056 | if (object *pl = visible_to ()) |
1062 | if (object *pl = visible_to ()) |
| 1057 | esrv_del_item (pl->contr, count); |
1063 | esrv_del_item (pl->contr, count); |
| 1058 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1064 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
| 1059 | |
1065 | |
| 1060 | adjust_weight (env, -total_weight ()); |
1066 | adjust_weight (env, -total_weight ()); |
| 1061 | |
|
|
| 1062 | *(above ? &above->below : &env->inv) = below; |
|
|
| 1063 | |
|
|
| 1064 | if (below) |
|
|
| 1065 | below->above = above; |
|
|
| 1066 | |
1067 | |
| 1067 | /* we set up values so that it could be inserted into |
1068 | /* we set up values so that it could be inserted into |
| 1068 | * the map, but we don't actually do that - it is up |
1069 | * the map, but we don't actually do that - it is up |
| 1069 | * to the caller to decide what we want to do. |
1070 | * to the caller to decide what we want to do. |
| 1070 | */ |
1071 | */ |
| 1071 | map = env->map; |
1072 | map = env->map; |
| 1072 | x = env->x; |
1073 | x = env->x; |
| 1073 | y = env->y; |
1074 | y = env->y; |
|
|
1075 | |
|
|
1076 | // make sure cmov optimisation is applicable |
|
|
1077 | *(above ? &above->below : &env->inv) = below; |
|
|
1078 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1079 | |
| 1074 | above = 0; |
1080 | above = 0; |
| 1075 | below = 0; |
1081 | below = 0; |
| 1076 | env = 0; |
1082 | env = 0; |
| 1077 | |
1083 | |
| 1078 | /* NO_FIX_PLAYER is set when a great many changes are being |
1084 | /* NO_FIX_PLAYER is set when a great many changes are being |
| … | |
… | |
| 1108 | |
1114 | |
| 1109 | esrv_del_item (pl->contr, count); |
1115 | esrv_del_item (pl->contr, count); |
| 1110 | } |
1116 | } |
| 1111 | |
1117 | |
| 1112 | /* link the object above us */ |
1118 | /* link the object above us */ |
| 1113 | if (above) |
1119 | // re-link, make sure compiler can easily use cmove |
| 1114 | above->below = below; |
1120 | *(above ? &above->below : &ms.top) = below; |
| 1115 | else |
1121 | *(below ? &below->above : &ms.bot) = above; |
| 1116 | ms.top = below; /* we were top, set new top */ |
|
|
| 1117 | |
|
|
| 1118 | /* Relink the object below us, if there is one */ |
|
|
| 1119 | if (below) |
|
|
| 1120 | below->above = above; |
|
|
| 1121 | else |
|
|
| 1122 | ms.bot = above; |
|
|
| 1123 | |
1122 | |
| 1124 | above = 0; |
1123 | above = 0; |
| 1125 | below = 0; |
1124 | below = 0; |
| 1126 | |
1125 | |
| 1127 | if (map->in_memory == MAP_SAVING) |
1126 | if (map->in_memory == MAP_SAVING) |
| … | |
… | |
| 1274 | * just 'op' otherwise |
1273 | * just 'op' otherwise |
| 1275 | */ |
1274 | */ |
| 1276 | object * |
1275 | object * |
| 1277 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1276 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
| 1278 | { |
1277 | { |
| 1279 | assert (!op->flag [FLAG_FREED]); |
|
|
| 1280 | |
|
|
| 1281 | op->remove (); |
1278 | op->remove (); |
| 1282 | |
1279 | |
| 1283 | /* Ideally, the caller figures this out. However, it complicates a lot |
1280 | /* Ideally, the caller figures this out. However, it complicates a lot |
| 1284 | * of areas of callers (eg, anything that uses find_free_spot would now |
1281 | * of areas of callers (eg, anything that uses find_free_spot would now |
| 1285 | * need extra work |
1282 | * need extra work |
| … | |
… | |
| 1303 | */ |
1300 | */ |
| 1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1301 | if (op->nrof && !(flag & INS_NO_MERGE)) |
| 1305 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1302 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
| 1306 | if (object::can_merge (op, tmp)) |
1303 | if (object::can_merge (op, tmp)) |
| 1307 | { |
1304 | { |
| 1308 | // TODO: we atcually want to update tmp, not op, |
1305 | // TODO: we actually want to update tmp, not op, |
| 1309 | // but some caller surely breaks when we return tmp |
1306 | // but some caller surely breaks when we return tmp |
| 1310 | // from here :/ |
1307 | // from here :/ |
| 1311 | op->nrof += tmp->nrof; |
1308 | op->nrof += tmp->nrof; |
| 1312 | tmp->destroy (1); |
1309 | tmp->destroy (1); |
| 1313 | } |
1310 | } |
| … | |
… | |
| 1324 | { |
1321 | { |
| 1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1322 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
| 1326 | abort (); |
1323 | abort (); |
| 1327 | } |
1324 | } |
| 1328 | |
1325 | |
|
|
1326 | if (!originator->is_on_map ()) |
|
|
1327 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1328 | op->debug_desc (), originator->debug_desc ()); |
|
|
1329 | |
| 1329 | op->above = originator; |
1330 | op->above = originator; |
| 1330 | op->below = originator->below; |
1331 | op->below = originator->below; |
| 1331 | |
|
|
| 1332 | if (op->below) |
|
|
| 1333 | op->below->above = op; |
|
|
| 1334 | else |
|
|
| 1335 | ms.bot = op; |
|
|
| 1336 | |
|
|
| 1337 | /* since *below* originator, no need to update top */ |
|
|
| 1338 | originator->below = op; |
1332 | originator->below = op; |
|
|
1333 | |
|
|
1334 | *(op->below ? &op->below->above : &ms.bot) = op; |
| 1339 | } |
1335 | } |
| 1340 | else |
1336 | else |
| 1341 | { |
1337 | { |
| 1342 | object *top, *floor = NULL; |
1338 | object *floor = 0; |
| 1343 | |
1339 | object *top = ms.top; |
| 1344 | top = ms.bot; |
|
|
| 1345 | |
1340 | |
| 1346 | /* If there are other objects, then */ |
1341 | /* If there are other objects, then */ |
| 1347 | if (top) |
1342 | if (top) |
| 1348 | { |
1343 | { |
| 1349 | object *last = 0; |
|
|
| 1350 | |
|
|
| 1351 | /* |
1344 | /* |
| 1352 | * If there are multiple objects on this space, we do some trickier handling. |
1345 | * If there are multiple objects on this space, we do some trickier handling. |
| 1353 | * We've already dealt with merging if appropriate. |
1346 | * We've already dealt with merging if appropriate. |
| 1354 | * Generally, we want to put the new object on top. But if |
1347 | * Generally, we want to put the new object on top. But if |
| 1355 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1348 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
| … | |
… | |
| 1358 | * once we get to them. This reduces the need to traverse over all of |
1351 | * once we get to them. This reduces the need to traverse over all of |
| 1359 | * them when adding another one - this saves quite a bit of cpu time |
1352 | * them when adding another one - this saves quite a bit of cpu time |
| 1360 | * when lots of spells are cast in one area. Currently, it is presumed |
1353 | * when lots of spells are cast in one area. Currently, it is presumed |
| 1361 | * that flying non pickable objects are spell objects. |
1354 | * that flying non pickable objects are spell objects. |
| 1362 | */ |
1355 | */ |
| 1363 | for (top = ms.bot; top; top = top->above) |
1356 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
| 1364 | { |
1357 | { |
| 1365 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1358 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
| 1366 | floor = top; |
1359 | floor = tmp; |
| 1367 | |
1360 | |
| 1368 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1361 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
| 1369 | { |
1362 | { |
| 1370 | /* We insert above top, so we want this object below this */ |
1363 | /* We insert above top, so we want this object below this */ |
| 1371 | top = top->below; |
1364 | top = tmp->below; |
| 1372 | break; |
1365 | break; |
| 1373 | } |
1366 | } |
| 1374 | |
1367 | |
| 1375 | last = top; |
1368 | top = tmp; |
| 1376 | } |
1369 | } |
| 1377 | |
|
|
| 1378 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
| 1379 | top = last; |
|
|
| 1380 | |
1370 | |
| 1381 | /* We let update_position deal with figuring out what the space |
1371 | /* We let update_position deal with figuring out what the space |
| 1382 | * looks like instead of lots of conditions here. |
1372 | * looks like instead of lots of conditions here. |
| 1383 | * makes things faster, and effectively the same result. |
1373 | * makes things faster, and effectively the same result. |
| 1384 | */ |
1374 | */ |
| … | |
… | |
| 1391 | */ |
1381 | */ |
| 1392 | if (!(flag & INS_ON_TOP) |
1382 | if (!(flag & INS_ON_TOP) |
| 1393 | && ms.flags () & P_BLOCKSVIEW |
1383 | && ms.flags () & P_BLOCKSVIEW |
| 1394 | && (op->face && !faces [op->face].visibility)) |
1384 | && (op->face && !faces [op->face].visibility)) |
| 1395 | { |
1385 | { |
|
|
1386 | object *last; |
|
|
1387 | |
| 1396 | for (last = top; last != floor; last = last->below) |
1388 | for (last = top; last != floor; last = last->below) |
| 1397 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1389 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
| 1398 | break; |
1390 | break; |
| 1399 | |
1391 | |
| 1400 | /* Check to see if we found the object that blocks view, |
1392 | /* Check to see if we found the object that blocks view, |
| … | |
… | |
| 1408 | } /* If objects on this space */ |
1400 | } /* If objects on this space */ |
| 1409 | |
1401 | |
| 1410 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1402 | if (flag & INS_ABOVE_FLOOR_ONLY) |
| 1411 | top = floor; |
1403 | top = floor; |
| 1412 | |
1404 | |
| 1413 | /* Top is the object that our object (op) is going to get inserted above. |
1405 | // insert object above top, or bottom-most if top = 0 |
| 1414 | */ |
|
|
| 1415 | |
|
|
| 1416 | /* First object on this space */ |
|
|
| 1417 | if (!top) |
1406 | if (!top) |
| 1418 | { |
1407 | { |
|
|
1408 | op->below = 0; |
| 1419 | op->above = ms.bot; |
1409 | op->above = ms.bot; |
| 1420 | |
|
|
| 1421 | if (op->above) |
|
|
| 1422 | op->above->below = op; |
|
|
| 1423 | |
|
|
| 1424 | op->below = 0; |
|
|
| 1425 | ms.bot = op; |
1410 | ms.bot = op; |
|
|
1411 | |
|
|
1412 | *(op->above ? &op->above->below : &ms.top) = op; |
| 1426 | } |
1413 | } |
| 1427 | else |
1414 | else |
| 1428 | { /* get inserted into the stack above top */ |
1415 | { |
| 1429 | op->above = top->above; |
1416 | op->above = top->above; |
| 1430 | |
|
|
| 1431 | if (op->above) |
|
|
| 1432 | op->above->below = op; |
1417 | top->above = op; |
| 1433 | |
1418 | |
| 1434 | op->below = top; |
1419 | op->below = top; |
| 1435 | top->above = op; |
1420 | *(op->above ? &op->above->below : &ms.top) = op; |
| 1436 | } |
1421 | } |
| 1437 | |
1422 | } |
| 1438 | if (!op->above) |
|
|
| 1439 | ms.top = op; |
|
|
| 1440 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
| 1441 | |
1423 | |
| 1442 | if (op->type == PLAYER) |
1424 | if (op->type == PLAYER) |
| 1443 | { |
1425 | { |
| 1444 | op->contr->do_los = 1; |
1426 | op->contr->do_los = 1; |
| 1445 | ++op->map->players; |
1427 | ++op->map->players; |
| … | |
… | |
| 2440 | { |
2422 | { |
| 2441 | char flagdesc[512]; |
2423 | char flagdesc[512]; |
| 2442 | char info2[256 * 4]; |
2424 | char info2[256 * 4]; |
| 2443 | char *p = info; |
2425 | char *p = info; |
| 2444 | |
2426 | |
| 2445 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2427 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
| 2446 | count, |
2428 | count, |
| 2447 | uuid.c_str (), |
2429 | uuid.c_str (), |
| 2448 | &name, |
2430 | &name, |
| 2449 | title ? "\",title:\"" : "", |
2431 | title ? ",title:\"" : "", |
| 2450 | title ? (const char *)title : "", |
2432 | title ? (const char *)title : "", |
|
|
2433 | title ? "\"" : "", |
| 2451 | flag_desc (flagdesc, 512), type); |
2434 | flag_desc (flagdesc, 512), type); |
| 2452 | |
2435 | |
| 2453 | if (!flag[FLAG_REMOVED] && env) |
2436 | if (!flag[FLAG_REMOVED] && env) |
| 2454 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2437 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
| 2455 | |
2438 | |
