… | |
… | |
69 | static int maxfree[SIZEOFFREE] = { |
69 | static int maxfree[SIZEOFFREE] = { |
70 | 0, |
70 | 0, |
71 | 9, 10, 13, 14, 17, 18, 21, 22, |
71 | 9, 10, 13, 14, 17, 18, 21, 22, |
72 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
72 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
73 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
73 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
74 | }; |
|
|
75 | |
|
|
76 | const char *wall_suffix[16] = { |
|
|
77 | "0", |
|
|
78 | "1_3", |
|
|
79 | "1_4", |
|
|
80 | "2_1_2", |
|
|
81 | "1_2", |
|
|
82 | "2_2_4", |
|
|
83 | "2_2_1", |
|
|
84 | "3_1", |
|
|
85 | "1_1", |
|
|
86 | "2_2_3", |
|
|
87 | "2_2_2", |
|
|
88 | "3_3", |
|
|
89 | "2_1_1", |
|
|
90 | "3_4", |
|
|
91 | "3_2", |
|
|
92 | "4" |
74 | }; |
93 | }; |
75 | |
94 | |
76 | static void |
95 | static void |
77 | write_uuid (uval64 skip, bool sync) |
96 | write_uuid (uval64 skip, bool sync) |
78 | { |
97 | { |
… | |
… | |
426 | |
445 | |
427 | return 0; |
446 | return 0; |
428 | } |
447 | } |
429 | |
448 | |
430 | // adjust weight per container type ("of holding") |
449 | // adjust weight per container type ("of holding") |
431 | static sint32 |
450 | static uint32 |
432 | weight_adjust_for (object *op, sint32 weight) |
451 | weight_adjust_for (object *op, uint32 weight) |
433 | { |
452 | { |
434 | return op->type == CONTAINER |
453 | return op->type == CONTAINER |
435 | ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) |
454 | ? weight - weight * op->stats.Str / 100 |
436 | : weight; |
455 | : weight; |
437 | } |
456 | } |
438 | |
457 | |
439 | /* |
458 | /* |
440 | * adjust_weight(object, weight) adds the specified weight to an object, |
459 | * subtracts, then adds, the specified weight to an object, |
441 | * and also updates how much the environment(s) is/are carrying. |
460 | * and also updates how much the environment(s) is/are carrying. |
442 | */ |
461 | */ |
443 | static void |
462 | static void |
444 | adjust_weight (object *op, sint32 weight) |
463 | adjust_weight (object *op, sint32 sub, sint32 add) |
445 | { |
464 | { |
446 | while (op) |
465 | while (op) |
447 | { |
466 | { |
448 | // adjust by actual difference to account for rounding errors |
467 | sint32 ocarrying = op->carrying; |
449 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
|
|
450 | weight = weight_adjust_for (op, op->carrying) |
|
|
451 | - weight_adjust_for (op, op->carrying - weight); |
|
|
452 | |
468 | |
453 | if (!weight) |
469 | op->carrying -= weight_adjust_for (op, sub); |
454 | return; |
470 | op->carrying += weight_adjust_for (op, add); |
455 | |
|
|
456 | op->carrying += weight; |
|
|
457 | |
471 | |
458 | if (object *pl = op->visible_to ()) |
472 | if (object *pl = op->visible_to ()) |
459 | if (pl != op) // player is handled lazily |
473 | if (pl != op) // player is handled lazily |
460 | esrv_update_item (UPD_WEIGHT, pl, op); |
474 | esrv_update_item (UPD_WEIGHT, pl, op); |
461 | |
475 | |
|
|
476 | sub = ocarrying; |
|
|
477 | add = op->carrying; |
|
|
478 | |
462 | op = op->env; |
479 | op = op->env; |
463 | } |
480 | } |
464 | } |
481 | } |
465 | |
482 | |
466 | /* |
483 | /* |
… | |
… | |
473 | { |
490 | { |
474 | sint32 sum = 0; |
491 | sint32 sum = 0; |
475 | |
492 | |
476 | for (object *op = inv; op; op = op->below) |
493 | for (object *op = inv; op; op = op->below) |
477 | { |
494 | { |
478 | if (op->inv) |
|
|
479 | op->update_weight (); |
495 | op->update_weight (); |
480 | |
496 | |
481 | sum += op->total_weight (); |
497 | sum += weight_adjust_for (this, op->total_weight ()); |
482 | } |
498 | } |
483 | |
|
|
484 | sum = weight_adjust_for (this, sum); |
|
|
485 | |
499 | |
486 | if (sum != carrying) |
500 | if (sum != carrying) |
487 | { |
501 | { |
488 | if (carrying != sum)//D |
502 | if (carrying != sum && carrying)//D |
489 | LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n", |
503 | LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n", |
490 | (long long)sum, (long long)carrying, debug_desc ()); |
504 | (long long)sum, (long long)carrying, debug_desc ()); |
491 | |
505 | |
492 | carrying = sum; |
506 | carrying = sum; |
493 | |
507 | |
494 | if (object *pl = visible_to ()) |
508 | if (object *pl = visible_to ()) |
… | |
… | |
1144 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1158 | flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed |
1145 | if (object *pl = visible_to ()) |
1159 | if (object *pl = visible_to ()) |
1146 | esrv_del_item (pl->contr, count); |
1160 | esrv_del_item (pl->contr, count); |
1147 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1161 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1148 | |
1162 | |
1149 | adjust_weight (env, -total_weight ()); |
1163 | adjust_weight (env, total_weight (), 0); |
1150 | |
1164 | |
1151 | object *pl = in_player (); |
1165 | object *pl = in_player (); |
1152 | |
1166 | |
1153 | /* we set up values so that it could be inserted into |
1167 | /* we set up values so that it could be inserted into |
1154 | * the map, but we don't actually do that - it is up |
1168 | * the map, but we don't actually do that - it is up |
… | |
… | |
1168 | |
1182 | |
1169 | if (pl && pl->is_player ()) |
1183 | if (pl && pl->is_player ()) |
1170 | { |
1184 | { |
1171 | if (expect_false (pl->contr->combat_ob == this)) |
1185 | if (expect_false (pl->contr->combat_ob == this)) |
1172 | { |
1186 | { |
1173 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY); |
1187 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
1174 | pl->contr->combat_ob = 0; |
1188 | pl->contr->combat_ob = 0; |
1175 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
1189 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
1176 | } |
1190 | } |
1177 | |
1191 | |
1178 | if (expect_false (pl->contr->ranged_ob == this)) |
1192 | if (expect_false (pl->contr->ranged_ob == this)) |
1179 | { |
1193 | { |
1180 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); |
1194 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE); |
1181 | pl->contr->ranged_ob = 0; |
1195 | pl->contr->ranged_ob = 0; |
1182 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
1196 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
1183 | } |
1197 | } |
1184 | |
1198 | |
1185 | pl->contr->queue_stats_update (); |
1199 | pl->contr->queue_stats_update (); |
… | |
… | |
1572 | */ |
1586 | */ |
1573 | |
1587 | |
1574 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1588 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1575 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1589 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1576 | { |
1590 | { |
1577 | if (check_move_on (op, originator)) |
1591 | if (check_move_on (op, originator, flag)) |
1578 | return 0; |
1592 | return 0; |
1579 | |
1593 | |
1580 | /* If we are a multi part object, lets work our way through the check |
1594 | /* If we are a multi part object, let's work our way through the check |
1581 | * walk on's. |
1595 | * walk on's. |
1582 | */ |
1596 | */ |
1583 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1597 | for (object *tmp = op->more; tmp; tmp = tmp->more) |
1584 | if (check_move_on (tmp, originator)) |
1598 | if (check_move_on (tmp, originator, flag)) |
1585 | return 0; |
1599 | return 0; |
1586 | } |
1600 | } |
1587 | |
1601 | |
1588 | return op; |
1602 | return op; |
1589 | } |
1603 | } |
… | |
… | |
1655 | |
1669 | |
1656 | nr = min (nr, nrof); |
1670 | nr = min (nr, nrof); |
1657 | |
1671 | |
1658 | if (nrof > nr) |
1672 | if (nrof > nr) |
1659 | { |
1673 | { |
|
|
1674 | sint64 oweight = total_weight (); |
|
|
1675 | |
1660 | nrof -= nr; |
1676 | nrof -= nr; |
1661 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
|
|
1662 | |
1677 | |
1663 | if (object *pl = visible_to ()) |
1678 | if (object *pl = visible_to ()) |
1664 | esrv_update_item (UPD_NROF, pl, this); |
1679 | esrv_update_item (UPD_NROF, pl, this); |
|
|
1680 | |
|
|
1681 | adjust_weight (env, oweight, total_weight ()); |
1665 | |
1682 | |
1666 | return true; |
1683 | return true; |
1667 | } |
1684 | } |
1668 | else |
1685 | else |
1669 | { |
1686 | { |
… | |
… | |
1744 | if (op->nrof) |
1761 | if (op->nrof) |
1745 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1762 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1746 | if (object::can_merge (tmp, op)) |
1763 | if (object::can_merge (tmp, op)) |
1747 | { |
1764 | { |
1748 | /* return the original object and remove inserted object |
1765 | /* return the original object and remove inserted object |
1749 | (client needs the original object) */ |
1766 | (client prefers the original object) */ |
|
|
1767 | |
|
|
1768 | // carring must be 0 for mergable objects |
|
|
1769 | sint64 oweight = tmp->weight * tmp->nrof; |
|
|
1770 | |
1750 | tmp->nrof += op->nrof; |
1771 | tmp->nrof += op->nrof; |
1751 | |
1772 | |
1752 | if (object *pl = tmp->visible_to ()) |
1773 | if (object *pl = tmp->visible_to ()) |
1753 | esrv_update_item (UPD_NROF, pl, tmp); |
1774 | esrv_update_item (UPD_NROF, pl, tmp); |
1754 | |
1775 | |
1755 | adjust_weight (this, op->total_weight ()); |
1776 | adjust_weight (this, oweight, tmp->weight * tmp->nrof); |
1756 | |
1777 | |
1757 | op->destroy (); |
1778 | op->destroy (); |
1758 | op = tmp; |
1779 | op = tmp; |
1759 | goto inserted; |
1780 | goto inserted; |
1760 | } |
1781 | } |
… | |
… | |
1776 | op->flag [FLAG_REMOVED] = 0; |
1797 | op->flag [FLAG_REMOVED] = 0; |
1777 | |
1798 | |
1778 | if (object *pl = op->visible_to ()) |
1799 | if (object *pl = op->visible_to ()) |
1779 | esrv_send_item (pl, op); |
1800 | esrv_send_item (pl, op); |
1780 | |
1801 | |
1781 | adjust_weight (this, op->total_weight ()); |
1802 | adjust_weight (this, 0, op->total_weight ()); |
1782 | |
1803 | |
1783 | inserted: |
1804 | inserted: |
1784 | /* reset the light list and los of the players on the map */ |
1805 | /* reset the light list and los of the players on the map */ |
1785 | if (op->glow_radius && is_on_map ()) |
1806 | if (op->glow_radius && is_on_map ()) |
1786 | { |
1807 | { |
… | |
… | |
1815 | * MSW 2001-07-08: Check all objects on space, not just those below |
1836 | * MSW 2001-07-08: Check all objects on space, not just those below |
1816 | * object being inserted. insert_ob_in_map may not put new objects |
1837 | * object being inserted. insert_ob_in_map may not put new objects |
1817 | * on top. |
1838 | * on top. |
1818 | */ |
1839 | */ |
1819 | int |
1840 | int |
1820 | check_move_on (object *op, object *originator) |
1841 | check_move_on (object *op, object *originator, int flags) |
1821 | { |
1842 | { |
1822 | if (op->flag [FLAG_NO_APPLY]) |
1843 | if (op->flag [FLAG_NO_APPLY]) |
1823 | return 0; |
1844 | return 0; |
1824 | |
1845 | |
1825 | object *tmp; |
1846 | object *tmp; |
… | |
… | |
1884 | |
1905 | |
1885 | /* Basically same logic as above, except now for actual apply. */ |
1906 | /* Basically same logic as above, except now for actual apply. */ |
1886 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1907 | if ((!op->move_type && tmp->move_on & MOVE_WALK) || |
1887 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1908 | ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) |
1888 | { |
1909 | { |
|
|
1910 | if ((flags & INS_NO_AUTO_EXIT) |
|
|
1911 | && (tmp->type == EXIT || tmp->type == TELEPORTER |
|
|
1912 | || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead |
|
|
1913 | continue; |
|
|
1914 | |
1889 | move_apply (tmp, op, originator); |
1915 | move_apply (tmp, op, originator); |
1890 | |
1916 | |
1891 | if (op->destroyed ()) |
1917 | if (op->destroyed ()) |
1892 | return 1; |
1918 | return 1; |
1893 | |
1919 | |
… | |
… | |
2218 | { |
2244 | { |
2219 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2245 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2220 | } |
2246 | } |
2221 | |
2247 | |
2222 | /* |
2248 | /* |
2223 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2249 | * find_dir_2(delta-x,delta-y) will return a direction value |
2224 | * an object which has subtracted the x and y coordinates of another |
2250 | * for running into direct [dx, dy]. |
2225 | * object, needs to travel toward it. |
2251 | * (the opposite of crossfire's find_dir_2!) |
2226 | */ |
2252 | */ |
2227 | int |
2253 | int |
2228 | find_dir_2 (int x, int y) |
2254 | find_dir_2 (int x, int y) |
2229 | { |
2255 | { |
|
|
2256 | #if 1 // new algorithm |
|
|
2257 | // this works by putting x, y into 16 sectors, which |
|
|
2258 | // are not equal sized, but are a better approximation |
|
|
2259 | // then the old algorithm, and then using a mapping |
|
|
2260 | // table to map it into a direction value. |
|
|
2261 | // basically, it maps these comparisons to each bit |
|
|
2262 | // bit #3: x < 0 |
|
|
2263 | // bit #2: y < 0 |
|
|
2264 | // bit #1: x > y |
|
|
2265 | // bit #0: x > 2y |
|
|
2266 | |
|
|
2267 | static const uint8 dir[16] = { |
|
|
2268 | 4, 5, 4, 3, |
|
|
2269 | 2, 1, 2, 3, |
|
|
2270 | 6, 5, 6, 7, |
|
|
2271 | 8, 1, 8, 7, |
|
|
2272 | }; |
|
|
2273 | int sector = 0; |
|
|
2274 | |
|
|
2275 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2276 | sector |= x < 0 ? 8 : 0; |
|
|
2277 | x = x < 0 ? -x : x; // abs |
|
|
2278 | |
|
|
2279 | sector |= y < 0 ? 4 : 0; |
|
|
2280 | y = y < 0 ? -y : y; // abs |
|
|
2281 | |
|
|
2282 | if (x > y) |
|
|
2283 | { |
|
|
2284 | sector |= 2; |
|
|
2285 | |
|
|
2286 | if (x > y * 2) |
|
|
2287 | sector |= 1; |
|
|
2288 | } |
|
|
2289 | else |
|
|
2290 | { |
|
|
2291 | if (y > x * 2) |
|
|
2292 | sector |= 1; |
|
|
2293 | else if (!y) |
|
|
2294 | return 0; // x == 0 here |
|
|
2295 | } |
|
|
2296 | |
|
|
2297 | return dir [sector]; |
|
|
2298 | #else // old algorithm |
2230 | int q; |
2299 | int q; |
2231 | |
2300 | |
2232 | if (y) |
2301 | if (y) |
2233 | q = 128 * x / y; |
2302 | q = 128 * x / y; |
2234 | else if (x) |
2303 | else if (x) |
2235 | q = 512 * x; // to make it > 309 |
2304 | q = -512 * x; // to make it > 309 |
2236 | else |
2305 | else |
2237 | return 0; |
2306 | return 0; |
2238 | |
2307 | |
2239 | if (y > 0) |
2308 | if (y > 0) |
|
|
2309 | { |
|
|
2310 | if (q < -309) return 7; |
|
|
2311 | if (q < -52) return 6; |
|
|
2312 | if (q < 52) return 5; |
|
|
2313 | if (q < 309) return 4; |
|
|
2314 | |
|
|
2315 | return 3; |
|
|
2316 | } |
|
|
2317 | else |
2240 | { |
2318 | { |
2241 | if (q < -309) return 3; |
2319 | if (q < -309) return 3; |
2242 | if (q < -52) return 2; |
2320 | if (q < -52) return 2; |
2243 | if (q < 52) return 1; |
2321 | if (q < 52) return 1; |
2244 | if (q < 309) return 8; |
2322 | if (q < 309) return 8; |
2245 | |
2323 | |
2246 | return 7; |
2324 | return 7; |
2247 | } |
2325 | } |
2248 | else |
2326 | #endif |
2249 | { |
|
|
2250 | if (q < -309) return 7; |
|
|
2251 | if (q < -52) return 6; |
|
|
2252 | if (q < 52) return 5; |
|
|
2253 | if (q < 309) return 4; |
|
|
2254 | |
|
|
2255 | return 3; |
|
|
2256 | } |
|
|
2257 | } |
2327 | } |
2258 | |
2328 | |
2259 | /* |
2329 | /* |
2260 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2330 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2261 | * between two directions (which are expected to be absolute (see absdir()) |
2331 | * between two directions (which are expected to be absolute (see absdir()) |