1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527
|
2004-10-25 Al Riddoch <alriddoch@zepler.org>
* Release version 0.3.5.
2004-10-25 Al Riddoch <alriddoch@zepler.org>
* Increment version to 0.3.5.
2004-10-25 Al Riddoch <alriddoch@zepler.org>
* rulesets/werewolf/world/objects/tools/Gallows.py,
rulesets/basic/world/objects/tools/Bow.py,
rulesets/basic/world/objects/plants/Tree.py,
rulesets/basic/world/objects/buildings/House.py,
rulesets/basic/mind/goals/humanoid/transaction.py,
rulesets/basic/mind/goals/common/misc_goal.py:
Fix bugs initialising Location ensuring the second
arg is a Point3D, not a Vector3D for position.
Fixes pig purchasing.
* rulesets/basic/mind/goals/humanoid/mason.py:
Fix the velocity check for escaping pigs.
* rulesets/Py_Point3D.cpp: Fix Point3D subtraction operator to
allow subtraction of both Point and Vector. Fixes pig merchant
goal for keeping pigs.
2004-10-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Vector3D.cpp: Change isValid() to work with older
versions of python with bool support in the API.
2004-10-23 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Add a note to check the code.
* rulesets/basic/mind/goals/humanoid/transaction.py: Remove debug
output.
* rulesets/basic/mind/goals/common/move.py: New goal to accompany
another person.
* rulesets/basic/mind/goals/common/misc_goal.py: Use new accompany
goal for hirelings.
* rulesets/Python_API.cpp: Fix distance_to arg checking error
message.
* rulesets/Py_Vector3D.cpp: Add square magnitude and distance checking
methods.
2004-10-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/basic/mind/Knowledge.py: Simplify constructor.
* rulesets/Entity.h, rulesets/Entity.cpp: Make getXyz() inline.
* modules/Location.h: Remove obsolete unimplemented
getXyz() method.
2004-10-23 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp: Ensure that orientation is not used
when its invalid.
* rulesets/Py_Mind.cpp, rulesets/Py_Thing.cpp: Assert that the
return value of getXyz() is valid.
* rulesets/mason/define_world.py: Add a test function to add
a deer and a chicken.
2004-10-11 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp, modules/Location.h: Add new function for
usefully calculating the distance vector of another entity.
* tests/distancetest.cpp: Update test to check new distance
function.
* rulesets/Python_API.cpp: Make the new distance vector function
available to python rather than the relative postion function.
* rulesets/basic/mind/Knowledge.py, rulesets/basic/mind/NPCMind.py:
Ensure that Knowledge really does handle arbitrary triples.
* rulesets/basic/mind/goals/common/misc_goal.py: Add new version
of transaction goal for transactions for hirelings.
* rulesets/basic/mind/goals/humanoid/transaction.py: Complete
the implementation of the trigger goal for hirelings.
* rulesets/mason/define_world.py: Move the mercenaries closer to
origin for debugging.
2004-10-05 Al Riddoch <alriddoch@zepler.org>
* client/ClientConnection.cpp, common/globals.cpp, common/globals.h,
server/CommUnixListener.cpp, tools/cycmd.cpp: Add a global and a
config option for the unix socket filename. Update man pages
to document the config option.
2004-10-05 Al Riddoch <alriddoch@zepler.org>
* client/client.cpp, common/globals.cpp, server/server.cpp,
tools/cycmd.cpp: Get rid of nasy cast, and use string accessor
for varconf variables.
2004-10-05 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, tools/cyloadrules.cpp: Update tools to support
centralised varconf options on the command line. Update man
pages accordingly.
2004-10-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Process python output into clean log
output.
2004-10-04 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Ensure that database notices and errors
get reported cleanly by the log system.
2004-10-04 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Move the code to handle destruction of
a connection into the destructor. The destroy method can go
once this is well tested.
* server/CommListener.cpp: Return -1 on error.
* server/Persistance.cpp: Return a different error code depending
on why database init failed.
* server/server.cpp: Try and provide more helpfull error messages
depending on why database init failed.
2004-10-03 Al Riddoch <alriddoch@zepler.org>
* Require varconf 0.6.2 for its superior command line handling.
* client/client.cpp, common/globals.cpp, server/server.cpp,
server/slave.cpp, tools/cycmd.cpp, tools/cyloadrules.cpp,
tools/cypasswd.cpp: loadConfig() now returns the index of
the first non-option commandline arg.
* client/client.cpp: Use new config feature to allow user to
specify the client function to use on the command line far
more easily.
2004-10-03 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp, physics/Collision.cpp, rulesets/Character.cpp,
rulesets/Entity.cpp, rulesets/Movement.cpp, rulesets/Movement.h,
rulesets/Pedestrian.cpp: Make sure orientation is not used if it
is not valid.
2004-10-03 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/world/objects/buildings/House3.py: Fix script
to pass Point to Location constructor for pos.
2004-10-03 Al Riddoch <alriddoch@zepler.org>
* client/client.cpp, common/globals.cpp, common/globals.h,
common/inheritance.cpp, common/inheritance.h, server/server.cpp,
server/slave.cpp, tools/cycmd.cpp, tools/cyloadrules.cpp,
tools/cypasswd.cpp:
Use int for returning error status.
2004-10-03 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h, common/accountbase.cpp,
common/accountbase.h, server/Persistance.cpp, server/Persistance.h,
server/server.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp:
Use int for returning error status.
2004-10-03 Al Riddoch <alriddoch@zepler.org>
* server/CommListener.cpp, server/CommListener.h,
server/CommUnixListener.cpp, server/CommUnixListener.h:
Use int for returning error status.
2004-10-03 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.cpp, server/CommClient.h, server/CommListener.cpp,
server/CommListener.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommServer.cpp, server/CommSocket.h,
server/CommUnixListener.cpp, server/CommUnixListener.h:
Use int for returning error status.
2004-10-02 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,,
client/CharacterClient.cpp, client/CharacterClient.h,
client/ClientConnection.cpp, client/ClientConnection.h,
client/CreatorClient.cpp, client/CreatorClient.h,
client/ObserverClient.cpp, client/ObserverClient.h,
client/Py_CreatorClient.cpp, client/Py_CreatorClient.h,
client/client.cpp, server/CommListener.cpp,
server/CommListener.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/server.cpp, tools/cycmd.cpp:
Use int for returning error status.
2004-10-02 Al Riddoch <alriddoch@zepler.org>
* server/Account.h, server/Admin.cpp, server/Admin.h,
server/Player.cpp, server/Player.h: Use int for returning
error status from characterError().
2004-10-02 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_BBox.cpp, rulesets/Py_Location.cpp,
rulesets/Python_API.cpp: Eliminate some raw stderr output,
and replace with python errors, and calls to the log subsystem.
2004-10-02 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Add new python wrapper for
relativePosition().
* common/Database.cpp: Don't need trailing ; on database queries.
2004-09-30 Al Riddoch <alriddoch@zepler.org>
* Fix a couple of autoconf macros to stop them from spitting errors.
2004-09-29 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Add terrain init to default
world init function.
* Update rpm spec removing the acorn dependency from mason.
* Release version 0.3.4.
2004-09-29 Al Riddoch <alriddoch@zepler.org>
* Fix the manpage rules to work with make dist.
* Update rpm specs dependencies, and add man pages.
* Increment version to 0.3.3.
2004-09-28 Al Riddoch <alriddoch@zepler.org>
* Complete the manpages, and add copyright and other metadata.
2004-09-28 Al Riddoch <alriddoch@zepler.org>
* Add manual pages to the build.
* tools/cyloadrules.cpp: Fix usage information to be clearer.
2004-09-28 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h: Rename files for
already renamed CommClient class, to avoid name conflict.
* client/ObserverClient.h: Update for new header name.
2004-09-27 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/terrain_utils.cpp: Disable debugging
output.
* server/Persistor.cpp: Don't update the main entity table if we
have no attributes modified other than terrain.
2004-09-27 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Remove some debug output.
2004-09-25 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Add multicolumn unique index to array tables
to ensure contents is sane.
2004-09-25 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Supress debug output.
* common/terrain_utils.cpp: Free up database results after processing
and supress debug output.
2004-09-24 Al Riddoch <alriddoch@zepler.org>
* modules/Location.h, modules/Location.cpp: Remove obsolete
broken distance functions.
2004-09-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Use new distance function for determining
visible world contents.
2004-09-24 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml, data/basic.xml: Tweak rules so that sty and house
are light enough to move around.
2004-09-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/basic/mind/goals/common/move.py: Update to use new Point3D
type for pos.
2004-09-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/Pedestrian.cpp: Make sure not to transform things
with an invalid quaternion.
* server/WorldRouter.cpp: Remove excessive debugging output.
2004-09-24 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Switch to new distance algorithm for
broadcasts.
2004-09-24 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp, modules/Location.h: Improve algorithm
of distance function to handle corner cases, and add a second
interface so that both scalar distance and relative position
can be found.
* tests/distancetest.cpp: Update tests to test for cases where
distance to or from an entity directly below.
2004-09-23 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp, modules/Location.h: Add new improved
function to measure the distance between two entities.
* tests/distancetest.cpp: New test for new distance measuring
function.
2004-09-22 Al Riddoch <alriddoch@zepler.org>
* data/acorn.xml, data/mason.xml: Fixed spelling of alcohol. Well
spotted anubis.
2004-09-22 Al Riddoch <alriddoch@zepler.org>
* rulesets/Entity.cpp: Transform velocity and orientation when
parent changes due to parent destruction.
2004-09-22 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp: Turn off persistence again by default.
* rulesets/Pedestrian.cpp: Update collision resolution to
transform velocity and orientation when parent changes.
2004-09-22 Al Riddoch <alriddoch@zepler.org>
* rulesets/Entity.cpp: Added comment about transforming velocity and
orientation.
* tests/transformtest.cpp: Add more tests for quaternion manipulation.
2004-09-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/Creator.cpp: Ensure self-destruct delete ops have
an argument.
* tests/transformtest.cpp: Add a vector rotation test to clarify
quaternion sign conventions.
2004-09-20 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Fixe debug output to work with new
pos type.
* modules/Location.cpp: Fix one of the transforms, so distance
calculation works again.
2004-09-20 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Need to check whether orientation
is valid, and if not apply just translation.
* rulesets/Py_Location.cpp: Fix an error message to give the right
type.
2004-09-20 Al Riddoch <alriddoch@zepler.org>
* physics/Vector3D.h, physics/Vector3D.cpp, modules/Location.h,
modules/Location.cpp: Convert to using WFMath::Point instead of
WFMath::Vector for position.
* physics/Collision.h, physics/Collision.cpp: Update collision code
to use new pos type.
* rulesets/Py_Point3D.h, rulesets/Py_Point3D.cpp: New python
wrappers for WFMath::Point.
* rulesets/Py_Location.cpp, rulesets/Py_Vector3D.cpp,
rulesets/Python_API.cpp:
Update python wrappers to take into account new pos type.
Ensure that only apropriate functionality is available for
point and vector.
* rulesets/Character.cpp, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/Line.cpp, rulesets/Movement.cpp, rulesets/Movement.h,
rulesets/Pedestrian.cpp, rulesets/Pedestrian.h,
rulesets/Plant.cpp, rulesets/Thing.cpp, rulesets/World.cpp,
server/EntityFactory.cpp, server/WorldRouter.cpp,
server/WorldRouter.h: Update the rest of the code for new pos
type, converting all places where entity parenting is changed
to use WFMath toParentCoords() and toLocalCoords() methods,
so that orientation is handled correctly.
* tests/transformtest.cpp: New test to ensure that toParentCoords()
and toLocalCoords() perform as expected.
* tests/Creatortest.cpp, tests/Locationtest.cpp, tests/Worldtest.cpp,
tests/collisiontest.cpp, tests/emergencetest.cpp:
Update the rest of the tests.
2004-09-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Fix some typos that messed up
terrain, and put a mercenary in the wrong place.
2004-09-18 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.cpp: Replace check for NULL factory pointer
in installFactory() with an assert, as NULL should never occur.
2004-09-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Reproduce bootstrap terrain from
World.cpp.
2004-09-17 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Install new terrain from the client.
2004-09-17 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Implement function for modifying array rows.
* common/const.cpp: Enable persistence for testing.
* common/terrain_utils.cpp: Implement function for updating terrain
in database after a change.
* rulesets/World.cpp, rulesets/attributes.h: Add an update flag for
terrain, and use it to indicate to the Persistor.
* rulesets/World.h: Add accessors for variables which track modified
terrain, and a function to clear them.
* server/Persistor.cpp: Implement call to function to update terrain
in database.
* server/Restoration.cpp: Ensure that if world entity is already
in database, it gets hooked up appropriatly.
2004-09-14 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Fix queries on ID relation
tables. Add methods to result functions for decoding the contents
of fields more directly. Implement selecting from array tables.
* common/terrain_utils.cpp, common/terrain_utils.h: New functions
for handling terrain in array database tables.
* rulesets/World.cpp, rulesets/World.h: Add functionality to track
changes to the terrain for persistence purposes.
* server/EntityFactory.cpp, server/EntityFactory.h, server/server.cpp:
Modify the way world entity persistence is bootstrapped to be
more consistent.
* server/Persistor.cpp: Provide specialisations to handle world so
that terrain is persisted. Implement storing terrain at entity
creation.
* server/Restoration.cpp, server/Restoration.h: Remove obsolete
restoration code. Return a status more accuratly representing
when restoration fails because of error, or if there is nothing
to restore.
* server/Restorer.cpp, server/Restorer.h, server/Restorer_impl.h:
Convert to using methods for restoring data in the Database class.
Implement restoring terrain from the database.
2004-09-07 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Implement inserting into array tables.
Modify tables so that key columns are NOT NULL.
* server/Persistor.cpp: Test creating array rows.
2004-09-07 Al Riddoch <alriddoch@zepler.org>
* common/Database.h, common/Database.cpp: Implement creating tables
for storing array data.
* server/Persistor.cpp: Register a 2D array table for storing terrain
height point data.
2004-09-06 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Add stubs for new methods.
2004-09-06 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Update FIXME so its clear its the same
as all the other orientation related FIXMEs.
* server/Connection.cpp: New FIXME for password based Logout which
won't work.
* common/Database.h: Add interface for an idea which may help with
terrain persistence.
2004-09-06 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp, rulesets/Creator.cpp, rulesets/Character.cpp:
Check and clean up places where args are checked before querying
their contents.
* rulesets/Character.cpp: Assert that Movement::getMoveOperation()
always returns an operation, rather than a normal tolerant test.
Remove a FIXME about the Python code operations conversion functions.
2004-09-06 Al Riddoch <alriddoch@zepler.org>
* rulesets/Entity.cpp, rulesets/MemMap.cpp: Modify FIXME text so
its clearer which ones are part of the same problem.
* rulesets/Thing.cpp: Use a Delete pointer for a Delete operation.
* server/CommServer.cpp, server/CommServer.h: Change references
to clients into sockets. Remove unused version of removeSocket()
which takes an error message.
2004-09-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Use the Generic operation class for ops
with no hard coded type.
* rulesets/Movement.cpp: Make the time periods used when checking
collisions dependent on the standard tick time.
2004-09-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/Creator.cpp: Update a FIXME comment with a new possible
solution.
2004-09-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/BaseMind.cpp: Use parent of sub op when dispatching
sight and sound ops to mind scripts.
2004-09-05 Al Riddoch <alriddoch@zepler.org>
* modules/WorldTime.cpp: Use 0-11 for months instead of 1-12.
* tests/WorldTimetest.cpp: Test the "season" querying interface.
2004-09-05 Al Riddoch <alriddoch@zepler.org>
* modules/WorldTime.h, modules/WorldTime.cpp: Clean up typedef
and member names, and implement querying the season.
* client/CharacterClient.cpp: Remove some obsolete unconverted
Python code.
* physics/Collision.h: Update some comments.
* rulesets/Py_WorldTime.cpp: Implement access to season lookup
from scripts.
2004-09-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.cpp, rulesets/Py_Map.cpp, server/WorldRouter.h:
Update comments to remove obsolete FIXMEs.
2004-09-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp, server/Account.cpp:
Add serialno assignments to character inventory creation ops,
and ops from builtin mind.
* server/WorldRouter.cpp: Remove an obsolete comment.
2004-09-04 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h: Prefix
members with m_.
* client/CommClient.cpp, client/CommClient.h, client/ObserverClient.h:
Rename CommClient to BaseClient to avoid name clash with CommClient
in the server directory.
2004-09-04 Al Riddoch <alriddoch@zepler.org>
* client/CommClient.h, client/CommClient.cpp, client/ObserverClient.h,
client/ObserverClient.cpp: Prefix members with m_, and remove
pointless inheritance from BaseEntity. Add virtual destructors
as we no longer inherit virtual destructors from BaseEntity.
2004-09-04 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Correct some comments.
2004-09-04 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp, rulesets/Thing.h, rulesets/Entity.h,
rulesets/Entity.cpp, rulesets/Creator.h, rulesets/Creator.cpp,
rulesets/Character.h, rulesets/Character.cpp: Modify
externalOperation() so it no longer returns anything, ensuring
that Entity::externalOperation() passes its results back to
the world.
2004-09-04 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Check if a Setup op is for the mind
before dispatching to script, and ensure that Appearance
is always broadcast.
* server/Account.cpp: No need to broadcase sight(create) when a
character is created by an account.
2004-09-04 Al Riddoch <alriddoch@zepler.org>
* rulesets/Creator.h, rulesets/Creator.cpp: Rename sendMind() to
sendExternalMind() to make it clear that its not the same as the
method in Character.
* rulesets/Character.h, rulesets/Character.cpp: Remove world2body()
as it was identical in semantics to callOperation().
2004-09-04 Al Riddoch <alriddoch@zepler.org>
* rulesets/Creator.cpp: Allow creator to handle a few more op
types, and use switch to determine what to do.
* rulesets/Character.cpp: Remove setting and checking of sub_to
on Use and Wield ops as it is not relevant.
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* tests/IGEntityExerciser.h: Fix to work with gcc 3.4 stricter
template rules.
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* tests/EntityExerciser.h: Update test harness for new dispatch
mechanism.
2004-09-03 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/CharacterClient.h,
client/CommClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/OOGThing.cpp,
common/OOGThing.h, common/op_switch.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Food.cpp, rulesets/Food.h,
rulesets/Missile.h, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Stackable.cpp, rulesets/Stackable.h, rulesets/Thing.cpp,
rulesets/Thing.h, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/Connection.cpp,
server/Connection.h, server/ExternalMind.cpp, server/ExternalMind.h,
server/Lobby.cpp, server/Lobby.h, server/Player.cpp,
server/Player.h, server/WorldRouter.cpp:
Re-work basic op dispatch mechanism so result is passed by
a reference argument rather than returning by value.
2004-09-01 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/OOGThing.h, rulesets/Area.h,
rulesets/BaseMind.h, rulesets/Entity.h, rulesets/Food.h,
rulesets/Line.h, rulesets/MemEntity.h, rulesets/Missile.h,
rulesets/Plant.h, rulesets/Stackable.h, rulesets/Structure.h,
rulesets/Thing.h, rulesets/World.h, server/Account.h,
server/Connection.h, server/Lobby.h: Update the comments describing
the function of these classes.
* rulesets/Character.h, server/Account.cpp, server/Connection.cpp,
server/ExternalMind.cpp, server/ExternalMind.h: Make ExternalMind
inherit from BaseEntity, eliminating the need for the name argument
to the constructor and simplifying the class greatly by dropping
loads of unused inherited functionality.
2004-08-29 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h,
rulesets/Character.cpp, rulesets/Creator.cpp,
server/CommClient.cpp, server/ExternalMind.cpp,
server/ExternalMind.h, client/CharacterClient.cpp,
client/CommClient.cpp: Remove the message method from BaseEntity
and everything that inherits from it - its redundant.
* tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h: Sort out the tests so they no longer use
message, and try and get the character class tests working a bit
better.
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, rulesets/BaseMind.h,
rulesets/Character.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.h, server/Connection.cpp, tests/EntityExerciser.h:
Remove externalMessage() completely as its redundant, and remove
externalOperation() from the BaseEntity class, and into
Entity as its only applicable in-game.
* tests/Charactertest.cpp, tests/Creatortest.cpp:
Add tests for more IG classes.
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Correct some comments.
2004-08-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.h, server/CommSocket.h, server/CommIdleSocket.h:
Make constructors of some base classes protected.
* server/Account.cpp: Note a possible bug in the character
creation code.
* server/CommIdleSocket.cpp, server/CommIdleSocket.h,
server/CommListener.cpp, server/CommListener.h,
server/CommLocalClient.cpp, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommRemoteClient.cpp,
server/CommSocket.cpp, server/CommSocket.h,
server/CommUnixListener.cpp, server/CommUnixListener.h:
Clean up the Comm classes for consistency and readability.
2004-08-27 Al Riddoch <alriddoch@zepler.org>
* rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.h, rulesets/Script.h, rulesets/Script.cpp:
Make types in function declarations more concise.
2004-08-27 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp, server/Account.h, server/Connection.h,
tools/cycmd.cpp: Tweak SigC++ includes to be compatible with
SigC++ 2.0.
2004-08-24 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, modules/Location.cpp, modules/Location.h,
rulesets/Area.cpp, rulesets/Area.h, rulesets/Character.cpp,
rulesets/Character.h, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/Line.cpp, rulesets/Line.h, rulesets/MemMap.cpp,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/Py_Mind.cpp, rulesets/Py_Object.cpp, rulesets/Py_Thing.cpp,
rulesets/Python_API.cpp, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/World.cpp,
rulesets/World.h, server/Account.cpp, server/Account.h,
server/Admin.cpp, server/Connection.cpp, server/Lobby.cpp,
server/Lobby.h, server/Player.cpp, server/Player.h,
server/ServerRouting.cpp, server/ServerRouting.h,
tests/Areatest.cpp, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/Linetest.cpp, tests/Planttest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Thingtest.cpp, tests/Worldtest.cpp:
Replace addToObject() with addToMessage() throughout.
* server/Account.cpp, server/Lobby.cpp: Use BaseEntity::addToMessage().
* server/Player.cpp: Make adding character types attribute to Message
more efficient.
2004-08-17 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Correct a debug message, and clean up some
code.
* rulesets/Entity.cpp: Re-write handling for contains attribute
to be more efficient in addToObject().
2004-08-17 Al Riddoch <alriddoch@zepler.org>
* tests/Areatest.cpp, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/Linetest.cpp, tests/Planttest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Thingtest.cpp, tests/Worldtest.cpp,
tests/inheritancetest.cpp, tests/utilitytest.cpp, tools/cycmd.cpp,
tools/cyconvertrules.cpp, tools/cydbload.cpp, tools/cyisoload.cpp,
tools/cyloadrules.cpp, tools/cypasswd.cpp: Convert code to using
Atlas Message typedefs as found in Atlas-C++ 0.6 to aid
conversion later.
2004-08-17 Al Riddoch <alriddoch@zepler.org>
* client/ClientConnection.cpp, client/ClientConnection.h,
client/CommClient.cpp, client/CommClient.h,
client/CreatorClient.cpp, client/CreatorClient.h,
client/Py_CreatorClient.cpp: Convert code to using Atlas Message
typedefs as found in Atlas-C++ 0.6 to aid conversion later.
2004-08-16 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/BaseWorld.h,
common/Database.cpp, common/Database.h, common/FormattedXMLWriter.cpp,
common/FormattedXMLWriter.h, common/accountbase.cpp,
common/accountbase.h, common/custom.cpp, common/inheritance.cpp,
common/inheritance.h, common/operations.h, common/type_utils.h,
common/utility.cpp, common/utility.h, modules/Location.cpp,
modules/Location.h, rulesets/Area.cpp, rulesets/Area.h,
rulesets/BaseMind.cpp, rulesets/Character.cpp, rulesets/Character.h,
rulesets/Creator.cpp, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/Entity_getLocation.h, rulesets/Food.cpp, rulesets/Line.cpp,
rulesets/Line.h, rulesets/MemMap.cpp, rulesets/MemMap.h,
rulesets/Pedestrian.cpp, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/Py_Mind.cpp, rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Thing.cpp,
rulesets/Python_API.cpp, rulesets/Stackable.cpp, rulesets/Stackable.h,
rulesets/Thing.cpp, rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/CommClient.cpp, server/CommClient.h,
server/CommListener.cpp, server/CommListener.h,
server/CommLocalClient.cpp, server/CommLocalClient.h,
server/CommMetaClient.h, server/CommPSQLSocket.h,
server/CommRemoteClient.cpp, server/CommRemoteClient.h,
server/CommServer.cpp, server/CommServer.h, server/CommSocket.cpp,
server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/Connection.cpp,
server/Connection.h, server/EntityFactory.cpp,
server/EntityFactory.h, server/Lobby.cpp, server/Lobby.h,
server/Persistance.cpp, server/Persistance.h,
server/PersistantThingFactory.h, server/Persistor.cpp,
server/Player.cpp, server/Player.h, server/Restorer.h,
server/Restorer_impl.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/TrustedConnection.cpp,
server/TrustedConnection.h, server/WorldRouter.cpp,
server/WorldRouter.h: Convert code to using Atlas Message
typedefs as found in Atlas-C++ 0.6 to aid conversion later.
2004-08-07 Al Riddoch <alriddoch@zepler.org>
* common/FormattedXMLWriter.h: Add some notes about converting this
class for use with any Atlas codec.
* server/CommClient.h, server/CommIdleSocket.h, server/CommServer.cpp,
server/CommServer.h, server/CommSocket.h, server/ServerRouting.h,
server/WorldRouter.cpp:
Improve the names of some typedefs and clean up some comments.
* server/WorldRouter.h: Remove declaration of obsolete unimplemented
setSerialno() member function.
2004-08-05 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp, server/WorldRouter.h: Code formatting
cleanups, and some improved comments.
2004-07-31 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Improve debug output.
2004-07-30 Al Riddoch <alriddoch@zepler.org>
* Makefile.am, index.dox, Doxyfile: Add support for doxygen.
* server/ServerRouting.cpp, server/ServerRouting.h,
server/ServerRouting_methods.h: Document a class a bit.
2004-07-30 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp, server/CommClient.cpp:
Clean up some error output, making sure it goes to the right place.
* common/FormattedXMLWriter.cpp, common/FormattedXMLWriter.h:
Use ostream as we are only writing, not reading. Improve comments.
2004-07-30 Al Riddoch <alriddoch@zepler.org>
* rulesets/BaseMind.cpp: Remove some debug output.
* Increment version to 0.3.2.
2004-07-28 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.cpp: Make sure LOC and CONTAINS are kept consistant
and valid in memory maps. This might get rid of some segfaults.
2004-07-26 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Don't give minds to player characters.
Improve commenting.
2004-07-25 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Remove some obsolete commented out code.
2004-07-22 Al Riddoch <alriddoch@zepler.org>
* Release 0.3.1.
2004-07-22 Al Riddoch <alriddoch@zepler.org>
* rulesets/basic/mind/goals/common/misc_goal.py: Remove debugging
output from the spot_something() goal.
2004-07-22 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Add function to check
whether an Atlas table has a given key.
* tools/cyloadrules.cpp: Use hasKey() function to make sure we
don't get errors when inserting rules.
2004-07-22 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemEntity.h, rulesets/MemMap.cpp, server/WorldRouter.cpp:
Remove some debugging output.
2004-07-21 Al Riddoch <alriddoch@zepler.org>
* tests/Worldtest.cpp: Update test for new world base class.
2004-07-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/BaseMind.cpp, rulesets/MemMap.cpp, rulesets/MemMap.h,
rulesets/Py_Map.cpp: Modify python API so it passes in time
to map.update and map.get. Use time elapsed to decide if something
is ready for removal. Newly created entities are now less likely
to get removed before they are verified.
* rulesets/basic/mind/NPCMind.py,
rulesets/basic/mind/goals/humanoid/mason.py,
rulesets/acorn/mind/SkelMind.py, rulesets/mason/mind/SkelMind.py:
Update python code to new API.
2004-07-21 Al Riddoch <alriddoch@zepler.org>
* Clean up files for distribution.
2004-07-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.cpp: Very carefully ensure that the garbage
collection iterator is not reset to the beginning too often
so that we cover the whole mind.
* rulesets/MemEntity.h: Only report time skew if the time passed
is non-zero.
* rulesets/BaseMind.cpp: Some useful debugging output.
2004-07-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/PythonMindScript.cpp: Go back to using getAdd.
* rulesets/MemEntity.h: Tweak check for backwards time so we
only report an error if it really is backwards.
* rulesets/BaseMind.cpp, rulesets/MemEntity.h,
rulesets/MemMap.cpp, rulesets/MemMap.h: Implement a function
which slowly iterates over the contents of the mind checking
for things which are obsolete, and removes them.
2004-07-20 Al Riddoch <alriddoch@zepler.org>
* tools/cyconvertrules.cpp: Add code to handle conversion of rules
about minds.
* Re-convert old rules files to make sure they include the mind
data.
2004-07-20 Al Riddoch <alriddoch@zepler.org>
* client/CreatorClient.cpp, rulesets/BaseMind.cpp,
rulesets/MemEntity.cpp, rulesets/MemEntity.h,
rulesets/MemMap.cpp, rulesets/MemMap.h, rulesets/Py_Map.cpp:
Set time on memory entities when we update them.
* common/BaseWorld.h: Make object accessor const.
* common/Database.cpp, common/Database.h, common/accountbase.cpp,
server/Connection.cpp, server/Persistance.cpp,
server/WorldRouter.cpp: Rename function to get new ID from
database to more correctly reflect its role.
* rulesets/PythonMindScript.cpp: Use get rather than getAdd
to sort out to and from of ops send to mind scripts.
2004-07-20 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Add a couple more test functions.
* rulesets/MemMap.h: Add accessor for internal data for debugging.
* rulesets/MemMap.cpp: Comments and debugging output to help solve
memory bloat.
* rulesets/MemEntity.h, rulesets/MemEntity.cpp: Add flag to track
whether entities in memory are visible to the NPC.
* rulesets/Entity.cpp: FIXME note for coordinate conversion.
* rulesets/BaseMind.cpp: Track the visibility of entities in
the mind.
2004-07-16 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Try out creating database tables without an
OID column.
2004-07-14 Al Riddoch <alriddoch@zepler.org>
* common/Database.h, common/Database.cpp: Modify relation code
to allow partial support for foreign key constrains to maintain
referential integrity. Full support will work when (if) primary
keys are inherited.
* server/Persistance.h, server/Persistance.cpp: Use updated relation
code for the accounts to characters relation.
2004-07-14 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.h, rulesets/Creator.cpp, rulesets/Thing.h,
rulesets/World.cpp, server/WorldRouter.cpp, server/WorldRouter.h:
Modify the world interface to get rid of some pointless
infeffiencies.
* server/Account.cpp, server/Admin.cpp, server/Connection.cpp,
server/Lobby.cpp, server/ServerRouting.h, server/WorldRouter.cpp,
server/WorldRouter.h: Change getSerialNo to newSerialNo to make it
clear what it does.
2004-07-14 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, common/refno.h,
server/Account.cpp, rulesets/Creator.cpp, server/WorldRouter.cpp:
Move refno functions which don't need to be methods into
their own header.
* common/BaseWorld.h, common/BaseWorld.cpp, rulesets/Character.cpp,
rulesets/Creator.cpp, server/WorldRouter.cpp, server/WorldRouter.h:
Make BaseWorld no longer inherit from anything, as we were not
using this inheritance at all.
2004-07-14 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Get rid of leak from handling delete op
reply. Eliminate unnecessary copy reading TO of all ops.
2004-07-13 Al Riddoch <alriddoch@zepler.org>
* rulesets/BaseMind.cpp: Make sure we don't delete ourself from
map.
* server/WorldRouter.h, server/WorldRouter.cpp: Add more advanced
handling for delete ops, so the response is broadcast before
it is removed.
2004-07-13 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Clean up a special case for TO="all" on
ops, which we now disallow. Remove a verbose tests for NULL
pointers in the world dictionary and replace with a simple assert.
2004-07-12 Al Riddoch <alriddoch@zepler.org>
* common/FormattedXMLWriter.cpp common/FormattedXMLWriter.h:
Utility class to write Atlas to a stream with formatting for
human readability.
2004-07-12 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Add capability to specify
extra columns in generic Atlas database tables. Query the results
columns more robustly. Add a ruleset name column to the rules
table.
* server/EntityFactory.cpp: Re-write rule loader to handle new
format rules. Tighten up strictness of rule data. It is no
longer possible to specify defaults for location in the rule.
* tools/cyconvertrules.cpp: Ensure that the playable flag is
copied across when converting rules.
* tools/cyloadrules.cpp: Adapt to load the new format rules,
including handling the ruleset name column.
2004-07-08 Al Riddoch <alriddoch@zepler.org>
* client/CommClient.cpp, rulesets/MemMap.cpp, server/CommServer.cpp,
server/EntityFactory.cpp, server/Persistor_impl.h,
server/Restorer.cpp, server/Restorer_impl.h:
Fix code to comply with stricter gcc 3.4.1 template rules.
2004-07-08 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Remove duplicate fir tree.
* rulesets/Entity.cpp: Remove duplicate copy of Entity::getLocation
template.
* rulesets/Entity_getLocation.h: Update real version of
Entity::getLocation template to get latest changes.
2004-07-05 Kai Blin <blin@gmx.net>
* mason.xml: Made the fir weight 150 kg
* rulesets/basic/mind/goals/common/misc_goal.py: added browse()
goal
* rulesets/basic/mind/panlingua/interlinguish.py: added
browse_word so we can learn the goal browse
* rulesets/mason/define_world.py: added a test_browse function
that tests deer browsing on trees. Also added a browse() entry
into the deer's goal list.
* rulesets/mason/world/objects/plants/Fir.py: made the fir react
on the eat_operation
2004-07-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/Plant.cpp: Slow down the rate of recovery for damaged
plants.
2004-07-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/Plant.cpp: Implement recovering damage/health in all
plants.
2004-06-29 Al Riddoch <alriddoch@zepler.org>
* Warn if an up to date version of python is not available.
2004-06-29 Al Riddoch <alriddoch@zepler.org>
* rulesets/basic/mind/NPCMind.py, rulesets/BaseMind.cpp,
modules/WorldTime.h: WorldTime now handles time in
integer seconds.
* rulesets/Python_API.cpp: Handle all variations of args with one
call to PyArg_ParseTuple as multiple calls are not
allowed.
2004-06-28 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Ensure that Use and Wield ops are
subscribed from mind.
2004-06-28 Al Riddoch <alriddoch@zepler.org>
* Fixes to nowhere's commit to define_world.py:
Fix python syntax of wolf goal to predate squirrels.
Fix m.learn for squirrel to use goals, not knowledge.
Replace hard tabs with normal spaces.
2004-06-28 Al Riddoch <alriddoch@zepler.org>
* Update birch bounding box to new straight tree model.
2004-06-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/custom.cpp,
common/inheritance.cpp, common/op_switch.h, common/operations.cpp,
common/operations.h, common/types.h, rulesets/Character.cpp,
rulesets/Character.h, tests/EntityExerciser.h, tests/allOperations.h:
Add, install, implement and test new op types for Use and Wield.
2004-06-26 Kai Blin <blin@gmx.net>
* Renamed pinekernel to fircone.
2004-06-26 Kai Blin <blin@gmx.net>
* Add a pinekernel rule, and make squirrel forage for acorns and
pine kernels. Make wolf hunt the squirrel, too.
2004-06-26 Al Riddoch <alriddoch@zepler.org>
* Add internal wall structure for house3, and setup rule for
new blockhouse model.
2004-06-26 Al Riddoch <alriddoch@zepler.org>
* Add to the list of predators that chicken avoids.
* rulesets/Thing.cpp, rulesets/Entity.cpp: Don't read bbox in
Entity::getLocation, as it needs to be trivially modifiable,
so it is now only read in Entity::merge.
2004-06-25 Al Riddoch <alriddoch@zepler.org>
* Add a mushroom rule, and make deer and pigs eat them.
2004-06-25 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp: Fix move op sight propagation so that
the corrected height is sent.
2004-06-24 Al Riddoch <alriddoch@zepler.org>
* Fix bounding box for boat.
2004-06-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/Creator.cpp: Allow a creator to create things.
2004-06-24 Al Riddoch <alriddoch@zepler.org>
* Add type for wooden building materials.
2004-06-24 Al Riddoch <alriddoch@zepler.org>
* Add a barrel type.
2004-06-24 Al Riddoch <alriddoch@zepler.org>
* Sort out sqirrel bounding box.
2004-06-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/Creator.cpp: Allow a creator to move around the world.
* rulesets/Character.cpp: Get rid of some extraneous debugging output.
2004-06-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_WorldTime.cpp, rulesets/Py_World.cpp:
Change the rest of the methods to use METH_NOARGS for simplicity.
* rulesets/Pedestrian.cpp: Experimental fix to stop desination
based movement from bipassing the collision detection.
2004-06-24 James Turner <james@worldforge.org>
* Add inn entity type to mason.xml
2004-06-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Location.cpp, rulesets/Py_Map.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Quaternion.cpp, rulesets/Py_Thing.cpp,
rulesets/Py_Vector3D.cpp, rulesets/Python_API.cpp:
Change some methods to use METH_NOARGS for simplicity.
2004-06-23 Al Riddoch <alriddoch@zepler.org>
* Fix bounding boxes for fir and oak scaling.
* common/globals.cpp: Default to starting at dawn.
* modules/DateTime.h: Make accessors to static vars static.
* server/WorldRouter.cpp: Handle time offest more sanely.
2004-06-23 Al Riddoch <alriddoch@zepler.org>
* Fix up bounding boxes for pig and chicken.
* server/CommListener.cpp: Set linger option to prevent sockets
clagging up on shutdown.
2004-06-23 Al Riddoch <alriddoch@zepler.org>
* Fix up bounding boxes for pig and chicken.
2004-06-21 Al Riddoch <alriddoch@zepler.org>
* common/const.h, common/const.cpp: Decrease sight range setting,
and increase minimum box size.
2004-06-21 Al Riddoch <alriddoch@zepler.org>
* common/const.h, common/const.cpp: Increase sight range setting.
2004-06-21 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Change check in new Entity code to ensure
that entities already have valid location at this point.
* server/EntityFactory.cpp: Implement randomized starting position
in entity factory.
2004-06-21 Al Riddoch <alriddoch@zepler.org>
* tests/Worldtest.cpp: Handle new pure virtual methods in world
base class.
2004-06-21 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Slightly randomize starting position
of characters to avoid getting stuck.
* rulesets/mason/define_world.py: Move the world contents around a bit
to make room for larger spawn area.
* rulesets/World.cpp: Make sure we don't degfault if we get a height
outside current area of terrain.
* client/ClientConnection.cpp, client/CharacterClient.cpp:
Set an error condition if the server disconnects unexpectedly,
and thus return an error to the script causing an exit.
2004-06-20 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp, rulesets/World.h: Add accessor to get height
at a particular point.
* server/Account.cpp: Remove redundant check on new character
location.
* common/BaseWorld.h, server/WorldRouter.cpp, server/WorldRouter.h,
rulesets/Thing.cpp: Add new function for correcting height
of entities to ground level, and use it whenever new entities
are created, or whenever an entity moves.
2004-06-20 Al Riddoch <alriddoch@zepler.org>
* server/Account.h, server/Admin.cpp: Add fallthrough case so
that admin accounts can handle set ops the same way as player
accounts do.
2004-06-20 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Clean up use of standard error to go
via the log subsystem.
* rulesets/basic/editor.py, rulesets/basic/mind/NPCMind.py,
rulesets/basic/mind/panlingua/interlinguish.py,
rulesets/mason/define_world.py:
Expand handling of the verb "know" so that knowledge
is a triple, including predicate, so that know can be used
to inform a character of any knowledge. Generalise the client
code, and tweak the client data to include the right information.
* mason.xml: Add new rule for mercenaries.
* rulesets/basic/mind/goals/humanoid/transaction.py: Add new
dynamic goal for NPCs offering their services for hire.
* rulesets/basic/mind/panlingua/interlinguish.py:
Add new words related to hirable NPCs
* rulesets/mason/define_world.py: Start programming up warriors
to be hirable.
2004-06-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py, rulesets/World.cpp,
mason.xml: New map work.
2004-06-15 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/globals.cpp, rulesets/Area.cpp,
rulesets/Python_API.cpp, server/Connection.cpp,
server/Persistance.cpp: Ensure that all output goes either via
the log system, or only in debug macros.
2004-06-15 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Remove debugging output.
2004-06-13 Al Riddoch <alriddoch@zepler.org>
* Make sure ruleset script files are correctly handled by
a build run from outside the source directory.
2004-06-12 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseEntity.cpp, client/CommClient.cpp:
Get rid of obsolete BaseEntity constructor.
2004-06-11 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp: Get rid of dependency on Entity.
* Fix up the tests.
2004-06-11 Al Riddoch <alriddoch@zepler.org>
* server/Restoration.h, server/CommUnixListener.h,
server/CommSocket.h, server/CommSocket.cpp,
server/CommServer.h, server/CommMetaClient.h,
server/CommMetaClient.cpp, server/CommListener.h,
server/CommListener.cpp, server/CommIdleSocket.h,
server/CommIdleSocket.cpp, rulesets/Area.h,
modules/WorldTime.h, common/OOGThing.h, common/OOGThing.cpp:
Get rid of some naughty stray implicit constructors.
2004-06-11 Al Riddoch <alriddoch@zepler.org>
* modules/Location.h, modules/Location.cpp: Clean up constructors
and interface to check whether bbox is solid.
* rulesets/Area.cpp, rulesets/Movement.cpp, rulesets/Structure.h,
rulesets/Structure.cpp: Update to modified Location API.
* rulesets/World.cpp: Fix misuse of implicit construction.
2004-06-11 Al Riddoch <alriddoch@zepler.org>
* tools/cyconvertrules.cpp: Fully implement rule conversion
to new format, including formatted output.
2004-06-10 Al Riddoch <alriddoch@zepler.org>
* Remove obsolete or useless tools, and clean up Makefile.
* Clean up TODO files.
2004-06-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/world/objects/animals/Squirrel.py: Fix import error.
* server/Admin.cpp: Add debug output to installing a class.
* tools/cycmd.cpp: Implement a quick install command to add a new
temporary type to the server.
2004-06-09 Al Riddoch <alriddoch@zepler.org>
* tools/cypasswd.cpp, tools/cyloadrules.cpp, tools/cycmd.cpp: Fix
usage functions to output to standard error.
* server/Admin.cpp: Add quick code to install new types.
* tools/cyconvertrules.cpp: Add placeholder for tool to convert
old format rules files into a new format to be common with
indri.
2004-06-06 Al Riddoch <alriddoch@zepler.org>
* Fix dependencies in the rpm spec.
2004-06-03 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Handle empty strings in config file
so they are less likely to cause problems.
2004-06-01 Al Riddoch <alriddoch@zepler.org>
* server/CommUnixListener.cpp, server/CommUnixListener.h:
Clean up member variable names in CommUnixListener, store
the socket path to avoid regenerating it, and provide
an accessor for the path.
* server/server.cpp: Report the pathname of failed listen socket
if we can't open it.
2004-06-01 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp: Fix sight range calculations for Appearance
and Disappearance ops.
2004-05-28 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp, rulesets/MemMap.cpp, server/server.cpp:
Relegate some diagnostic output on shutdown to debug output.
2004-05-26 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp, server/Account.h: Added new code to allow
players to securely modify guise and height of their character.
2004-05-25 Al Riddoch <alriddoch@zepler.org>
* Release 0.3.0
2004-05-25 Al Riddoch <alriddoch@zepler.org>
* cyphesis.spec.in: Final deps tweak.
* cyphesis.vconf: Enable metaserver by default.
2004-05-25 Al Riddoch <alriddoch@zepler.org>
* cyphesis.sysconfig, cyphesis.init: Fix init script so it
doesn't parameterise database name (which doesn't work)
exits correctly on fatal errors, and remove the code to
load obsolete server-side map files.
* cyphesis.spec.in: Fix deps.
2004-05-24 Al Riddoch <alriddoch@zepler.org>
* common/stringstream.h: Get rid of local sstream implementation
as all worthwhile compilers now include it.
2004-05-23 Al Riddoch <alriddoch@zepler.org>
* tools/cywatchdog.cpp, tools/cyctrl.cpp, tools/cycmd.cpp,
server/CommUnixListener.cpp, client/ClientConnection.cpp:
Use var/tmp for temporary files and sockets.
* Give sty type a default bbox, rather than using instance
attributes.
* Clean up data files in the top level Makefile.am.
* Remove some unused files from the distribution.
2004-05-21 Al Riddoch <alriddoch@zepler.org>
* Disable unused gettext.
* Remove obsolete libs from spec.
* Make sure all source files are included with distribution.
* Fix tests to work with distcheck.
2004-05-17 Al Riddoch <alriddoch@zepler.org>
* rulesets/BaseMind.cpp: Re-order the way ops are handled to avoid
re-adding deleted entities to memory.
* Fix greet goals so it works more immediatly.
* Add a quick client function for populating the world with a minimal
test case for AI memory.
2004-05-16 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Add to python search path directly, rather
than using an environment hack.
2004-05-15 Al Riddoch <alriddoch@zepler.org>
* Fix the tests so they link.
2004-05-15 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, server/WorldRouter.cpp, rulesets/MemMap.cpp:
Add logging of various shutdown faces, to try and track the
excessive memory usage.
2004-05-14 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp: Use more efficient distance calculation.
2004-05-14 Al Riddoch <alriddoch@zepler.org>
* tests/collisiontest.cpp, tests/emergencetest.cpp: Fix up tests
after header changes.
2004-05-14 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp, rulesets/World.cpp, server/WorldRouter.cpp:
Delete commented out code for old range checks.
* modules/Location.h, physics/BBox.h, physics/Collision.cpp,
physics/Vector3D.h, rulesets/Entity.h: Remove obsolete math
functions for doing silly calculations with boxes.
2004-05-14 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Remove some verbose debugging output.
2004-05-13 Al Riddoch <alriddoch@zepler.org>
* tests/Worldtest.cpp: Fix up tests.
2004-05-13 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Removed unused variables.
2004-05-12 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp: Convert movement appearance and disappearance
to use new sight range calculations.
2004-05-12 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp, common/const.h: Add constants for handling
size based visibility calculations.
* rulesets/World.cpp, server/WorldRouter.cpp: Convert op broadcast
and viewing distance to being handled by a visibility calculation
based on size and distance, rather than distance alone. Movement
appearance and disappearance is yet to be done.
2004-05-11 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp: Send an Appearance op from new entities
rather than Sight(Create).
* server/WorldRouter.cpp: Accept Appearance and Disappearance
as ops which can be broadcast.
2004-05-11 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.h, server/CommServer.cpp, server/CommServer.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/ServerRouting_methods.h, server/WorldRouter.cpp,
server/WorldRouter.h: Modify idle to return if there are ops due
so that select can be called with zero timeout. Server now processes
op as quickly as possible and hopefully is still responsive.
2004-05-11 Al Riddoch <alriddoch@zepler.org>
* client/CommClient.cpp, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/Entity_getLocation.h, server/EntityFactory.cpp:
Make Entity::getLocation a template, so it works with maps on
types other than entity.
* rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/MemEntity.cpp, rulesets/MemEntity.h,
rulesets/MemMap.cpp, rulesets/MemMap.h, rulesets/Py_Map.cpp:
Make MemEntity inherit from Entity, and BaseMind inherit from
MemEntity, and use MemEntity for all objects in MemMap, so we
can have extra functionality on MemEntity.
2004-05-11 Al Riddoch <alriddoch@zepler.org>
* modules/Location.h: Strip out obsolete collision code.
2004-05-11 Al Riddoch <alriddoch@zepler.org>
* physics/Vector3D.h, physics/BBox.h: Strip out obsolete collision
code.
2004-05-11 Al Riddoch <alriddoch@zepler.org>
* rulesets/Entity.h: Remove redundant forward declaration.
* rulesets/MemEntity.h, rulesets/MemEntity.cpp: New classes
for entities in AI memory.
2004-05-10 Al Riddoch <alriddoch@zepler.org>
* Clean up building an externally available from code in the
common directory.
2004-05-10 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.h, rulesets/MemMap.cpp: Clear up some terminology
in variable and function names and comments.
2004-05-10 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.h, rulesets/MemMap.cpp: Merge add() and update()
into a single method, as they are identical in function. Add comments
documenting each method.
* rulesets/Py_Map.cpp: Use the same function for add() and update()
bindings, but maintain two methods in python for compatability.
* rulesets/BaseMind.cpp, client/CreatorClient.cpp: Update calls
to MemMap API.
2004-05-10 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.cpp, rulesets/MemMap.h: More cleanup of AI
memory code.
2004-05-10 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.cpp, rulesets/MemMap.h: Major cleanup of AI
memory code, including lots more error reporting, and more
efficient handling of add/update.
2004-05-07 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, common/globals.cpp, client/client.cpp:
Workaround C++s nasty implicit conversion behavoir.
* common/system.cpp: Be smarted about POSIX signal handling for
segfaults and aborts.
* Update TODO.
2004-05-07 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Don't update character table when persistence
is disabled.
2004-05-07 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Improve server monitoring by correctly separating
OOG ops from IG ops being monitored, and by calculating number
and rate of ops monitored.
2004-05-07 Al Riddoch <alriddoch@zepler.org>
* common/system.cpp: Add handler for abort signals so they can be
reported in the logs.
2004-05-07 Al Riddoch <alriddoch@zepler.org>
* common/system.cpp: Add handler for segfaults so they can be reported
in the logs.
2004-05-06 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.h, server/Connection.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/WorldRouter.cpp, server/WorldRouter.h:
Get rid of obsolete return value, from idle functions, and
adjust WorldRouter::idle() so it only dispatches a certain
number of ops at a time.
* server/Admin.cpp: Remove debugging output for monitoring code.
* server/ExternalMind.cpp, server/ExternalMind.h: Rename member
variables to fit with convention.
* tools/cycmd.cpp: Document monitor features.
2004-05-03 Al Riddoch <alriddoch@zepler.org>
* common/inheritance.cpp: Fix Root type entry, which incorrectly had
objtype "instance".
2004-05-01 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/utility.cpp, rulesets/World.cpp,
server/Account.cpp, server/Admin.cpp, server/ServerRouting.cpp,
tools/cycmd.cpp: Change objtype from "object" to "obj" in keeping
with the new Atlas spec., and tolerate either version from
clients for now.
2004-04-27 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp, common/const.h, server/EntityFactory.cpp,
server/Restoration.cpp: Add flag to disable saving of state
to the database.
2004-04-24 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Handle all ops from server, including unknowns.
Log them to screen including type, to and from.
* server/Admin.cpp: Ensure we distconnect from World.Dispatch
from signal once admin has logged out, or if account is destroyed.
2004-04-23 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Add new command to enable and disable server
monitoring.
* server/WorldRouter.cpp, common/BaseWorld.h: Add facility to
notify using a SigC signal each type an op is dispatched.
* server/CommClient.h, server/CommClient.cpp: Fix typo in
overridden method which meant it didn't work.
* server/Admin.h, server/Admin.cpp: Add handler for Monitor operation
which turns on and off sending all IG ops to the admin client.
* rulesets/Python_API.cpp, common/types.h, common/Generic.h,
common/BaseEntity.h: Fix Generic op so it can be used, and
clean up its use. Add an enumeration for monitor ops.
2004-04-22 Al Riddoch <alriddoch@zepler.org>
* Add some chickens.
* rulesets/Py_Map.cpp: Handle null entities cleanly.
* rulesets/Plant.cpp: Don't drop generic seeds.
* common/const.cpp: Cut down sight range.
2004-04-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.cpp: Ensure that updates can modify LOC of entities
in characters memory, or it often doesn't get set at all. Simplify
the process of adding a new id.
* rulesets/Character.cpp: Don't need to send out nearly as many looks
to bootstrap mind code.
2004-04-20 Al Riddoch <alriddoch@zepler.org>
* common/operations.cpp: Fix typo in Setup ops, which meant that
setup never worked.
* server/Restoration.cpp: Comment out unused obsolete function.
2004-04-20 Al Riddoch <alriddoch@zepler.org>
* server/Restorer.h, server/Restorer.cpp, server/Persistor_impl.h,
server/Persistor.cpp, rulesets/Plant.h: Implement plant
attribute persistance.
* rulesets/Plant.cpp: Fix a few plant typos.
* Add chicken goals.
2004-04-19 Al Riddoch <alriddoch@zepler.org>
* Fix some tree related rules
* rulesets/Plant.cpp, rulesets/Plant.h: Implement touching to release
seeds on all plants.
* rulesets/World.cpp: Get rid of mountains on one side.
* Add some auto generated forests to world init script.
* rulesets/mason/world/objects/plants/Fir.py,
rulesets/mason/world/objects/plants/Oak.py: Simplify some scripts.
* server/CommListener.cpp: Set RESUSEADDR on listen sockets.
* server/Persistor.cpp, server/Persistor.h, server/Persistor_impl.h:
Fix persistance of plant's static fruits attribute.
2004-04-19 Al Riddoch <alriddoch@zepler.org>
* Add lists of forest areas for automatic forect population.
2004-04-19 Al Riddoch <alriddoch@zepler.org>
* Fix types for boat and jetty.
* rulesets/World.cpp: New random terrain for Ludex demo.
* Define new boandary objects, and start work on major map
improvements.
2004-04-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Add comments on new Python type API.
2004-03-20 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp: Make sight range bigger.
* rulessets/Area.cpp: Make area bboxes non-solid.
2004-03-15 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Add a FIXME for a very old obsolete test.
* rulesets/World.cpp: Update setTerrain so it too accepts the
data in new format.
2004-03-15 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Sort out a weird floating pointe problem
with emergence test. Now works. Remove debug output.
* tests/emergencetest.cpp: Implement a suitable minimal set of tests.
* rulesets/Movement.cpp: Switch to using the new code.
2004-03-15 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.h, physics/Collision.cpp: Work on code predicting
when entity leaves parent.
* tests/emergencetest.cpp: Add test for emergence code.
2004-03-08 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Fix bootstrap bug by ensuring that all pending
queries are cleared before launching a new query directly.
2004-03-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Modify terrain structure to track
the new format already implemented in apogee.
2004-03-05 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientConnection.cpp, client/CreatorClient.cpp,
client/Py_CreatorClient.cpp, rulesets/Movement.cpp,
rulesets/Pedestrian.cpp: Clean up some debug flags.
2004-03-02 Al Riddoch <alriddoch@zepler.org>
* modules/WorldTime.cpp: Remove an old #warning.
* server/Admin.cpp: Comment out a currently unused
variable.
2004-02-27 Al Riddoch <alriddoch@zepler.org>
* client/client.cpp, common/globals.cpp: Remove some dodgey
casts required by strange versions of gcc, which should
be handled by the provided patch.
2004-02-14 Al Riddoch <alriddoch@zepler.org>
* Clean up Makefile.ams a bit.
2004-02-12 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Improve comments, and describe exit prediction
algorithm.
2004-01-22 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp, client/ClientConnection.cpp,
client/CommClient.cpp, server/Account.cpp,
server/CommClient.cpp, server/Connection.cpp,
tools/cycmd.cpp: Update required headers, now that they
are not all pulled in by Atlas/Objects/Decoder.h.
2004-01-22 Al Riddoch <alriddoch@zepler.org>
* Completely eliminate use of Instantiate() method throughout.
2004-01-22 Al Riddoch <alriddoch@zepler.org>
* common/custom.cpp, common/inheritance.cpp, common/operations.cpp,
server/EntityFactory.cpp: Use new Atlas-C++ Class() method
for class objects.
2004-01-15 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Add a test forest object, called
Sherwood.
2004-01-12 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp, server/Admin.cpp: Improve some important
error messages to include more context.
* rulesets/World.cpp: Tweak default landscape so it has some
water for testing boats.
* Add boat type to ruleset, and an instance to the define_world
script.
2004-01-12 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Fix logic error in direction
processing code.
* rulesets/Area.cpp: Add debugging code.
2004-01-10 Al Riddoch <alriddoch@zepler.org>
* common/nls.h, server/server.cpp: Try out gettext based
internationalisation.
2004-01-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Fix some bugs which can occur if from
normalising a zero-length vector.
2004-01-06 Al Riddoch <alriddoch@zepler.org>
* Add rule for forest entity.
2004-01-02 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Clarify error messages and debug output.
2004-01-01 Al Riddoch <alriddoch@zepler.org>
* Fix postgreSQL autoconf macro so it handles version numbers with
non-numeric suffixes.
2003-12-12 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp, physics/Collision.h: Update some comments,
and implement getEmergenceTime.
2003-12-08 Al Riddoch <alriddoch@zepler.org>
* server/CommPSQLSocket.h: Change database vacuum intervals to
more reasonable ammounts.
* server/CommPSQLSocket.cpp: Init m_vacuumFull to false, rather
than 0.
2003-12-05 Al Riddoch <alriddoch@zepler.org>
* tests/EntityExerciser.h: Delete all returned operations when
testing.
* rulesets/Plant.cpp: Check if bbox is valid before testing its
height. Initialise the height at which plants produces fruit.
2003-12-05 Al Riddoch <alriddoch@zepler.org>
* tests/EntityExerciser.h, tests/utilitytest.cpp: Get rid of
some warnings.
2003-11-25 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.h, physics/Collision.cpp: Add stubs for
functions to detect emergence from within an containing entity.
2003-11-25 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Improve debugging output.
2003-11-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Fix logic when charging mind touch op
args.
2003-11-22 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Additional error reporting for bad update
queries.
* rulesets/Plant.h: Add accessor for number of fruits.
* rulesets/Python_API.cpp: Remove experimental Python type code.
* server/Persistor_impl.h: Fix persisting plant fruits, and
character attributes.
2003-11-22 Al Riddoch <alriddoch@zepler.org>
* rulesets/Plant.cpp: Fix TickOperation() so it only runs if the
script doesn't handle it.
* rulesets/mason/world/objects/plants/Tree.py: Remove tickop
handler which is now in the base class.
2003-11-21 Al Riddoch <alriddoch@zepler.org>
* Ensure var directory for unix socket is available at install time.
2003-11-19 Al Riddoch <alriddoch@zepler.org>
* tools/cyphesis-setup: Comment out use of cydbload, no longer valid
in this version.
2003-11-18 Al Riddoch <alriddoch@zepler.org>
* Remove unecessary AC_ARG_PROGRAM call from configure.ac
2003-11-14 Al Riddoch <alriddoch@zepler.org>
* tools/cyloadrules.cpp: Ensure that tools still work with modified
non-blocking database API.
2003-10-30 Al Riddoch <alriddoch@zepler.org>
* common/const.h, common/const.cpp: Add constant for square
sight range.
* physics/Vector3D.h, physics/Vector3D.cpp: Move distance
function into .cpp file.
2003-10-30 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Add <cassert> for gcc 3.3
2003-10-29 Al Riddoch <alriddoch@zepler.org>
* common/const.h: Make constants static for efficiency.
* common/const.cpp, common/const.h: Add constant minimum size for
entities without boxes.
* physics/BBox.cpp, physics/BBox.h: Move box size function into
.cpp file, and make sure of minimum size if box is not valid.
2003-10-29 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp, common/const.h, common/random.h,
physics/BBox.h, physics/Collision.cpp, physics/Collision.h,
physics/Quaternion.cpp, physics/Quaternion.h, physics/Vector3D.h,
rulesets/Movement.cpp, rulesets/Plant.cpp, rulesets/Python_API.cpp,
tests/collisiontest.cpp: Update variables relating to geometry
from double to float as this is the type used internall by
WFMath.
* physics/Vector3D.cpp, physics/Quaternion.cpp, physics/Quaternion.h:
Remove legacy code.
* server/CommPSQLSocket.cpp: Reformatting.
2003-10-29 Al Riddoch <alriddoch@zepler.org>
* physics/BBox.h: Add functions for determing diagonal size of
bounding box.
2003-10-28 Al Riddoch <alriddoch@zepler.org>
* common/Database.h: Add a registry for all tables.
* common/Database.cpp: Add names of all database tables to the
registry. Clean up, fix and fully implement running maintainance
commands on all tables on request.
* server/CommPSQLSocket.h, server/CommPSQLSocket.cpp: Implement
timing variables for handling regular running of database
maintainance commands. Add code to schedule the commands to
idle method, alternating between VACUUM FULL and VACUUM ANALYZE.
2003-10-27 Al Riddoch <alriddoch@zepler.org>
* common/random.h: Fix code so there is no floating point exception
if randint is passed min == max.
* rulesets/Plant.cpp: Ensure that fruitchance is always initialised.
2003-10-27 Al Riddoch <alriddoch@zepler.org>
* common/Database.h, common/Database.cpp: Add function which
schedules queries required for routine database maintainance.
2003-10-27 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Add database socket to the idle set, so it
gets called for regular database maintainance.
* server/CommPSQLSocket.cpp, common/Database.cpp: Clean up and
disable the debugging output.
2003-10-27 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Add communications object to handle getting
the response to database queries without blocking.
* server/Persistance.h: Make database connection exposed so
that CommPSQLSocket can access it.
* server/CommPSQLSocket.cpp: Add debugging output, and implement
dispatching new queries once we have response to previous.
* common/Database.h, common/Database.cpp: Switch code to submit
all command queries via the async que, so we don't block
waiting for them to complete. Currently very noisy.
2003-10-26 Al Riddoch <alriddoch@zepler.org>
* rulesets/Pedestrian.cpp: Re-order and simplify code for handling
characters mode string. Implement changing characters direction
at collision.
2003-10-25 Al Riddoch <alriddoch@zepler.org>
* server/CommPSQLSocket.cpp: Implement processing the response to
async queries.
* common/Database.h, common/Database.cpp: Add new data and interface
for managing a queue of queries so they can be processed
asyncronously.
2003-10-24 Al Riddoch <alriddoch@zepler.org>
* tests/EntityExerciser.h, server/CommPSQLSocket.cpp:
Add <cassert> to keep gcc 3.3 happy.
* tools/cyconfig.cpp: Clean up formatting.
2003-10-24 Al Riddoch <alriddoch@zepler.org>
* server/CommPSQLSocket.cpp: Add some query processing code, and
comments about code to be written.
2003-10-24 Al Riddoch <alriddoch@zepler.org>
* server/CommPSQLSocket.h, server/CommPSQLSocket.cpp,
common/Database.h: Work in progress on Comm object to handle
non-blocking database communication.
* physics/Collision.cpp: Remove obsolete FIXME about non-valid
velocity.
2003-10-24 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Handle detecting collisions with a non-moving
target.
* rulesets/Movement.cpp: Turn off debugging output.
2003-10-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/Pedestrian.cpp: Skip collision detection pass if we have
stopped moving.
2003-10-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/Movement.cpp: Add valid checks when comparing velocity.
* rulesets/Character.cpp: Remove code which ignore pos if it is
the same as current.
2003-10-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Rename some variable in mindMoveOp()
to more accuratly reflect their meaning. Move direction
calculation code so it is now based on updated position, not
old position.
2003-10-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/Movement.h, rulesets/Pedestrian.h: Update movement
interface to reflect the different jobs done by genMoveOperation().
* rulesets/Movement.cpp: Fix badly named argument.
* rulesets/Pedestrian.cpp: Shift code around a little to ensure
it is clear that genMoveUpdate() only produces an op if one
is necessary, but genMoveOperation() should always return
one.
* rulesets/Character.cpp: Get rid of confusing logic now
That we know genMoveOperation() never returns NULL.
2003-10-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Re-work mind movement processing code,
eliminating some nasty corner cases, and making the whole
lot more readable.
2003-10-23 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp, rulesets/Entity.cpp, rulesets/Thing.cpp:
Avoid explicit constructor + copy constructor when assigning
vector classes from Atlas.
2003-10-22 Al Riddoch <alriddoch@zepler.org>
* tests/collisiontest.cpp: Fix collisiontest to work with modified
vertex/plane function interface.
2003-10-22 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.h, physics/Collision.cpp: Fix vertex/plane
collision function by removing returned normal, because it is
always the plane normal. Implement returning collision
normal from the mesh collision function.
2003-10-21 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Fix corner case in mesh collision code
so it is no longer possible to creep slowly through a solid
object.
2003-10-20 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Modify collision behavoir so we only
detect collisions in the future, while still detecting
collisions that are in progress. Add debugging and some
FIXMEs.
* rulesets/Movement.h, rulesets/Movement.cpp,
rulesets/Pedestrian.cpp: Switch to using new collision
code.
2003-10-18 Al Riddoch <alriddoch@zepler.org>
* tests/collisiontest.cpp: Add Location collision function test.
* physics/Collision.cpp: Fix box transformation and displacement
code. Handle locations which don't have an orientation. Test
now works.
2003-10-18 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Small fix to mesh collision function,
and add controlled debugging output.
* tests/collisiontest.cpp: Fixes to mesh collision test. Now works.
2003-10-18 Al Riddoch <alriddoch@zepler.org>
* tests/collisiontest.cpp: Add mesh collision function test,
and find that it doesn't work.
2003-10-17 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.h, physics/Collision.cpp: Fix mesh collision
functions. Modify return status of vertex/plane collision
return value so its more useful.
2003-10-17 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Fix vertex/plane collision prediction
function.
2003-10-17 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Add notes on how collision code has
to be modified.
2003-10-17 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Main body of collision code in place.
Needs cleaning, debugging and testing.
2003-10-17 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.cpp: Collision code now builds again.
2003-10-16 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.h, physics/Collision.cpp: More work on
collision detection implementation.
2003-10-16 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp, physics/Collision.cpp, physics/Collision.h,
physics/Vector3D.h: Move recently developed collision code into
module of its own, and give functions a new name.
* tests/collisiontest.cpp: Update test accordingly.
2003-10-16 Al Riddoch <alriddoch@zepler.org>
* physics/Collision.h, physics/Collision.cpp: More work on
collision detection.
2003-10-15 Al Riddoch <alriddoch@zepler.org>
* physics/BBox.h, physics/Vector3D.h: Remove historical vector
and bbox classes.
2003-10-15 Al Riddoch <alriddoch@zepler.org>
* tests/collisiontest.cpp: Add unit test for new collision code.
Seems to work.
2003-10-15 Al Riddoch <alriddoch@zepler.org>
* physics/Vector3D.h: Clean up notes, and implement collision
prediction function.
2003-10-15 Al Riddoch <alriddoch@zepler.org>
* physics/Vector3D.h: Clean up collision code, and add work in
progress on function to predict collision between point and
plane.
* modules/Location.cpp: Clean up methods and placeholder for new
oriented box prediction code.
2003-10-12 Al Riddoch <alriddoch@zepler.org>
* server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/CommServer.cpp,
server/CommMetaClient.cpp, server/CommMetaClient.h,
server/CommListener.cpp, server/CommListener.h,
server/CommClient.cpp, server/CommClient.h:
Add a new dispatch method to the socket interface, delaying
dispatch of incoming data until after it has been read, so that
a write timeout cannot occur during reading.
2003-09-22 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientAccount.cpp, aiclient/ClientAccount.h,
aiclient/ClientConnection.cpp, aiclient/ClientConnection.h,
aiclient/client.cpp, aiclient/client.h,
client/CharacterClient.cpp, client/CharacterClient.h,
client/ClientConnection.cpp, client/ClientConnection.h,
client/CreatorClient.h, example/client/CyphesisClient.cpp,
example/client/CyphesisClient.h, example/client/CyphesisClient2.cpp,
example/client/CyphesisClient2.h,
example/client/InheritanceClient.cpp,
example/client/InheritanceClient.h, tools/cycmd.cpp,
tools/cyconfig.cpp: Remove stray references to the LGPL.
2003-09-17 Al Riddoch <alriddoch@zepler.org>
* tests/Worldtest.cpp: Update test to take account of changes
in the BaseWorld interface.
* server/WorldRouter.cpp: Report an error if an entity creation
attempt of unknown type is attempted.
* server/EntityFactory.h, server/EntityFactory.cpp: Modify
unbound rule queue so it handles multiple rules depending
on a single parent.
2003-09-17 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.h, server/EntityFactory.cpp: Add
a wait queue for rules whose parent is not yet installed,
so installing rules in any order can be handled, and
there is no problem with rules inheriting from each other.
2003-09-17 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.cpp: Be much stricter about missing types,
and missing parents of types. Refuse to add types or instances
which have non-existant parents.
* common/BaseWorld.h, rulesets/Thing.cpp, server/Account.cpp,
server/Account.h, server/EntityFactory.h,
server/WorldRouter.cpp, server/WorldRouter.h:
Change names of functions used to add new objects to the world
to reflect that they do this. Handle failure to create an
entity.
2003-09-15 Al Riddoch <alriddoch@zepler.org>
* tools/cyloadrules.cpp: Fix tool so that it detects if it
cannot connect to the database, and does not incorrectly report
that it has succeeded.
2003-09-10 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Assert that world is not NULL.
* rulesets/Line.cpp: Turn off stray debugging flag.
* tests/Areatest.cpp, tests/Foodtest.cpp, tests/Linetest.cpp,
tests/Planttest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Thingtest.cpp, tests/Worldtest.cpp:
New tests for most C++ base IG classes, derived from the Entity
test.
2003-09-10 Al Riddoch <alriddoch@zepler.org>
* tests/allOperations.h: Add a header which pulls in headers for
every type of operation.
* tests/BaseEntitytest.cpp, tests/Entitytest.cpp,
tests/OOGThingtest.cpp: Make use of the allOperations header,
and common IG test thoroughly.
2003-09-10 Al Riddoch <alriddoch@zepler.org>
* tests/EntityExerciser.h: Make entity reference protected for use
by other exercisers.
* tests/IGEntityExerciser.h, tests/Entitytest.cpp: Implement
and use the attribute testing code.
2003-09-10 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp: Add in the unimplemented subscribe
method.
* tests/EntityExerciser.h: Add new functionality to properlly
exercise the dispatch/subscription mechansim.
* tests/BaseEntitytest.cpp, tests/OOGThingtest.cpp: Update tests
to use new EntityExerciser functionality.
* tests/IGEntityExerciser.h, tests/Entitytest.cpp: New test for
testing the IG Entity base class.
2003-09-10 Al Riddoch <alriddoch@zepler.org>
* tests/Locationtest.cpp: Quick simple test for Location.
2003-09-09 Al Riddoch <alriddoch@zepler.org>
* tests/OOGThingtest.cpp, tests/systemtest.cpp,
tests/inheritancetest.cpp: Include <cassert> as required.
* tests/utilitytest.cpp: Test for Element to Objects conversion
functions.
2003-09-09 Al Riddoch <alriddoch@zepler.org>
* tests/systemtest.cpp: Test for signal handling, daemon
related, and password encryption code.
* tests/EntityExerciser.h: Add testing dispatchers
as well as simple calling the operation methods directly.
* tests/OOGThingtest.cpp: Test for OOGThing class.
* tests/BaseEntitytest.cpp, tests/inheritancetest.cpp,
tests/logtest.cpp: Fix up copyright dates on recently added
files.
2003-09-09 Al Riddoch <alriddoch@zepler.org>
* tests/inheritancetest.cpp: New unit test for inheritance code.
2003-09-09 Al Riddoch <alriddoch@zepler.org>
* tests/logtest.cpp, tests/EntityExerciser.h,
tests/BaseEntitytest.cpp: Add some unit tests. Lots more to
come.
2003-09-08 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, client/Py_CreatorClient.h,
rulesets/Py_BBox.cpp, rulesets/Py_BBox.h, rulesets/Py_Location.cpp,
rulesets/Py_Location.h, rulesets/Py_Map.cpp, rulesets/Py_Map.h,
rulesets/Py_Mind.cpp, rulesets/Py_Mind.h, rulesets/Py_Object.cpp,
rulesets/Py_Object.h, rulesets/Py_Operation.cpp,
rulesets/Py_Operation.h, rulesets/Py_Oplist.cpp,
rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp, rulesets/Py_Optime.h,
rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_Thing.cpp, rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp,
rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/Python_API.cpp:
Clean up python API code, with decent names for types,
decent error reporting, and making the more paranoid checks
only present in debug build.
* common/BaseEntity.cpp, common/BaseEntity.h, server/Account.cpp:
Remove pointless method setRefnoOp, and put it in the body as
an inline method.
* common/BaseEntity.h, common/BaseWorld.cpp, common/Setup.h,
common/Tick.h, common/operations.h, common/custom.cpp,
common/types.h, common/utility.cpp, common/utility.h,
modules/Location.h, physics/Vector3D.h, rulesets/BaseMind.cpp,
rulesets/Script.h, server/EntityFactory.h:
Clean up the dependency trees using more forward declarations.
* common/inheritance.cpp, common/inheritance.h:
Move most of the implementation into the .cpp file as its
not suited to inlining.
* rulesets/MemMap.cpp, rulesets/MemMap.h, rulesets/MemMap_methods.h:
Move contents of MemMap_methods.h into the .cpp file, as it is
not suited to inlining, and remove the file from the build.
2003-09-07 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp: Clean up and re-classify error
reports in python code.
2003-08-30 Al Riddoch <alriddoch@zepler.org>
* server/Makefile.am: Move cyslave into EXTRAs so that its not
built by default.
* server/CommListener.cpp: Check that listener is open before using
it.
* common/log.h, common/log.cpp: Add log levels for output from
scripts.
* rulesets/Python_API.cpp: Add new python objects which replace
sys.stdout and sys.stderr, and redirect output to the
cyphesis logging mechanism.
2003-08-25 Al Riddoch <alriddoch@zepler.org>
* tools/cypasswd.cpp: Fix up cypasswd to work with updated accountbase.
Needs more work on options, and admin account feature.
2003-08-25 Al Riddoch <alriddoch@zepler.org>
* common/accountbase.h, common/accountbase.cpp: Add init
method required to make the database connection.
Clear up bugs in putAccount, and get putAccount to return
true/false correctly.
* common/Database.h, common/Database.cpp: Add extra arg to
updateSimpleRow so it can use any column as the key.
2003-08-24 Al Riddoch <alriddoch@zepler.org>
* tools/cypasswd.cpp: Remove an obsolete comment.
* common/Database.h, common/Database.cpp: Add the method required
to update a row of a simle database table.
* common/accountbase.h, common/accountbase.cpp: Re-implement
accountbase to use the new style accounts table.
2003-08-23 Al Riddoch <alriddoch@zepler.org>
* server/CommIdleSocket.h, server/CommIdleSocket.cpp,
server/CommListener.h, server/CommListener.cpp:
Fix virtual destructors.
* server/CommMetaClient.h: Remove obsolete includes.
* server/CommUnixListener.cpp, server/CommUnixListener.h:
Convert unix listener class to use the skstream listener
code.
2003-08-23 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Handle the case correctly if the metaserver
socket setup does not work.
* server/CommMetaClient.h, server/CommMetaClient.cpp: Re-write
CommMetaClient to use skstreams udp_socket_stream.
2003-08-23 Al Riddoch <alriddoch@zepler.org>
* server/CommListener.h, server/CommListener.cpp:
Convert listener class to use the skstream listener
code.
2003-08-21 Al Riddoch <alriddoch@zepler.org>
* configure.ac: Fix up help for python prefix option.
2003-08-19 Al Riddoch <alriddoch@zepler.org>
* common/Database.h: Workaround for older compilers which
don't handle private sanely.
* configure.ac: Re-write pthread test to handle more platforms.
2003-08-16 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Make server terrain random.
2003-08-16 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Add more terrain for testing.
2003-08-14 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Add lots more terrain to stress test clients.
2003-08-13 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Vector3D.cpp, rulesets/Py_Quaternion.cpp,
rulesets/Py_BBox.cpp: Add in-place construction and
destruction for all three python types which embed C++ objects.
2003-08-13 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Vector3D.cpp: Use in-place operator new on vector
object embedded in python object.
2003-08-13 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp, common/const.h: Remove the now obsolete
hard coded default admin password.
2003-08-13 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Make cycmd a little more flexible about remote
connections and account details, and allow it to attempt commands
without logging in.
2003-08-13 Al Riddoch <alriddoch@zepler.org>
* client/ObserverClient.cpp: Remove obsolete database include.
* tools/cycmd.cpp: Modify cycmd so it now uses a unix socket connection
for local server by default.
2003-08-13 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp, common/const.h: Add a const for the default
admin password hash, with a view to removing the plain text
default admin password.
* server/Persistance.cpp: Ensure that the database contains an
admin account on startup.
* common/Database.cpp: Move the call to register the ID generating
sequence out of the code for creating IG entity tables, as it is
also required by OOG entities, in particular the admin account
bootstrap.
* client/ObserverClient.cpp, client/ObserverClient.h,
client/client.cpp: Modify client so that it no longer attempts to
get account details from the database, or from a hard coded default.
It will now attempt a trusted login, or rely on password provided
by config option.
2003-08-12 Al Riddoch <alriddoch@zepler.org>
* Add a define which indicates if we are building against
python 2.0 or later.
2003-08-08 Al Riddoch <alriddoch@zepler.org>
* Comment out the exported libs, as nothing is using them.
2003-08-07 Al Riddoch <alriddoch@zepler.org>
* server/Lobby.cpp: Add some debugging messages.
* server/CommServer.cpp: Tweak select loop so that closed connections
are cleaned up as soon as they are detected.
* rulesets/World.cpp: Make demo terrain a bit more mountainous.
* Convert entire codebase over to using Atlas-C++ 0.4.90, as
start of transition to 0.6 API.
2003-07-25 Al Riddoch <alriddoch@zepler.org>
* common/type_utils.h, server/Account.cpp: Use wfmath
Atlas conversion functions correctly.
2003-07-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Clean up initialisation of python modules to
make code readable.
2003-07-21 Al Riddoch <alriddoch@zepler.org>
* server/Persistance.cpp, server/Restoration.cpp: Use DatabaseResult
clear() method to free result objects.
* server/CommMetaClient.cpp: Free address info in the event of a socket
failure.
2003-07-21 Al Riddoch <alriddoch@zepler.org>
* common/Database.h, server/Account.cpp, server/Account.h,
server/Admin.h, server/Connection.cpp, server/Player.h,
server/WorldRouter.cpp: Change the form of the getEntityId()
method in the database code and re-work the code that uses it.
* common/Database.cpp, common/Database.h: Use PQClear() to free
up database result objects, and provide a method to
free the contents of a DatabaseResult instance.
2003-07-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Fix leaked python reference.
* rulesets/World.cpp: Fix leaked terrain object.
2003-07-20 Al Riddoch <alriddoch@zepler.org>
* common/system.cpp: Add handler for SIGHUP, and clarify name of
signal handler. Fix error message typo.
2003-07-20 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Ensure world entity has its type set.
2003-07-20 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.h, server/WorldRouter.cpp, server/WorldRouter.h:
Remove old obsolete code for handling id generation.
2003-07-20 Al Riddoch <alriddoch@zepler.org>
* server/Persistor_impl.h: Avoid storing un-unitialised quaternion
values into database.
2003-07-19 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.cpp: Add debugging output required to monitor
use of entity factory.
2003-07-19 Al Riddoch <alriddoch@zepler.org>
* server/Persistor_impl.h: Force zero's when persisting a non
valid bounding box, to ensure nan doesn't get sent to the
database.
2003-07-19 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Add support for boolean columns.
* server/Persistor.cpp, server/Persistor_impl.h, server/Restorer.h,
server/Restorer_impl.h: Use a bool column to store whether or
not an entity has a bounding box, and use it apropriatly.
2003-07-19 Al Riddoch <alriddoch@zepler.org>
* Switch to using configure.ac
2003-07-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Debugging output to help debug
orientation.
2003-07-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_BBox.cpp, rulesets/Py_Quaternion.cpp,
rulesets/Python_API.cpp, server/Restorer_impl.h:
Add some casts and tweaks so that wrappers and
database code work with wfmath structures.
2003-07-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_BBox.cpp, rulesets/Python_API.cpp,
server/Restorer_impl.h: Put back the code won't work with WFMath.
2003-07-18 Al Riddoch <alriddoch@zepler.org>
* physics/BBox.h, physics/Quaternion.cpp, physics/Quaternion.h,
physics/Vector3D.h: Some cleanups.
2003-07-18 Al Riddoch <alriddoch@zepler.org>
* physics/BBox.cpp: New file to check BBox.h.
2003-07-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Tweak terrain to look a little better.
2003-07-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp, rulesets/Pedestrian.cpp:
Include atlasconv.h so that the conversions work.
2003-07-18 Al Riddoch <alriddoch@zepler.org>
* Migrate maths code to wfmath. Compiles and links, but lots has been
commented out.
2003-07-02 Al Riddoch <alriddoch@zepler.org>
* Clean up and improve rpm spec using new found techniques.
2003-06-20 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Fix variable name bug in non-debug build.
* Update Makefile.ams so that distcheck works.
2003-06-20 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Take account of Mercator API changes.
2003-06-15 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp, rulesets/Entity.cpp: Add the assert header
where required.
2003-05-29 Al Riddoch <alriddoch@zepler.org>
* physics/Quaternion.h: Intialise quaternion to unit length, in
case it leaks.
2003-05-28 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Refuse to create an account if this
connection already has one.
2003-05-16 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Flatten out terrain a little, for a more
realistic test.
2003-05-13 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp: Add a bit more terrain.
2003-05-12 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.cpp: Don't report Interrupted System Call on
select(), as this is normal when program is interrupted.
2003-05-11 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Provide full details of entity attributes.
* rulesets/World.cpp: Provide terrain basepoints by x,y index rather
than x,y position, as it makes more sense.
2003-05-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/Movement.cpp, rulesets/Movement.h,
rulesets/Pedestrian.cpp, rulesets/Pedestrian.h: Make movement
classes a little more generic by removing references
to character.
2003-05-09 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.cpp: Ensure that idle() gets called if
there are no waiting sockets.
2003-05-06 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.h: Switch to using tcp_socket_stream.
2003-05-06 Al Riddoch <alriddoch@zepler.org>
* server/CommListener.cpp: Ensure that IPv6 bind address is
fully and correctly initialised.
2003-05-06 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.cpp: Report errors with select(2).
2003-05-05 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.cpp, rulesets/Python_API.h,
rulesets/Python_API.cpp, rulesets/PythonThingScript.h,
rulesets/PythonThingScript.cpp, rulesets/PythonMindScript.cpp,
rulesets/Py_World.cpp, rulesets/Py_Thing.h, rulesets/Py_Thing.cpp,
rulesets/Py_Operation.cpp, rulesets/Py_Map.cpp,
rulesets/Py_Location.cpp, rulesets/Movement.h,
rulesets/MemMap_methods.h, rulesets/MemMap.h, rulesets/MemMap.cpp,
rulesets/Entity.cpp, rulesets/BaseMind.cpp,
client/Py_CreatorClient.cpp:
Rename all references from thing to entity, as thing is
no longer the base class for IG entities.
* rulesets/World.h, rulesets/World.cpp, rulesets/Thing.h,
rulesets/Structure.h, rulesets/Stackable.h, rulesets/Stackable.cpp,
rulesets/Plant.h, rulesets/Plant.cpp, rulesets/Missile.h,
rulesets/Line.h, rulesets/Line.cpp, rulesets/Food.h,
rulesets/Food.cpp, rulesets/Creator.h, rulesets/Character.h,
rulesets/Character.cpp, rulesets/Area.h, rulesets/Area.cpp:
Add a typedef for the parent class of all entity classes.
* rulesets/Plant.h, rulesets/Plant.cpp:
Add in code to fully integrate hardcoded attributes.
2003-05-04 Al Riddoch <alriddoch@zepler.org>
* Clean up member variable names.
2003-05-03 Al Riddoch <alriddoch@zepler.org>
* server/Restoration.cpp: Send restored entities a setup op, so the
AI gets initialised as if the entity had just been created.
* Clean up member variable names.
* rulesets/mason/mind/SkelMind.py: Get skeleton to recognise
settlers.
2003-05-01 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.cpp, rulesets/World.h: Rework terrain attribute
handling to use new agreed format. Add terrain attribute
to the special ranged sight handling.
2003-04-30 Al Riddoch <alriddoch@zepler.org>
* tools/cyphesis-setup: Add #!/bin/sh to be sure it gets treated
as a script.
* Add configure checks for Python 2.3, and update varconf checks.
2003-04-24 Al Riddoch <alriddoch@zepler.org>
* common/system.cpp: Clear the string portably.
* Add some missing headers to the source lists.
2003-04-23 Al Riddoch <alriddoch@zepler.org>
* server/CommListener.cpp: Sort out error messages if we
can't work out what the address is.
2003-04-23 Al Riddoch <alriddoch@zepler.org>
* server/CommListener.cpp, server/CommLocalClient.cpp,
server/CommRemoteClient.cpp, server/CommRemoteClient.h,
server/CommClient.cpp: Clean up code for getting
presentation format addresses as connection id.
2003-04-23 Al Riddoch <alriddoch@zepler.org>
* server/CommListener.cpp: Add IPv6 listen code.
2003-04-22 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp, server/Account.cpp, server/Admin.cpp,
server/Connection.cpp, server/Lobby.cpp: Make setting
op args more efficient.
2003-04-22 Al Riddoch <alriddoch@zepler.org>
* server/CommMetaClient.h, server/CommMetaClient.cpp: Make metaserver
code IPv6 compatable.
2003-04-19 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.h: Prevent copying of CommServer.
* server/Connection.cpp: Handle setting args more efficiently.
2003-04-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/World.h, rulesets/World.cpp, rulesets/Stackable.h,
rulesets/Stackable.cpp, rulesets/Plant.h,
rulesets/Plant.cpp, rulesets/Line.h, rulesets/Line.cpp,
rulesets/Entity.h, rulesets/Entity.cpp, rulesets/Character.h,
rulesets/Character.cpp, rulesets/Area.h, rulesets/Area.cpp,
common/type_utils.h, rulesets/Py_Thing.cpp, rulesets/Py_Mind.cpp,
client/Py_CreatorClient.cpp: Modify the way entities are queried
to avoid return by value, and use references instead.
2003-04-19 Al Riddoch <alriddoch@zepler.org>
* Switch to requiring pkg-config versions of libs, and make
postgres check more verbose.
* Disable metaserver by default. This is a devel server.
* rulesets/World.cpp, rulesets/World.h: Add terrain using
Mercator to the world entity, including the required attribute
handlers.
2003-03-22 Al Riddoch <alriddoch@zepler.org>
* client/CommClient.cpp, client/CreatorClient.cpp,
client/ObserverClient.cpp, client/Py_CreatorClient.cpp,
common/BaseEntity.cpp, common/BaseEntity.h,
common/types.h, rulesets/Area.cpp, rulesets/BaseMind.cpp,
rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Food.cpp, rulesets/Line.cpp,
rulesets/MemMap.cpp, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Thing.cpp,
rulesets/Python_API.cpp, rulesets/Stackable.cpp,
rulesets/Thing.cpp, rulesets/World.cpp,
server/Account.cpp, server/Admin.cpp, server/CommClient.cpp,
server/CommServer.cpp, server/Connection.cpp,
server/EntityFactory.cpp, server/Lobby.cpp,
server/Persistance.cpp, server/Player.cpp,
server/ServerRouting.cpp, server/WorldRouter.cpp:
Switch to using Element as name for Atlas::Message::Object,
to avoid name clashes on Object, and bring into line with
the way Atlas-C++ will be.
2003-03-22 Al Riddoch <alriddoch@zepler.org>
* common/system.h, common/system.cpp: Add code to md5 hash
strings, like passwords.
* server/Connection.cpp: Use md5 hash code for storing and
verifying passwords.
2003-03-21 Al Riddoch <alriddoch@zepler.org>
* modules/Location.h, modules/Location.cpp: Change location
member names to fit the Atlas attributes they map to, and
make it clear they are members.
2003-03-21 Al Riddoch <alriddoch@zepler.org>
* client/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, rulesets/MemMap.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Thing.cpp, rulesets/Thing.h,
server/Account.cpp, server/Admin.cpp, server/Connection.cpp,
server/Lobby.cpp, server/ServerRouting.cpp:
Use a more efficient technique to set the attributes on
operation arguments without a copy.
* common/BaseEntity.cpp, rulesets/Entity.cpp, rulesets/Thing.h,
rulesets/World.cpp, server/WorldRouter.cpp:
Move handling IG Look ops into the IG code in rulesets.
2003-03-20 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Re-work handling look ops for efficiency.
2003-03-18 Al Riddoch <alriddoch@zepler.org>
* Depend on devel skstream.
* server/CommLocalClient.cpp, server/TrustedConnection.h,
server/TrustedConnection.cpp: Added trusted connection on local
unix socket clients, which does not require a password for logins.
2003-03-18 Al Riddoch <alriddoch@zepler.org>
* server/Connection.h, server/Connection.cpp: Add virtual method
to verify account credentials.
2003-03-16 Al Riddoch <alriddoch@zepler.org>
* common/globals.cpp, common/globals.h: Add global variable for
the local state directory.
* server/Account.cpp, server/Admin.cpp, server/Admin.h,
server/Player.cpp: Tighten up some operation checking and add Create
handler to Admin in preparation for handling creation of new OOG
things.
* server/CommLocalClient.cpp, server/CommLocalClient.h,
server/CommRemoteClient.cpp, server/CommRemoteClient.h,
server/CommUnixListener.cpp, server/CommUnixListener.h,
server/CommClient.cpp, server/CommClient.h,
server/CommListener.cpp, server/Connection.cpp,
server/Connection.h, server/server.cpp:
Create new listener and connection classes using unix sockets
to allow local trusted connections.
* client/ClientConnection.cpp, client/ClientConnection.h,
client/CommClient.h, client/CreatorClient.cpp,
client/ObserverClient.cpp: Add capability to connect over
unix socket.
2003-03-07 Al Riddoch <alriddoch@zepler.org>
* Use " instead of < when including application headers.
* Re-work the interface between server and worldrouter objects
so that the are less tied together, and more flexible.
2003-03-05 Al Riddoch <alriddoch@zepler.org>
* server/Admin.cpp, server/CommClient.h, server/ServerRouting.h:
Small cleanups.
2003-02-27 Al Riddoch <alriddoch@zepler.org>
* Clean up pkgconfig checks.
2003-01-30 Al Riddoch <alriddoch@zepler.org>
* Make use of new Atlas-C++ pkgconfig checks.
2003-01-30 Al Riddoch <alriddoch@zepler.org>
* Make use of new varconf pkgconfig checks.
2003-01-16 Al Riddoch <alriddoch@zepler.org>
* mason.xml, rulesets/mason/world/objects/plants/Fir.py: Add new
fir tree rule.
2003-01-12 Al Riddoch <alriddoch@zepler.org>
* mason.xml, rulesets/mason/world/objects/outdoor/Campfire.py:
Add three missing rules.
* server/EntityFactory.cpp: Remove some old obsolete FIXMEs.
* server/Restoration.cpp: Remove redundant extra connection of
world persistor.
2003-01-12 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Add functions for removing
relation rows. Modify entity select method to handle an empty loc
correctly.
* rulesets/Thing.cpp: Correct indenting.
* rulesets/World.cpp: Trigger update in SetOperation() correctly.
* server/Account.cpp, server/Persistance.cpp, server/Persistance.h:
Inform Persistance modules when the account loses a character, so
this change is reflected in the database.
* server/Persistor.cpp: Move comments into the correct place.
* server/Restoration.cpp, server/Restorer.cpp, server/Restorer.h,
server/Restorer_impl.h: Persist and restore the world entity
attributes. Remove redundant argument from Restorer::populate().
2003-01-12 Al Riddoch <alriddoch@zepler.org>
* server/Restorer.h, server/Restorer_impl.h: Add method to allow
decoding of a complete atlas map from a database record.
* common/Database.cpp: Ensure failure is only returned if string
is not empty.
2003-01-11 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Add method to generalise
encoding atlas maps to string. Make the codec used by the database
code into a typedef, so production systems can use a more efficient
one.
* server/Persistor.cpp, server/Persistor_impl.h: Persist
Entity::attributes as an atlas encoded string column. Not yet
restored.
2003-01-06 Al Riddoch <alriddoch@zepler.org>
* server/Persistor.cpp, server/Persistor.h, server/Persistor_impl.h:
Separate the insertion of a new row from connecting and entities
signals to the persistor, and put them into different methods.
Modify constructor to allow subsidiary persistor objects to
be constructed, which don't try to register with the database.
* server/Restorer.cpp, server/Restorer.h, server/Restorer_impl.h:
Each Restorer template instance has a static Persistor
which it connects up to entities as it restores them, ensuring
that changes to restored entities are persisted.
2003-01-06 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Re-write the way ops are passed to mind
so that a character still works if it has no AI mind.
2003-01-05 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Fix some errors in the entity table
creation code.
* server/Persistor.cpp, server/Persistor.h, server/Persistor_impl.h:
Switch to using pointers instead of references with signals
to comply with sigc++ 1.2.
* tools/cycmd.cpp: Add a missing header, require for sigc++ 1.2.
* server/Persistance.cpp: Fixed error message.
2003-01-05 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Modify relation
table create query to allow different types of relation,
with constraints to be added. Implement function to
add rows to a relation. Modify result iterator constrcter
so it returns end() if the result is empty.
* server/Persistance.cpp, server/Persistance.h: New methods
to handle populating a newly restored account object
with characters, and syncing newly created characters to
the relation that links them with their account.
* server/Account.cpp, server/Account.h: New method to
add existing characters to this account. Inform persistance
system when we get a newly created character.
* server/Connection.cpp: Ask persistance system to populate
newly restored account with its characters.
2003-01-05 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp, server/ServerRouting.h:
Rename function for querying account by its name.
* server/Persistance.cpp, server/Persistance.h: Remove obsolete
function for loading Admin account.
2003-01-05 Al Riddoch <alriddoch@zepler.org>
* common/globals.cpp, common/globals.h, server/Connection.cpp,
server/Persistance.cpp, server/Persistance.h,
server/ServerRouting.cpp, server/server.cpp:
Move restricted flag out of persistance into globals.
* server/Account.h, server/Admin.cpp, server/Connection_methods.h,
server/WorldRouter.cpp: Remove unnecessary includes.
* server/ServerRouting.cpp: No longer necessary to load the admin
account at startup. Can be loaded on demand.
2003-01-03 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, server/Persistor.h: Make inheritance of
SigC::Object virtual, although multiple inheritance is not planned.
* common/Database.cpp, common/Database.h: Remove legacy account
table, and add support for generic non-inherited tables for OOG
data.
* common/Database.cpp, common/Database.h: Add general methods for
running queries and reporting errors, and cut down duplicated
code elsewhere by using them.
* common/accountbase.cpp, common/accountbase.h: Remove code
that used old account table, and replace with stubs. New
account yet to be written.
* server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/Player.cpp, server/Player.h:
Allow an id to be specified when creating an account.
* server/Persistance.cpp: Re-write account persistance methods
to use new table.
* server/Restoration.cpp: Clarify debug output.
2003-01-02 Al Riddoch <alriddoch@zepler.org>
* common/Database.h: Declaration for register relations.
* server/Account.cpp, server/Account.h, server/Admin.cpp,
server/Admin.h, server/Connection.cpp, server/Player.cpp,
server/Player.h, server/ServerRouting.cpp,
server/ServerRouting.h: Properlly separate username and id from
account, and use the database code to assign numerical ids to
account objects. Eliminate extraneous member variables in account.
* server/CommClient.cpp, server/CommServer.cpp,
server/CommServer.h, server/server.cpp:
Eliminate storing server name string twice.
2003-01-01 Al Riddoch <alriddoch@zepler.org>
* client/CreatorClient.cpp: Make reporting a little more verbose
now that ids are opaque.
2002-12-30 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Don't make update requests if no columns
are given to be updated.
* common/Database.cpp, common/Database.h: Add new method to select
all rows in a given class table with a given location.
* rulesets/Entity.cpp, rulesets/Entity.h: Make update_flags
public.
* rulesets/Entity.cpp, rulesets/Thing.cpp, rulesets/attributes.h,
server/Persistor.cpp, server/Persistor_impl.h,
server/WorldRouter.cpp: Add new cont column to entity tables which
is zero if the entity has no contained entities.
* server/Restoration.cpp, server/Restoration.h, server/Restorer.cpp,
server/Restorer.h, server/Restorer_impl.h:
Modify restorers so they now use a database result iterator to
indicate the row they should restore from.
* server/Restoration.cpp: Implement new way of restoring world from
database using new function to fetch multiple complete entities
from database at the same time. Massive speedup.
2002-12-28 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, rulesets/Character.cpp,
rulesets/Food.cpp, rulesets/Thing.cpp, rulesets/World.cpp:
Add arg to error method specifying where the error should go. Use
this arg to ensure that errors don't get broadcast.
* common/Database.cpp, common/Database.h, common/const.cpp,
server/Persistor.cpp, server/Restoration.cpp,
server/WorldRouter.cpp: Change id and loc column in entity tables
to integer for performance. Add id generator sequence to database.
* common/Database.cpp, common/Database.h, server/Persistance.cpp,
server/Persistance.h: Remove old legacy world, mind and server
tables as they are no longer used.
* common/BaseEntity.cpp, common/Load.h, common/Save.h,
common/custom.cpp, common/op_switch.h, common/operations.cpp,
common/operations.h, common/types.h, rulesets/BaseMind.cpp,
rulesets/BaseMind.h, rulesets/Character.cpp, rulesets/Character.h,
server/Admin.cpp, server/Admin.h, server/server.cpp,
tools/cycmd.cpp: Remove Load and Save ops.
* rulesets/Area.cpp, rulesets/Character.cpp, rulesets/Line.cpp,
rulesets/Plant.cpp: Fix != to |= when setting update flags.
* server/CommMetaClient.cpp, server/CommMetaClient.h,
server/CommIdleSocket.h, server/CommServer.cpp,
server/CommServer.h, server/server.cpp:
Add mechanism for sockets to be called whenever the server
is idle, so that they do period things. Use this mechanis,
to handle sending periodic packets to the metaserver, removing
special case code from CommServer.
2002-12-23 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h, common/BaseWorld.cpp, common/BaseWorld.h,
common/OOGThing.h, rulesets/Area.cpp, rulesets/Area.h,
rulesets/BaseMind.cpp, rulesets/Character.cpp,
rulesets/Character.h, rulesets/Creator.cpp, rulesets/Creator.h,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Food.cpp,
rulesets/Food.h, rulesets/Line.cpp, rulesets/Line.h,
rulesets/MemMap.cpp, rulesets/Plant.cpp, rulesets/Plant.h,
rulesets/Stackable.cpp, rulesets/Stackable.h,
rulesets/Structure.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h, server/Account.cpp,
server/CommClient.cpp, server/CommClient.h,
server/Connection.cpp, server/Connection.h,
server/EntityFactory.cpp, server/Lobby.cpp, server/Lobby.h,
server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h,
server/Restorer.cpp, server/Restorer_impl.h, server/ServerRouting.cpp,
server/WorldRouter.cpp: Assign ID at entity construction time,
and make it constant, and thus unmodifiable.
2002-12-23 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/OOGThing.h:
Add a protected constructor for initialising id at construction
time.
* common/Database.cpp, common/Database.h, server/Restorer_impl.h:
Switch argument order so default row can be first row.
* server/Persistor.cpp: Don't persist Creator objects.
* server/Restoration.cpp: Clean up debugging output, and report
serious errors.
* server/Restorer.cpp, server/Restorer.h: Add restorers for Character.
* server/server.cpp: Add log calls for restoring from database.
2002-12-22 Al Riddoch <alriddoch@zepler.org>
* physics/Quaternion.h, physics/Vector3D.h: Add accessors to
allow direct modification of coordinates.
* server/Persistor_impl.h: Remove duplicate attribute handler.
* server/Restoration.cpp: And in the final code for loading
restored entities from database.
* server/Restoration.h, server/Restorer.h,
server/Restorer_impl.h: Implement handler that populate
member variables of entity objects from database
structures.
* server/ServerRouting.h: Make WorldRouter reference public.
* server/WorldRouter.cpp, server/WorldRouter.h: Slight
modification to addObject(Entity *) to allow restored
objects to be added as well as new ones.
2002-12-21 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp, server/Admin.cpp:
Use consts::rootWorldId correctly.
* server/Persistor.cpp, server/PersistantThingFactory.cpp,
server/PersistantThingFactory.h, server/EntityFactory.h,
server/EntityFactory.cpp: Add World specialisation of Persistor
so that row in entity database is maintained, but not created.
* common/Database.h: Ensure iterator has != as well as ==.
* common/Database.cpp: Check that tuples have been returned
in response to a select.
* server/Restoration.cpp, server/Restoration.h,
server/Restorer.cpp: Restoration code now iterates over the
contents of the database, but does not attempt to actually
restore it yet.
2002-12-21 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Implement methods
to query database results.
* common/const.cpp, common/const.h: Add a const for the root
id.
* server/Restoration.cpp, server/Restoration.h: Start implementing
code to restore world from database.
2002-12-21 Al Riddoch <alriddoch@zepler.org>
* common/Database.h, common/Database.cpp: Add base to get rows
from entity tables. Flesh out the result iterator - untested.
Tweak various bits of query generating code to be a little
more efficient.
2002-12-20 Al Riddoch <alriddoch@zepler.org>
* common/Database.h: Add class for handling results from database.
* server/Restoration.cpp: Comment out pseudo-code.
* server/Restorer.h: Methods declarations for code to decode database
results.
2002-12-19 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.h, server/ExternalMind.h,
server/PersistantThingFactory.h: Fix header guard names.
* server/server.cpp, server/Restoration.h, server/Restoration.cpp:
Add beginning of class to handle restoring world state from database.
2002-12-19 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.cpp, server/CommServer.cpp, server/CommServer.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/server.cpp: Change the way main server object are created
to be more logical.
2002-12-19 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Make id column of entity tables a unique
primary key.
2002-12-19 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, server/Persistor.cpp, server/Persistor_impl.h:
Clean up debugging output.
2002-12-19 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.cpp, server/PersistantThingFactory.cpp,
server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h,
server/Persistor.cpp: Cut down template bloat by minimising the
places where template instances are created.
2002-12-19 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Add in code to send the entity requests
to the database.
* server/Persistor.cpp, server/Persistor_impl.h: Add type and
class columns, correct the name of the drunkness column,
and remove a bad test from the update query generator.
2002-12-18 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h: Handle the way SQL INSERT
requires column headers and values to be separated.
* server/Persistor.cpp, server/Persistor.h, server/Persistor_impl.h:
Add functions to generate INSERT queries for new entities.
2002-12-18 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Fix badly generated insert query.
* rulesets/Character.h: Add accessors for some hard attributes.
* rulesets/Entity.h, server/EntityFactory.cpp: Add a way of clearing
all the update flags, and clear them after creating the database
row.
* server/Persistor.h, server/Persistor_impl.h, server/Persistor.cpp:
Progress on the SQL update query generating code. Now generates
what looks like good update queries.
2002-12-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/Entity.h: Provide accessor for update flags.
* server/Persistor.h, server/Persistor_impl.h: Start adding
functions to build update query strings.
2002-12-17 Al Riddoch <alriddoch@zepler.org>
* server/CommMetaClient.cpp: Correctly initialise the size of
the from address structure.
* server/EntityFactory.cpp: Delete persistor connection once
its been used.
* server/EntityFactory.h: Ensure constructor is explicit.
2002-12-15 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Shuffle the way id is generated, so
its available for persistance.
* server/EntityFactory.h, server/EntityFactory.cpp: Pass id
into entityfactory so it can be passed to database.
2002-12-15 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, server/WorldRouter.cpp,
server/EntityFactory.h, server/EntityFactory.cpp:
Change the way the EnitityFactory is created so it has a
reference to the world.
* rulesets/Entity.h, rulesets/Entity.cpp: getLocation returns
whether an error occured setting location data.
* common/Database.h, common/Database.cpp: Add stub functions
for generating queries to new format entity tables.
* server/Persistor_impl.h, server/Persistor.h,
server/Persistor.cpp: Add hooks for syncing update to
database using new database functions.
2002-12-11 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.cpp: Make sure each factory is unique
so that they can be deleted.
2002-12-11 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Fix error creating tables.
2002-12-11 Al Riddoch <alriddoch@zepler.org>
* server/PersistantThingFactory.h: Prevent a new Persistor from
being created when a factory is cloned.
* server/EntityFactory.cpp: Add in the persistor hooks.
2002-12-10 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Clean up errors in new entity table
code.
* server/EntityFactory.cpp: Switch to using new persistant
factories.
* server/Persistance.cpp: Don't create test tables.
* server/PersistantThingFactory.h:
Clean up the way templates are used here, and simplify.
* Persistor.h, Persistor.cpp, Persistor_impl.h:
Implement object handles the persistance of the rulesets
classes. Currently does not implement any of the actual
persistance.
2002-12-10 Al Riddoch <alriddoch@zepler.org>
* server/PersistantThingFactory.h, server/PersistantThingFactory.cpp:
Work in progress on code to handle creating entities to be persisted.
* server/WorldRouter.cpp: Get rid of hard tab.
* rulesets/Thing.cpp: Clean up checks on new entities.
* server/EntityFactory.cpp: Be stricter about entity classes which
aren't installed properlly. Add comments about implementing
persistance. Removed redundant handling of name attribute.
2002-12-06 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Remove redundant includes
* tools/cycmd.cpp: Re-factor code to work non-blocking, allow
non-admin logins, and generally be more useful.
2002-12-01 Al Riddoch <alriddoch@zepler.org>
* rulesets/Thing.cpp: Fix very long standing moving bug, which
sometimes caused big jumps in character position.
* rulesets/Area.cpp, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Line.cpp,
rulesets/Plant.cpp, rulesets/Thing.cpp: Add in the hooks required
to inform persistance system when changes have taken place.
2002-11-28 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp, common/const.h, rulesets/Creator.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, server/WorldRouter.cpp:
Re-work omnipresent flag so it can only work in a debug build,
and has no performance impact on the production code.
2002-11-25 Al Riddoch <alriddoch@zepler.org>
* common/Database.h, common/Database.cpp, server/Persistance.cpp:
Finish entity table creation code, and test it.
* rulesets/Entity.cpp, rulesets/Entity.h, rulesets/EntityFactory.h,
rulesets/PythonThingScript.cpp, rulesets/PythonThingScript.h,
rulesets/Python_API.cpp, rulesets/Python_API.h,
rulesets/Thing.cpp, rulesets/Thing.h, server/EntityFactory.cpp,
server/EntityFactory.h, server/WorldRouter.cpp: Sort out
some incorrect use of Thing instead of Entity. Move some code
from Thing into Entity.
2002-11-25 Al Riddoch <alriddoch@zepler.org>
* common/Database.h, common/Database.cpp: Method to register new
entity tables.
2002-11-24 Al Riddoch <alriddoch@zepler.org>
* server/CommListener.cpp: Report socket errors.
* common/Database.h, common/Database.cpp: Re-write db code to use
the non-blocking C API.
2002-11-23 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.cpp, server/CommClient.h, server/CommListener.h,
server/CommServer.cpp, server/CommServer.h: Remove code commented
out during refactoring.
2002-11-23 Al Riddoch <alriddoch@zepler.org>
* server/CommMetaClient.cpp: Compliance fix. htons is not a function.
2002-11-23 Al Riddoch <alriddoch@zepler.org>
* Increment to devel version 0.3, and start breaking things.
* server/CommClient.cpp, server/CommClient.h, server/CommServer.cpp,
server/CommServer.h, server/server.cpp, server/CommListener.cpp,
server/CommListener.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommSocket.cpp, server/CommSocket.h:
Refactor network code so metaserver and listen socket are no longer
special cases, opening up the way for a database connection handler.
2002-11-21 Al Riddoch <alriddoch@zepler.org>
* Enable static libs in the rpm spec.
* Version 0.2 release.
2002-11-04 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Reject account creation or login with zero
length username.
2002-11-04 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Correctly set refno on responses to OOG ops.
2002-11-02 Al Riddoch <alriddoch@zepler.org>
* acorn.xml, mason.xml: Fix weight to be mass.
2002-11-01 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, server/Admin.cpp: Clean up admin interface so its
a bit more Atlas compliant.
* server/Connection.cpp, server/Player.cpp: Improve some checking.
* server/EntityFactory.cpp: Remove dead commented out code.
2002-10-31 Al Riddoch <alriddoch@zepler.org>
* cyphesis.init: Add code to load rules and map into the database
before the service first starts up.
* cyphesis.spec.in, cyclient.init: Add cyclient service, to populate
running server with game stuff.
* configure.in: Bump up to version 0.1.95
2002-10-26 Al Riddoch <alriddoch@zepler.org>
* client/CreatorClient.cpp, rulesets/BaseMind.cpp,
rulesets/Character.cpp, rulesets/Food.cpp,
rulesets/Thing.cpp, server/Connection.cpp:
Tighten up some atlas type checks, to reduce the chances of
bugs caused by malicious or buggy clients.
2002-10-17 Al Riddoch <alriddoch@zepler.org>
* common/system.cpp: Ignore sigpipe so we don't abort on some
systems if the client quits unexpectedly.
2002-10-17 Al Riddoch <alriddoch@zepler.org>
* configure.in, cyphesis-config.in: Fix the way sysconfdir and
datadir are handled in the config script.
2002-10-10 Al Riddoch <alriddoch@zepler.org>
* init script fixes.
* common/system.cpp: Ensure that parent of daemon exit status indicates
whether the daemon has started properlly.
* server/Connection.cpp: Clarify error reporting.
2002-10-07 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Fix up handling of imaginary ops.
* server/Connection.cpp: Clarify error reporting.
* rpm spec fixes.
2002-10-05 Al Riddoch <alriddoch@zepler.org>
* tools/cyphesis-setup: Clean up syntax.
* cyphesis.init, cyphesis.sysconfig, cyphesis.spec.in:
Init script and sysconfig for rpm and other packaging.
2002-10-03 Al Riddoch <alriddoch@zepler.org>
* Clean up README.
* Set version to 0.1.93 and release.
2002-10-03 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Add environment variables using a more
portable call to putenv() instead of setenv().
2002-10-03 Al Riddoch <alriddoch@zepler.org>
* Build file fixes.
2002-10-03 Al Riddoch <alriddoch@zepler.org>
* common/system.h, common/system.cpp, server/server.cpp: Moved all
the system dependant signal handling and background handling
code into system module, and implemented propper handling of
going into the background, including reporting error status
back to the waiting parent using exit status and user signals.
2002-10-02 Al Riddoch <alriddoch@zepler.org>
* physics/Vector3D.h: Cleaned up arithmetic operators.
* Clarified rpm descriptions.
* Big changes to make README more accurate and readable.
2002-09-17 Al Riddoch <alriddoch@zepler.org>
* tools/cyphesis-setup: Re-write of script to handle server setup.
Should handle more weird happenings now.
2002-09-14 Al Riddoch <alriddoch@zepler.org>
* server/Admin.cpp: Cleaned up an unimplemented feature, and added it
to the TODO.
* server/Account.h, server/Account.cpp: Removed unused obsolete code
for checking character types.
* rulesets/Python_API.cpp: Add new globals module to python API which
exposes core settings to the python scripts.
* rulesets/basic/hooks/ruleset_import_hooks.py: Abolish autogeneration
of this file using new globals module in the python API.
* configure.in, cyphesis-config.in: Expose conf and data dirs.
* tools/cyphesis-setup: New script to set the server up.
* tools/cyconfig.cpp: New tool to make persistant changes to the
server config.
2002-09-13 Al Riddoch <alriddoch@zepler.org>
* server/ServerRouting.cpp, common/const.h, common/const.cpp: Put all
the build dependant code in const.cpp, so no other file is
dependant on config.h.
* Add a cyphesis-config script, so other programs can tell where its
installed.
* Rework many of the build files so they are cleaner.
* Fix the readline C++ sanity check.
2002-09-11 Al Riddoch <alriddoch@zepler.org>
* Added IG help.
2002-09-08 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Add support for server OOG chat to admin client,
and note its shortcomings in BUGS.
2002-09-06 Al Riddoch <alriddoch@zepler.org>
* physics/BBox.h: Fixed farPoint() so it now does return the far
point, rather than the near point.
* modules/Location.h, rulesets/Python_API.cpp: Handle NULL parent
in location.
* NPC script bug fixes.
2002-09-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/PythonMindScript.cpp: Increase verbosity of reported
python script errors.
* rulesets/basic/mind/goals/animal/herd.py: Fix typo which meant
mind code was not working.
2002-09-04 Al Riddoch <alriddoch@zepler.org>
* Added various nifty bits of mason behavoir.
* rulesets/Py_Operation.cpp: Always return an error, if the script
does something invalid with the python API.
* rulesets/BaseMind.cpp: Implement operation triggers in
the mind scripts.
* Document some bugs, bring TODO up to date, and bump up version
to 0.1.92.
2002-08-30 Al Riddoch <alriddoch@zepler.org>
* common/globals.cpp: Only persist this sessions command line
options if the user is overriding the installation directory.
* cyphesis.vconf, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp:
Add client functionality to allow diferent scripts to be run to
perform different functions on the server.
* client/CharacterClient.cpp: Add debug option.
* rulesets/Character.h: Make mind operation functions virtual,
so they can be overridden.
* common/BaseWorld.h, server/WorldRouter.cpp,
server/WorldRouter.h: Add server functions to search for
entities by name or type.
* rulesets/Creator.h, rulesets/Creator.cpp: Allow creator to
specify a look without an id to search for entities with
a given name or type.
* client/CreatorClient.cpp, client/CreatorClient.h,
client/ObserverClient.cpp, client/ObserverClient.h,
client/Py_CreatorClient.cpp, rulesets/basic/editor.py,
rulesets/mason/define_world.py:
Add support for looking for entities in the world by name or
type from client script, so client scripts can modify existing
world.
* rulesets/Entity.cpp, rulesets/Movement.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Oplist.cpp, rulesets/Python_API.cpp,
rulesets/Stackable.cpp, rulesets/Thing.cpp,
rulesets/World.cpp, server/Account.cpp,
server/CommServer.cpp, server/Connection.cpp,
server/Player.cpp, server/ServerRouting.cpp,
server/server.cpp, tools/cycmd.cpp,
tools/cywatchdog.cpp: Code formatting cleanups.
* rulesets/basic/world/objects/tools/Bow.py: Fix up bow so it now
fires correctly.
2002-08-26 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.cpp: Simplify handling of socket errors,
and remove pointless warning.
2002-08-23 Al Riddoch <alriddoch@zepler.org>
* mason.xml, rulesets/mason/world/objects/plants/Birch.py,
rulesets/mason/world/objects/plants/Hickory.py,
rulesets/mason/world/objects/plants/Willow.py:
Fix missing scripts for trees.
2002-08-22 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Operation.cpp: Filled in missing SetArgs() functionality
for operations in the Python API.
* moraf.xml: Add an atlas entity map for mason.
2002-08-14 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.h, server/CommClient.cpp: Move exception
class to body, so noone else feels tempted to use it.
Remove excess debugging output.
2002-08-14 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.cpp, server/CommServer.cpp: Move exception
handling into the read method, and ensure correct handling
of the reading flag.
* server/CommClient.h: Fix exception constructor to be
ISO compliant.
2002-08-14 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.cpp, server/CommClient.h, server/CommClient.cpp:
Experimental version of a more comprehensive way to handle
client write timeouts, and a possible way to handle traffic
shaping in future.
2002-08-13 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.h: Don't disconnect connections when writing
times out.
2002-08-11 Al Riddoch <alriddoch@zepler.org>
* Added pkgconfig and sigc++ autotools macros into acinclude.m4
as only one or the other should be required, not both.
* server/Connection.h, server/Connection.cpp: Move large methods
into .cpp file to avoid bloat. Add in non ref method
for removing deleted objects, as references are a problem.
* Account.h, Account.cpp: characterDestroyed method now
takes value rather than reference because of sigc++. Add
necessary headers.
2002-08-11 Al Riddoch <alriddoch@zepler.org>
* Modifify configure tests to detect sigc++ 1.2.
* common/BaseEntity.h, server/Connection.h: Fix sigc++ headers
for sigc++ 1.2
2002-08-08 Al Riddoch <alriddoch@zepler.org>
* rulesets/EntityFactory.cpp, server/Account.cpp,
server/Connection.h, server/EntityFactory.h:
Ensure code is complient with the published sigc++ api.
2002-07-28 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp, server/Connection.cpp: Get rid of
character existance check on login, as dead ones are now handled
using SigC signals.
* rulesets/Entity.h, rulesets/Entity.cpp, rulesets/Py_World.cpp:
Remove pointless deleted flag, as the only time its true is when
the object has been deleted, and accessing would cause a segfault.
2002-07-27 Al Riddoch <alriddoch@zepler.org>
* tools/cyloadrules.cpp, server/server.cpp,
aiclient/ClientConnection.cpp, client/ClientConnection.cpp,
common/inheritance.h: Use const iterators and references
whenever possible.
* client/CommClient.cpp, client/CreatorClient.cpp,
client/ObserverClient.cpp, client/Py_CreatorClient.cpp,
common/BaseEntity.cpp, common/BaseEntity.h,
common/types.h, rulesets/Area.cpp, rulesets/BaseMind.cpp,
rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Food.cpp, rulesets/Line.cpp,
rulesets/MemMap.cpp, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Thing.cpp,
rulesets/Python_API.cpp, rulesets/Stackable.cpp,
rulesets/Thing.cpp, rulesets/World.cpp,
server/Account.cpp, server/Admin.cpp, server/CommClient.cpp,
server/CommServer.cpp, server/Connection.cpp,
server/EntityFactory.cpp, server/Lobby.cpp,
server/Persistance.cpp, server/Player.cpp,
server/ServerRouting.cpp, server/WorldRouter.cpp:
Switch to using Fragment as name for Atlas::Message::Object,
to avoid name clashes on Object.
* common/BaseEntity.h: Make BaseEntity inherit from SigC::Object,
so signals and callbacks can be used, and add destroyed
signal.
* common/accountbase.h, physics/BBox.h, physics/Quaternion.h,
physics/Vector3D.h, rulesets/MemMap_methods.h,
rulesets/Movement.cpp, rulesets/Plant.h,
rulesets/Py_Operation.cpp, rulesets/PythonMindScript.cpp,
rulesets/PythonThingScript.cpp, rulesets/Script.cpp,
common/inheritance.cpp: Cleaned up Atlas::Message::Object
use, and excessive use of "using ...".
* rulesets/Movement.h, rulesets/Pedestrian.h:
Use forward declarations rather than including Move.h
* server/Account.cpp, server/Account.h, server/Connection.cpp,
server/Connection.h: Use destroyed signal to ensure references
to in game entities are removed when those entities are
destroyed. Ensure Connection is only destroyed once.
2002-07-25 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, client/CommClient.h, client/CommClient.cpp: Fixed
up client code so it does not rely on username being the same as
account id.
* tools/cycmd.cpp: Added look and logout commands to administrate
users logged in.
* server/server.cpp: Fixed metaserver code so it only sends
termination packet if metaserver functionality is enabled.
* server/Connection.h, server/Connection.cpp, server/CommServer.cpp,
server/CommClient.h, server/Account.cpp: Fix logouts so they
do cause the client connection to be closed.
* Finished switch from Fire operation to Burn.
2002-07-25 Al Riddoch <alriddoch@zepler.org>
* Change fire operation to burn operation, to avoid clash with
fire entity. Change currently incomplete.
2002-07-23 Al Riddoch <alriddoch@zepler.org>
* common/const.h: Fix } position.
2002-07-23 Al Riddoch <alriddoch@zepler.org>
* common/const.cpp, common/const.h: Make consts modifiable in
the debug build.
* common/op_switch.h, rulesets/Character.cpp, rulesets/Character.h:
Fix missing logout op in op switchers.
* server/Account.cpp, server/Connection.cpp: Handle logouts
a bit differently, and return the info response process
expects.
* server/CommClient.cpp: Set connection id to client ip and port.
* server/CommServer.cpp: Tighten up the way eof is handled.
* server/ServerRouting.cpp: Set lobby id.
2002-07-21 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Clarified errors on malformed logins.
2002-07-14 Al Riddoch <alriddoch@zepler.org>
* ALL: Cleaned up headers into correct order.
* common/log.h, common/log.cpp: Write some logging code which
handles message of different types using syslog or standard
error, depending on whether we are running as a daemon.
* ALL: Switched to using log() for all output.
2002-07-14 Al Riddoch <alriddoch@zepler.org>
* tools/cyloadrules.cpp: Give rules in heigher level rulesets
priority over base rulesets.
* common/Database.cpp: Supress debugging output.
2002-07-10 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Spelling errors.
* configure.in: Remove unused cruft.
2002-07-01 Al Riddoch <alriddoch@zepler.org>
* tools/cypasswd.cpp, tools/cyloadrules.cpp: Cleaned up tool source.
2002-06-26 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.h: Cleaned some stray headers.
2002-06-26 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, server/CommClient.h,
example/client/InheritanceClient.h, client/ClientConnection.h,
client/ClientConnection.cpp: Switched to new skstream header
location.
2002-06-26 Al Riddoch <alriddoch@zepler.org>
* common/Database.h: Remove stray code.
* common/globals.cpp: Fix incorrect usage of share dir.
* server/Account.cpp, server/CommClient.cpp, server/CommClient.h,
server/CommServer.cpp, server/Connection.cpp, server/Connection.h,
server/Connection_methods.h, server/ExternalMind.cpp,
server/Lobby.cpp: Use reference instead of pointer in send
methods.
* server/CommClient.h, server/CommClient.cpp: Adding missing handling
for Logout.
2002-06-24 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, rulesets/Python_API.cpp: Remove some
debugging output.
* tools/cydbload.cpp, tools/cyloadrules.cpp: Check atlas files
exists.
2002-06-23 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.cpp: Fix leak if connection is deleted before
negotiation is complete.
2002-06-19 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.h, server/CommClient.h, server/CommServer.cpp,
server/CommClient.cpp: Re-factor the way client connections are
handled, so closed and blocked connections are disposed of more
cleanly.
2002-06-14 Al Riddoch <alriddoch@zepler.org>
* client/CreatorClient.cpp, client/CreatorClient.h,
client/Py_CreatorClient.cpp, rulesets/basic/editor.py: Add
features to allow query and manipulation of the world from
the client.
* rulesets/mason/define_world.py: Give the world a name.
2002-06-12 Al Riddoch <alriddoch@zepler.org>
* rulesets/acorn/world/objects/plants/seeds/Apple.py,
rulesets/mason/world/objects/plants/seeds/Apple.py,
rulesets/Character.cpp: Fix spelling of alcohol.
2002-06-11 Al Riddoch <alriddoch@zepler.org>
* configure.in: Bug fixes and tidying up.
* rulesets/mason/define_world.py: Remove acorn stuff, and get it
running.
* cyphesis.spec.in: Fix library dependancies.
2002-06-11 Al Riddoch <alriddoch@zepler.org>
* tools/Makefile.am, server/Makefile.am, client/Makefile.am,
autogen.sh, configure.in: Removed some overcomplicated and
unrealistic build options. Sort out all the library checking
to use the macros.
* Makefile.am: Reinclude acorn maps for packaging as Acorn.
* cyphesis.spec.in: Bring rpm spec up to date, with packages
for server, libs and game data.
* rulesets/Makefile.am: Fixed distribution of ruleset hooks .in file.
2002-06-10 Al Riddoch <alriddoch@zepler.org>
* Write rpm spec dividing stuff up into server package, lib
packages, and game packages. Clean up configure, and use autoconf
to process ruleset_import_hooks.py.
2002-06-10 Al Riddoch <alriddoch@zepler.org>
* Makefile.am, cyphesis.spec.in: Clean up install process, and update
rpm spec.
2002-06-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/define_world.py: Start re-work of NPC initialisation
for mason.
2002-06-08 Al Riddoch <alriddoch@zepler.org>
* common/const.h: Increase the sight range.
* server/WorldRouter.cpp: Put in some warnings, as I want to
know when ops are getting broadcast.
* server/server.cpp: Ensure stdout is not used when in daemon mode.
* tools/cydbload.cpp: Rename the daftly named class WorldBase
to WorldAccessor.
* mason.xml, cyphesis.vconf: Stop using the Acorn ruleset in Mason,
as it contains strange stuff, and remove the playable farmer
class from basic. Now games themselves define the only
playable types, and mason contains its own copies of classes
it has in common with acorn.
2002-05-21 Michael Koch <konqueror@gmx.de>
* configure.in: added --enable-debug
2002-05-21 Al Riddoch <alriddoch@zepler.org>
* server/ServerRouting.cpp, server/ServerRouting.h,
server/ServerRouting_methods.h: Workaround for older GNU compilers
that can't inline under certain circumstances.
2002-05-19 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Provide names on accounts for uclient.
2002-05-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Fix loss of set ops from mind.
2002-05-18 Al Riddoch <alriddoch@zepler.org>
* client/ObserverClient.cpp, server/Account.cpp, server/Connection.h,
server/Routing.h: Formatting cleanup
* client/Py_CreatorClient.cpp, rulesets/Area.cpp, rulesets/Area.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/Line.cpp, rulesets/Line.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Thing.cpp, rulesets/Stackable.cpp, rulesets/Stackable.h:
Replace operator[] with get() method for querying attributes.
Make this get() method const, and re-write the internals so
that it more cleanly handles attributes.
* common/BaseWorld.h: Re-write world.getObject() so that it
no longer uses std::map::operator[], as the old method was
inserting NULLs into the world dictionary when non-existant
entities were queried.
* rulesets/Character.cpp: Clean up outstanding issues when movement
position is supplied, and is very close to being correct, and
clarify comments about movement when neither destination nor
source are provided.
* rulesets/Character.cpp: Modify mind2body interface so that setting
the TO of ops is done in the individual handlers, and copying
the operation globally is avoided.
* rulesets/MemMap_methods.h: Remove dodgy debug code.
* rulesets/Pedestrian.cpp: Clarify movement fixme.
* rulesets/Py_Operation.cpp: Clarify operation time handler fixme.
* rulesets/Stackable.cpp: Clarify fixme's in combine and divide
handlers.
* server/CommServer.cpp: Remove redundant fixme.
* server/Connection.cpp, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/server.cpp:
Move inline ServerRouting::getObject into class header.
* server/WorldRouter.cpp, server/WorldRouter.h:
Clean up includes, and move updateTime into the main body of the
file. Clean up code formatting when handling maps and dictionaries.
Clarify error output and comments about NULL objects in the world
dictionary.
2002-05-17 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Operation.cpp, rulesets/Py_Operation.h: Add a variant
of the python Operation wrapper which handles const operations.
* rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp:
Pass const versions of operations to the python scripts, rather
than having to copy them.
* server/ServerRouting.cpp: Add build date, time and version to
server info.
2002-05-16 Al Riddoch <alriddoch@zepler.org>
* rulesets/MemMap.h: C++ compliance fix.
2002-05-16 Al Riddoch <alriddoch@zepler.org>
* client/CommClient.cpp, client/ClientConnection.cpp, tools/cycmd.cpp:
Ensure clients use username in login ops.
* common/BaseEntity.cpp, common/op_switch.h, rulesets/BaseMind.cpp:
Modify the way op switchers work so they can be used for functions
that return any type.
* rulesets/Character.cpp, rulesets/Character.h: Re-write world2mind
layer so that rather than copying ops that are to be sent to
the mind, the w2m functions returning a flag indicating whether
the op should be passed to the mind. Made w2m and mind op handlers
final, as they are never overridden.
* rulesets/Creator.cpp: Correct comments.
* rulesets/MemMap.cpp: Add comments clarifying behavoir, and remove
old pseudo-code.
* server/Account.cpp, server/Account.h: Ensure that an accounts
character dictionary only ever contains characters. Other entities
that the account chooses to create will no be stored here. Add
function to be called at login time to make sure that characters
stored here are still around.
* server/Connection.cpp, server/Connection.h, server/ExternalMind.cpp,
server/ExternalMind.h: When external mind of a character is
destroyed, ensure that the character is removed from the
connection's object reference store.
2002-05-15 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.h, server/WorldRouter.cpp, common/BaseWorld.h,
rulesets/Creator.cpp, rulesets/World.cpp: Removed unused and
unnecessary code from BaseWorld class, and move some stuff into
the WorldRouter where it belongs.
* rulesets/Character.cpp: Fixed a bug in the way ops from the
mind are handled which caused a segfault.
* rulesets/Character.h, rulesets/Creator.h: Made some functions
which are never overridden non-virtual for speed.
* rulesets/MemMap.cpp, rulesets/MemMap.h, rulesets/MemMap_methods.h:
Cleaned up the memmap code to get rid of inefficiency, and badly
written code.
* rulesets/Movement.cpp: Code formatting cleanup.
* server/Routing.h: Remove old commented out code.
2002-05-14 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp, server/Connection.cpp: Switched to using
USERNAME of accounts rather that ID for login and account creation.
Toughened up the connection code, so invalid login/create ops
are handled.
* server/Connection.h: Removed unused getObject method.
* rulesets/Character.cpp, rulesets/Character.h: Get rid of
inefficiency handling ops from internal and external mind. Fix
leak of some ops.
* common/BaseWorld.h, server/WorldRouter.cpp, server/WorldRouter.h:
Add method for getting a new serialno.
* rulesets/Thing.cpp, rulesets/Thing.h, server/WorldRouter.cpp:
Set refno on ops as they come back from entities. Set serialnos
on same ops at the same time, but do not set serialnos
on ops that come in from elsewhere, as those are now handled at
source.
* rulesets/Creator.cpp, rulesets/Character.cpp:
Ensure that ops from external client preserve their serialno,
and assign new serialnos to other ops created at the same time.
2002-05-13 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Fix slight inefficiency in processing ops.
* server/Account.cpp: Make sure accounts have names.
2002-05-11 Al Riddoch <alriddoch@zepler.org>
* rulesets/BaseMind.cpp: Fix NPC behavoir by ensuring that tick
and setup ops reach scripts.
2002-05-11 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp, rulesets/Movement.cpp, rulesets/Movement.h:
Tweaked movement code to cut down on redundant ticks when movement
has reached destination. Fixed bug where character jumped if it
walked into a building.
* rulesets/Pedestrian.cpp: Modified collision resolution so that
movement does not slow down if it is deflected.
2002-05-10 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp, modules/Location.h, physics/BBox.h,
physics/Vector3D.h, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/MemMap.cpp, rulesets/Movement.cpp, rulesets/Pedestrian.cpp,
rulesets/Py_BBox.cpp, rulesets/Py_Location.cpp,
server/Account.cpp, server/WorldRouter.cpp:
Get rid of operator bool() in vector and related classes,
so that errors are less likely to emerge in code. Make use
of Vector3D::isZero() where apropriate.
2002-05-10 Al Riddoch <alriddoch@zepler.org>
* physics/Quaternion.h: Added required comparison operators, and
get rid of operator bool, to ensure that no implicit conversion
happens where it shouldn't. Add operator required for debugging
Quaternion.
* modules/Location.cpp: Use new isValid() method instead of
relying on operator bool.
* rulesets/Movement.h, rulesets/Pedestrian.cpp, rulesets/Pedestrian.h:
Fix up interface for genFaceOperation() so it works the right
way round, and orientation is not actually set until the Move
op is genuinly dispatched.
* rulesets/Character.cpp: Add clearer debugging output.
Fix up handling orientation in move ops from mind, and generate
the move ops for simple change in orientation correctly.
2002-05-10 Al Riddoch <alriddoch@zepler.org>
* physics/Quaternion.cpp, physics/Quaternion.h: Revert hack to
quaternion sign convention, now that this has been resolved
by Ron in wfmath.
2002-05-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/Pedestrian.cpp: Fixed collision resolution so it
no longer affects orientation of colliding entities.
2002-05-08 Al Riddoch <alriddoch@zepler.org>
* rulesets/Movement.cpp, rulesets/Pedestrian.cpp: Hardened collision
code to try and catch the bug simon is seeing. Fixed some slight
bugs and inefficiencies in the process.
2002-05-07 Al Riddoch <alriddoch@zepler.org>
* rulesets/Pedestrian.cpp: Fix bug in movement logic that meant
small moves occured instantaneously.
* rulesets/Line.cpp: Fix to line code. Thanks to Wolfgang Beutner
for pointing out the bug.
2002-05-05 Al Riddoch <alriddoch@zepler.org>
* rulesets/Creator.cpp: Admin's creator entity serves no purpose
if it is no longer connected to a client, so it now destroys
itself if it is disconnected.
2002-05-03 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Fix atlas object output, so list and map contents
are shown.
2002-05-02 Al Riddoch <alriddoch@zepler.org>
* tools/cydbload.cpp, tools/cyisoload.cpp, tools/cyloadrules.cpp:
Clean up unused headers, and incorrect use of fstream in
some tools.
2002-04-30 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp: Get rid of default db username, so that
the current unix username is used instead.
2002-04-30 Al Riddoch <alriddoch@zepler.org>
* server/Persistance.h, server/Persistance.cpp:
Removed legacy code for passing admin account data to the
python client.
2002-04-25 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Correctly handle connections on account
object, so multiple logins on same account does not result in
corruption or crashes.
2002-04-25 Al Riddoch <alriddoch@zepler.org>
* rulesets/Entity.cpp, rulesets/Entity.h, rulesets/Character.cpp,
rulesets/Character.h, rulesets/Thing.cpp, rulesets/Food.cpp:
Renamed weight member as mass, and use this name in Atlas,
as this is a better convention, and has already been adopted in
stage.
* Switched python code to using mass instead of weight, as it is
a more accurate term.
* common/globals.cpp, common/globals.h, tools/cyloadrules.cpp:
Put admin modifiable config in etc instead of share directory.
* Don't build cycmd if readline is not available. Untested, and
probably nasty.
2002-04-12 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, common/BaseWorld.cpp,
common/Database.cpp, common/accountbase.h, modules/WorldTime.h,
rulesets/Py_World.cpp, server/Admin.cpp, server/Persistance.cpp,
server/Persistance.h:
Clean up includes.
* rulesets/Entity.cpp, rulesets/Entity.h: Write improved way of
handling immutable object attributes.
* server/EntityFactory.cpp, server/Player.cpp, server/Player.h:
Implement a character_types attribute on the player account,
by adding "playable" tag to rules database, and setting
up a set of character types when rules are read from database.
2002-03-19 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp, server/ServerRouting_methods.h,
server/ServerRouting.h, server/ServerRouting.cpp,
server/Routing.h, server/Routing.cpp, server/Connection.h,
server/Admin.cpp:
Removed inheritance from Routing by Connection and ServerRouting,
as there is almost no functionality in common. Get rid of global
idDict in ServerRouting is it serves little or no useful purpose.
IG objects are now managed in WorldRouter, and OOG objects in
ServerRouting.
* common/BaseWorld.h: Made accessor method const, as it should be.
2002-03-12 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, rulesets/Python_API.cpp, rulesets/Line.cpp,
modules/Location.cpp, client/CreatorClient.cpp:
Removed some obsolete comments.
* server/WorldRouter.h, server/WorldRouter.cpp: Add member to
deliver operation to known entity. Make use if it to avoid
having to recurse in operation() when broadcasting. Ensure
that the container of new entities is managed from here.
* rulesets/Thing.cpp: Tell world to create new entities at the
same position as the creator if no other info is provided.
Do not attempt to handle setting up the default containership
of entity once created, as this is always handled by the
WorldRouter from now on.
* rulesets/Py_World.cpp: Implement getting time info from world.
* rulesets/Py_Location.cpp: Implement handling of the orientation
attribute from python.
* rulesets/MemMap.cpp: Update comments about unimplemented code.
* rulesets/Creator.cpp: Check for string.empty() instead of "".
* rulesets/BaseMind.cpp: Remove reference python code.
Cleanly handle and delete operations returned when savinf mind state.
* client/CharacterClient.cpp: Move delete to the right place.
2002-03-11 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, server/Lobby.cpp, server/Connection.cpp,
rulesets/Character.cpp, client/client.cpp,
client/ObserverClient.cpp: ISO C++ compliance fixes.
2002-03-11 Al Riddoch <alriddoch@zepler.org>
* client/ClientConnection.h, client/ClientConnection.cpp:
Added a select() timeout to the connection polling, so the
client thrashes a bit less.
2002-03-11 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Eliminate unnecessary call to opEnumerate()
and enhance debugging output.
* server/Player.cpp: Correct the use of string.compare() in older
versions of libstdc++.
* common/types.h: Added enumeration for other operations, not
handled by the core, but considered valid. Added new type
for storing mapping between operation parents and their
enumerated type.
* common/op_switch.h: Separate handling of operations known to
be invalid from operations which are valid, but not explicitly
added to the core.
* common/inheritance.h, common/inheritance.cpp, common/custom.cpp:
Provide global operation mapping where enumeration of operations
can be looked up. Install all types handled by the core, and
types known to be used in scripts.
* common/BaseEntity.h, common/BaseEntity.cpp: Add object specific
operation mapping where operation types each object is subscribed
to can be enumerated, and others are rejected. Add mechanism
so that objects can add to the mapping, this subscribing to
operations. This makes enumerating operations much cheaper, and
eliminates the overhead of handling ops an object has no interest
in.
* rulesets/Thing.h, rulesets/Thing.cpp: Add mechanism so scripts
can subscribe to operations.
* rulesets/Character.h, rulesets/Character.cpp:
Add subscription mechanism for ops going to and from
the mind.
* rulesets/BaseMind.h, rulesets/BaseMind.cpp:
Add subscription mechanism for sight and sound perception
operations sub operations, and provide an interface to it
for scripts.
* server/Connection.cpp, server/Admin.cpp, server/Account.cpp,
rulesets/World.cpp, rulesets/World.h, rulesets/Thing.cpp,
rulesets/Stackable.cpp, rulesets/Plant.cpp, rulesets/Food.cpp,
rulesets/Character.cpp, rulesets/BaseMind.cpp:
Add subscriptions to operations for all core base classes.
* rulesets/Python_API.cpp: When script is created, go through
methods, and subscribe to the operations which are handled by
them.
* rulesets/Character.cpp: When calculating orientation of a walking
character, assume it is standing upright.
* physics/Vector3D.h: Add versions of mag() and distance() which
omit the square root calculations, so that when their values
are only used for comparison, the expensive square root
calculations can be ommited. Add new version of collision
and range checking functions which provide the optimal
interface to the application. Add versions of methods which
modify this rather than creating a new operation to eliminate
wasted copies.
* physics/Quaternion.cpp: Make use of faster interface provided
by Vector3D.
* physics/BBox.h: Add new version of collision checking function
which provides optimal interface to the application.
* modules/Location.h, modules/Location.cpp: Add new functions
to optimally calculate the distance between any two entities.
* modules/Location.h: Re-write collision and range functions to
make much more optimal use of Vector3D, BBox and distance
functionality.
* rulesets/Py_Vector3D.cpp, rulesets/Pedestrian.cpp,
rulesets/Movement.cpp, rulesets/Entity.cpp, rulesets/Character.cpp:
Eliminate implicit copies from vector arithmetic.
* rulesets/Pedestrian.cpp, rulesets/MemMap.cpp, common/const.h:
Re-write code which uses magnitude of vectors to use the square
of the magnitude instead, as it is much cheaper to calculate.
2002-03-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Location.cpp: Re-wrote commented out orientation
code so it uses the correct variable names.
2002-03-08 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp, common/BaseEntity.h, rulesets/Entity.h,
server/Connection.cpp: Remove destroy from the base class, and
make it non-virtual, as it is not used this way.
* rulesets/Entity.cpp: Clean up destroy, ensuring that contains
is managed correctly.
* server/WorldRouter.cpp: Eliminate duplicate contains management.
2002-03-08 Al Riddoch <alriddoch@zepler.org>
* server/Persistance.cpp, server/Connection.cpp, server/Admin.cpp,
server/Account.cpp, rulesets/Thing.h, rulesets/Thing.cpp,
rulesets/Stackable.cpp, rulesets/Py_Location.cpp,
rulesets/Entity.h, rulesets/Entity.cpp, rulesets/Creator.cpp,
rulesets/Character.cpp, common/BaseEntity.h, common/BaseEntity.cpp:
Get rid of flags used to determine object type, and get rid
of use of C style casts to cast between object pointers.
Replace both with dynamic casts. Clean up some stray casts
left behind from older versions of object structure.
* physics/Vector3D.cpp: Added note explaining when to use
Vector3D::relMag() instead of mag().
2002-03-08 Al Riddoch <alriddoch@zepler.org>
* Changed typedef names to ones which make more sense, and are
clearer. There is no change in functionality in this commit.
2002-03-08 Al Riddoch <alriddoch@zepler.org>
* common/globals.cpp, common/globals.h, rulesets/Python_API.cpp,
tools/cyloadrules.cpp: Make rulesets list a vector for
efficiency.
* common/utility.cpp, common/utility.h: New function to create
an operation from a message Object.
* rulesets/BaseMind.cpp, rulesets/MemMap.cpp, rulesets/MemMap.h,
rulesets/MemMap_methods.h, rulesets/Py_Map.cpp: Clean up
mind/memory interface, eliminating copies, unecessary allocations,
and passing more apropriate types around.
* server/CommClient.cpp, rulesets/Py_Operation.cpp: Make use of
operation converter where it is apropriate.
2002-03-07 Al Riddoch <alriddoch@zepler.org>
* common/inheritance.h: Cleaner handling of erroneous type
additions, and eliminate leakage.
2002-03-07 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.h, server/WorldRouter.cpp, rulesets/Thing.cpp,
rulesets/Entity.h, rulesets/Entity.cpp, common/types.h,
common/BaseWorld.h: Switched to using sets instead of lists
for contains, and other data structore for performance.
* rulesets/Line.cpp: Added debugging.
* rulesets/MemMap.cpp, rulesets/MemMap.h, rulesets/MemMap_methods.h:
Switch to using vectors instead of lists for performance.
2002-03-06 Al Riddoch <alriddoch@zepler.org>
* common/types.h: Added typedefs for some sequences used in
geomaps.
* common/type_utils.h:
Utility functions for types in types.h, used with Atlas.
* rulesets/Line.h, rulesets/Line.cpp, rulesets/Area.h,
rulesets/Area.cpp: Converted hard attributes over to the
correct type, and implemented setting and observing those
attributes.
2002-03-06 Al Riddoch <alriddoch@zepler.org>
* server/Routing.h: Map dictionary function more robust.
* rulesets/Pedestrian.cpp: Increased debugging output.
* rulesets/Character.cpp: Ensure it is handled if no move
op is created.
* physics/Vector3D.h: Ensure operator!= is implemented as
compiler cannot be relied upon to use operator== instead.
* common/inheritance.h, common/Database.cpp: ISO C++ fixes.
2002-03-06 Al Riddoch <alriddoch@zepler.org>
* rulesets/Line.h, rulesets/Line.cpp, rulesets/Area.h,
rulesets/Area.cpp, server/EntityFactory.cpp: Added stub
base classes for new geometric entities.
* server/ServerRouting.cpp, server/Lobby.h, server/Lobby.cpp,
server/Connection.cpp: Fleshed out lobby functionality,
so that accounts/connections are no longer responsible
for managing their own appearance and disappearance.
* server/Account.cpp: Send info of logout.
2002-03-06 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, server/WorldRouter.cpp, server/EntityFactory.cpp,
server/Connection.cpp, server/Admin.cpp, server/Account.cpp,
rulesets/World.cpp, rulesets/Thing.cpp, rulesets/Py_Operation.cpp,
rulesets/MemMap_methods.h, rulesets/MemMap.cpp, rulesets/Entity.cpp,
rulesets/Character.cpp, rulesets/BaseMind.cpp:
Use empty() instead of size() == 0 for STL sequence types.
* rulesets/ThingFactory.h, server/EntityFactory.cpp: Modified the
way adding classes to the inheritance tree is handled, so types
no longer have to inherit directly from a C++ class.
* server/WorldRouter.cpp: Modified the way broadcast operations are
handled to make them more efficient, and catch NULL pointers in
the world dictionary.
2002-03-05 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp, client/ClientConnection.cpp:
Removed c_str() where not required.
* server/CommServer.cpp: Cleaned up removal of dead connections.
* server/server.cpp, server/Persistance.cpp: Get rid of leaks
of factory and database connection objects.
* common/inheritance.h: Detect and flag errors introduced into
type tree.
* rulesets/MindFactory.h: Add method to shutdown factory.
2002-03-03 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h, common/accountbase.h,
server/Persistance.cpp, server/Persistance.h,
tools/cydbload.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp:
Modified class structure of database related classes to get
rid on nasty inheritance based idea. Add functionality
to handle updating a row as distinct from inserting. Made
id column the primary key. Updated tools to make propper use
of update functionality.
2002-03-03 Al Riddoch <alriddoch@zepler.org>
* client/CreatorClient.cpp: Fix operation semantics for admin
puppetting to new convention.
* common/Database.cpp: Add optional support for database password.
* physics/Quaternion.h: Add extra way of setting up a Quaternion.
* rulesets/MindFactory.cpp, server/Connection.cpp:
Move some output into debugging.
* rulesets/Python_API.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_Quaternion.h: Add support for quaternions into the
scripting API.
* rulesets/mason/define_world.py: Switch to using quaternions to
send orientation data to the server.
2002-02-22 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.h, server/WorldRouter.cpp, server/EntityFactory.h,
server/Account.h, server/Account.cpp, common/BaseWorld.h:
Clean up interface so that entities are passed around more simply.
* server/EntityFactory.cpp:
Get rid of redundant code, and ensure that all classes, even
undefined ones, have a type info node.
2002-02-18 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.h:
Prevent slicing.
* ./server/Player.cpp:
Add settler class to mason ruleset.
2002-02-18 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h:
Private un-implemented copy constructor and assignment operator,
so slicing won't occur.
* physics/Vector3D.h:
Switched collision detection with parent so only the case where
the subject is completely clear of the object is checked for.
* rulesets/Creator.cpp:
Implemented differentiation between priveleged in-game ops, and
normal in-game ops.
* rulesets/Movement.cpp:
Increased verbosity of debugging output.
* rulesets/Pedestrian.cpp:
Correctly implemented target based movement with changing containers.
2002-01-28 Al Riddoch <alriddoch@zepler.org>
* client/ClientConnection.cpp, client/CommClient.h,
common/globals.cpp, common/globals.h, server/server.cpp,
tools/cycmd.cpp:
Make the TCP port number a global config setting, and
ensure it is used everwhere, so it can be overriden, and all
clients and tools will use it. Modify behavoir so that any
settings overridden on the command line are made semi-permanent
in the users home directory, making it easier for users to run
two versions on one machine at the same time.
* common/Database.cpp, common/Database.h: Remove obsolete iterator
code. Add a method to clear a given database table.
* server/Persistance.h, tools/cyloadrules.cpp:
Automate loading of the ruleset given in the config file, and
the rulesets it depends on, ensuring that the rules table
is cleared first.
2002-01-27 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, client/client.cpp, common/globals.cpp:
Move loading of ruleset list from config file into the
generic loadConfig function.
* server/EntityFactory.cpp, server/EntityFactory.h:
Add support for reading mind data from rules database. Remove
old code for installing classes from varconf. Clean up debugging
output.
* server/Admin.cpp: Remove setting of varconf class when new
type is installed from client.
* rulesets/MindFactory.h, rulesets/MindFactory.h: Get MindFactory
working, and set it up so EntityFactory installs info here
as it reads the rules from the database.
* rulesets/Character.cpp: Use MindFactory to create minds.
* common/Database.cpp: Clean up some obsolete comments.
* aiclient/client.cpp: Get rid of invalid setup of varconf.
2002-01-27 Al Riddoch <alriddoch@zepler.org>
* common/Database.cpp, common/Database.h,
server/Persistance.cpp, server/Persistance.h:
Add a new table to store rulesets, so they can be persisted, and
edited online. The new ruleset format integrates information
about the class hierarchy, scripting and default attributes.
Added low level method to fetch an entire database table as an
Atlas map.
* tools/cyloadrules.cpp: New tool to load rulesets in new xml
format into database table.
* server/EntityFactory.cpp, server/EntityFactory.h:
New re-written Entity Factory, to support new rules database
table, and better class definition capabilities.
* rulesets/EntityFactory.cpp, rulesets/EntityFactory.h:
Removed from build.
* client/CommClient.cpp: Redundant include removed.
* rulesets/ThingFactory.h: Add storage to factory for script
info and default attributes.
* server/WorldRouter.cpp: Switch to using new EntityFactory.
* server/server.cpp: Removed old ruleset loading code, and now
simply load the ruleset names from the config file.
* tools/cycmd.cpp: Exit correctly if connection fails.
2002-01-23 Al Riddoch <alriddoch@zepler.org>
* client/ClientConnection.h, server/CommClient.h, tools/cycmd.cpp:
Ported to using skstream2.
2002-01-17 Michael Koch <konqueror@gmx.de>
* configure.in, tools/cypasswd.cpp:
check for termios.h and use it to turn off echo during input of
password in cypasswd when available
2002-01-14 Al Riddoch <alriddoch@zepler.org>
* C++ compliance fixes for gcc 3.
2002-01-13 Al Riddoch <alriddoch@zepler.org>
* modules/DateTime.cpp, modules/DateTime.h,
modules/WorldTime.cpp, modules/WorldTime.h:
Patch by Michael Koch to fix bugs, and pad out the implementation
of the time and date code.
2002-01-13 Al Riddoch <alriddoch@zepler.org>
* client/client.cpp, server/server.cpp, common/globals.cpp,
common/globals.h, tools/cycmd.cpp, tools/cydbload.cpp,
tools/cypasswd.cpp: Move code for handling loading of config
from the command line, user config and global config, into
globals.cpp, and make use of it in all tools.
* tools/cycmd.cpp: Fix objtype on server set commands.
* common/Database.cpp, common/Database.h: Implemented new database
interface to PostgreSQL to replace inadequate db3 code.
* common/database.cpp, common/database.h: Old code removed from the
build.
* common/accountbase.h, server/Admin.cpp, server/Persistance.cpp,
server/server.cpp, tools/cydbload.cpp: Fixed for minor changes
in the low level database API.
* common/globals.h, common/globals.cpp, rulesets/EntityFactory.cpp,
server/Admin.cpp, server/CommServer.cpp,
Remove varconf header from globals.h, and put in .cpp files
where it belongs.
2001-12-15 Al Riddoch <alriddoch@zepler.org>
* physics/Quaternion.cpp, physics/Quaternion.h: Corrected bugs
in the constructor which takes 2 vectors, and moved it out
of the header file. This appears to work now that the args
have been swapped round. See comments in Quaternion.cpp for
details.
2001-12-14 Al Riddoch <alriddoch@zepler.org>
* common/database.h: Add function to query database path for
error reporting.
* server/server.cpp: Added check to database initialisation so
that an error opening the databases is reported with explanation,
or logged as apropriate, and startup is aborted.
* phyics/Quaternion.h: Added quaternion class for represening rotation.
* modules/Location.cpp, modules/Location.h: Removed face attribute and
replaced with orientation which is a quaternion.
* rulesets/Character.cpp: Modified code which handles the direction
of movement, and how this affects the character rotation so it
now uses orientation.
* rulesets/Entity.cpp: Switch attribute checks from face to
orientation.
* rulesets/Movement.h, rulesets/Pedestrian.cpp: Modify movement
code so that orientation used instead of face.
* rulesets/Py_Location.cpp: Removed support for obsolete and
unused rotation attriute from python code.
* rulesets/Thing.cpp: Modified attriute handling to use orientation
instead of face.
2001-12-10 Al Riddoch <alriddoch@zepler.org>
* Fixed build files for debian, and converted bbox in define_world.py
to new format.
2001-12-06 Al Riddoch <alriddoch@zepler.org>
* common/database.h, common/database.cpp: Cleaned up header so
it no longer requires db3 headers, and reimplemented support
for debian.
* tools/cycmd.cpp: Fixed to work with new database headers.
2001-11-30 Al Riddoch <alriddoch@zepler.org>
* physics/BBox.h, rulesets/Py_BBox.h, rulesets/Py_BBox.cpp:
Added direct support for new format bounding boxes.
* modules/Location.cpp, modules/Location.h, physics/Vector3D.h,
rulesets/Character.cpp, rulesets/Creator.cpp, rulesets/Entity.cpp,
rulesets/Movement.cpp, rulesets/Plant.cpp, rulesets/Py_Location.cpp:
Switched over to using new format bounding boxes, and re-wrote
collision code for this format, making it clearer and more
efficient at the same time.
2001-11-26 Al Riddoch <alriddoch@zepler.org>
* common/persistance.cpp, rulesets/BaseMind.cpp, rulesets/Character.cpp,
rulesets/Entity.cpp, rulesets/EntityFactory.cpp, rulesets/Food.cpp,
rulesets/MemMap.cpp, rulesets/Thing.cpp, server/Admin.cpp:
Improved robustness and readability of code handling Atlas
attributes.
2001-11-26 Al Riddoch <alriddoch@zepler.org>
* server/Connection.cpp: Toughened up Logout handling, and made
type info Get handling more robust.
* server/Admin.cpp, server/Admin.h: Added capability for admin to
forcefully logout users.
* server/Account.cpp: Made handling of OOG Look ops more inline with
Atlas conventions, made args handling more robust.
2001-11-24 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, server/Admin.cpp, rulesets/EntityFactory.h,
rulesets/EntityFactory.cpp, common/inheritance.h, common/custom.cpp:
Modified EntityFactory so entity classes are automatically installed
in the inheritance tree as they are loaded.
* server/CommClient.cpp, server/Connection.cpp: Removed some debugging
output.
2001-11-23 Al Riddoch <alriddoch@zepler.org>
* common/custom.cpp, common/inheritance.cpp, common/inheritance.h:
Simplified and cleaned up inheritance query code, and hacked in
some of the OOG and IG classes.
2001-11-22 Al Riddoch <alriddoch@zepler.org>
* common/operations.cpp, common/Save.h, common/Nourish.h, common/Load.h,
common/Fire.h, common/Eat.h, common/Cut.h, common/Chop.h:
Fixed custom operations so they really do inherit from what I
claim they do.
2001-11-21 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.cpp: Set serialnos on error ops.
* common/inheritance.cpp, common/inheritance.h, common/custom.cpp:
Rationalise the way types are stored in the inheritance system
and install info about cyphesis custom operations.
* example/client/InheritanceClient.cpp,
example/client/InheritanceClient.h: Update to use skstream.
* server/ServerRouting.cpp, server/ServerRouting.h,
common/serialno.h, common/serialno.cpp: Switch to using
a more global easier to access source of serial numbers.
2001-11-11 Al Riddoch <alriddoch@zepler.org>
* Release cyphesis 0.1.
2001-11-10 Al Riddoch <alriddoch@zepler.org>
* Cleaned up auto* build files. Added more updated info to README.
* modules/Location.cpp: Removed redundant includes.
* rulesets/mason/define_world.py: Drop in copy of Acorn world.
* server/WorldRouter.cpp: Removed double delete of gameWorld.
* server/server.cpp: Modified comments about segfault in Python
shutdown, as this has now been eliminated.
2001-11-08 Al Riddoch <alriddoch@zepler.org>
* common/inheritance.h, server/Connection.cpp: Simplify behavoir when
type is unknown, and return an error to the client.
* server/Admin.cpp, server/Account.cpp, server/Connection.cpp: Ensure
serial number is set on all OOG operations.
2001-11-08 Al Riddoch <alriddoch@zepler.org>
* server/Lobby.cpp: Removed debugging output.
* server/Account.cpp: Added handling of private chat.
* physics/Vector3D.h: Added more operators for efficient arithmetic
with vectors.
* Added basis for mason ruleset.
Sunday, October 28 2001, James Turner <jmtn@blueyonder.co.uk>
* Updated configure.in to work with automake 2.5 (out here on
the edge, the blood is flowing thick and fast).
* Certain distributions do not have libTermcap, and instead
combine that functionality into NCurses; configure now
checks for this. This should behave correctly on both
RedHat and SuSE, particularly.
2001-10-28 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.h, server/Connection.h, rulesets/Pedestrian.h,
rulesets/Movement.h, rulesets/MemMap.h, physics/Vector3D.h,
modules/WorldTime.h, modules/Location.h, modules/DateTime.h,
common/Generic.h, common/BaseWorld.h: Ensure that single argument
constructors are explicit, so we don't get any naughty implicit
type conversion going on.
* server/CommClient.h: Added an operation dump feature for debugging.
2001-10-19 Al Riddoch <alriddoch@zepler.org>
* client/ClientConnection.cpp, client/ClientConnection.h,
tools/cycmd.cpp: Switched to using skstream to completely handle
client socket connections.
* client/ClientConnection.cpp, client/ClientConnection.h,
common/log.cpp, rulesets/EntityFactory.h, rulesets/MemMap.h,
server/server.cpp, tools/cycmd.cpp: Removed unused includes.
* client/Py_CreatorClient.cpp, client/client.cpp,
client/define_world.cpp, rulesets/Py_Location.cpp,
rulesets/Py_Location.h, rulesets/Py_Map.cpp,
rulesets/Py_Map.h, rulesets/Py_Mind.cpp, rulesets/Py_Mind.h,
rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Operation.h,
rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h,
rulesets/Py_Optime.cpp, rulesets/Py_Optime.h,
rulesets/Py_Thing.cpp, rulesets/Py_Thing.h,
rulesets/Py_Vector3D.cpp, rulesets/Py_Vector3D.h,
rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonMindScript.cpp, rulesets/PythonThingScript.cpp,
rulesets/PythonThingScript.h, rulesets/Python_API.cpp,
rulesets/Python_API.h, server/server.cpp:
Reorganised python header files so that each header includes
all the code relevant for a particular type. Tidied up
the type implementations. Added prototypes to init_python_api()
to the Python_API.h header, and removed other dependencies from
it.
2001-10-18 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.cpp, common/OOGThing.cpp, rulesets/Entity.cpp,
rulesets/EntityFactory.cpp, rulesets/MindFactory.cpp,
rulesets/Stackable.cpp, server/Account.cpp, server/Admin.cpp,
server/CommClient.h, server/CommServer.cpp, server/CommServer.h,
server/Connection.cpp, server/ExternalMind.cpp,
server/Persistance.cpp, server/Persistance.h,
server/ServerRouting.cpp, server/WorldRouter.cpp,
server/server.cpp: Removed unused includes and code. Added some
FIXMEs.
* rulesets/Thing.cpp: Added TO and FROM to faked Sight(Create()) ops.
* server/OOG_Thing.cpp, server/OOG_Thing.h: Marked files as removed.
2001-10-17 Al Riddoch <alriddoch@zepler.org>
* tools/cyisoload.cpp: Removed unused iso map loader tool, and
get rid of coal dependancy.
2001-10-17 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientConnection.cpp, aiclient/client.cpp,
client/ClientConnection.cpp, common/database.h, common/globals.cpp,
common/persistance.cpp, common/stringstream.h, server/CommClient.cpp,
server/CommServer.cpp, server/Persistance.cpp, tools/cyctrl.cpp,
tools/cyctrl.cpp, tools/cydbload.cpp, tools/cyisoload.cpp,
tools/cypasswd.cpp: Removed unused config.h.
* client/ObserverClient.cpp, common/const.h, tools/cycmd.cpp:
Use default password if the admin account cannot be fetched from
the database.
* client/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, rulesets/Character.cpp, rulesets/Creator.cpp,
rulesets/Entity.cpp, rulesets/Entity.h, rulesets/EntityFactory.cpp,
rulesets/MemMap.cpp, rulesets/Py_Mind.cpp, rulesets/Py_Thing.cpp,
rulesets/Py_World.cpp, rulesets/Thing.cpp, server/Account.cpp,
server/Admin.cpp, server/Connection.cpp, tools/cywatchdog.cpp:
Make many of the member variables of Entity protected, and add
the required accessors. Changed the name of the id attribute
to m_id.
* common/BaseWorld.h, common/database.cpp, common/persistance.cpp:
Removed unused includes.
* common/Chop.h, common/Cut.h, common/Eat.h, common/Fire.h,
common/Generic.h, common/Load.h, common/Nourish.h, common/Save.h,
common/Setup.h, common/Tick.h: Moved definition of virtual
functions into cpp file, to reduce wasted code.
* common/Makefile.am: Create cyphesis library, which can be used by
other applications to access cyphesis databases.
* common/config.h, common/database.h, server/Persistance.cpp,
tools/cydbload.cpp, tools/cyisoload.cpp, tools/cypasswd.cpp:
Remove conditional compilation of db code. db3 is now required.
* server/WorldRouter.h: Fixed getNewId() so it take const string.
* server/server.cpp: Removed python shutdown, so it does not
mess up the db if it causes a segfault.
2001-10-10 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Modified semantics of OOG ops, so the args
have a loc attribute indicating what room they take place in.
* server/Connection.cpp: Added support for OOG appearance and
disappearance ops.
2001-10-10 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Made variable names clearer.
* server/Connection.cpp: Fixed adding accounts to lobby on login.
* server/server.cpp: Limited the scope of the CommServer object
so that it is destructed before the rest of shutdown can
take place.
2001-10-10 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp, server/Lobby.cpp: Fixed OOG chat semantics.
2001-10-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Fixed another leak in the python code.
2001-10-09 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp, rulesets/PythonMindScript.cpp,
rulesets/Py_Oplist.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Map.cpp: Fixed some points in the code where Python
objects are not decreffed, and are thus leaked.
2001-10-09 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, rulesets/Python_API.cpp: Added function
to shutdown python. Ensure that all references that should be
decrefed during initialisation are.
* tools/cywatchdog.cpp: Moved watchdog pidfile, so it is in
cyphesis specific dir.
* tools/cyctrl.cpp: Moved in watchdog control program, which
makes controlling the watchdog easier.
2001-10-07 Al Riddoch <alriddoch@zepler.org>
* tools/cywatchdog.cpp: New watchdog which works with new server
behavoir.
2001-10-07 Al Riddoch <alriddoch@zepler.org>
* watchdog/watchdog.c: Deprecated non-working watchdog program.
* tools/cypasswd.cpp, tools/cycmd.cpp, client/ObserverClient.cpp,
common/accountbase.h Added database delete method, which closes
the database, and make sure it is used.
* server/server.cpp: Moved the point where the server drops to
a daemon, as doing this after the db was open seems to corrupt
the db.
* common/database.cpp: If a db is opened but not created, then it
is read only.
2001-10-06 Al Riddoch <alriddoch@zepler.org>
* configure.in: Switch to using improved checks for Atlas-C++ and
python.
* common/const.h, common/const.cpp, rulesets/Python_API.cpp:
Removed unused consts.
* common/globals.h, common/globals.cpp, server/server.cpp:
Enable running as a daemon in the background by default.
This improves usability by removing dependance on users
session. Install signal handlers so signals cause clean
shutdown.
* tools/cycmd.cpp: If adminning server on localhost, get admin
password directly from database, instead of asking user.
Allows cycmd to be used in scripts. Ensure that exit
status accuratly reveals whether the command was sent.
* tools/cypasswd.cpp: Switch to using common/accountbase.h.
2001-10-06 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Mind.cpp: Fixed a leak python object.
2001-10-03 Al Riddoch <alriddoch@zepler.org>
* server/CommServer.cpp: Remove non-fatal "FATAL..." message when
client closes connection.
* rulesets/Thing.cpp: If object to be created has no loc, set loc
to be the same as creator before passing to the factory.
* rulesets/Entity.cpp: Clarify debug output when determining location
of new entities.
* client/CommClient.cpp: Push output into debug mecanism. Switch
order of Create/Login for admin account so ordinary operation
does not issue an error. Admin account is created at startup,
so there is no need for the client to create it.
2001-09-13 Al Riddoch <alriddoch@zepler.org>
* server/CommClient.cpp, server/CommClient.h, server/CommServer.cpp:
Re-organised negotiation code so it is non-blocking. Server is now
a bit less easy to attack.
* Marked files that are no longer part of the build with #error so
they never get built by accident.
2001-09-13 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Moved CommServer and CommClient into their own
files. Cleaned up debugging output.
* rulesets/EntityFactory.h, server/CommServer.h: Fixed headers so
the required ones are included.
* server/Persistance.cpp: Re-wrote shutdown method so it deletes
the class instance.
2001-09-13 Al Riddoch <alriddoch@zepler.org>
* BUGS: Note that C++ version of client currently does not work.
* TODO: Update on important issues which allow easy DOS attacks.
* client/ClientConnection.cpp, client/ClientConnection.h:
Cleaned up unused code from ClientConnection class.
* client/client.cpp: Removed monitoring section of client
so it simply exits once the world is initialised.
* rulesets/basic/mind/goals/humanoid/werewolf.py:
Started work on dynamic goals for playing werewolf.
* rulesets/werewolf/define_world.py: Added in the mayor, who runs
werewolf games.
* common/BaseEntity.h: Made id of entity private, and implemented
accessors.
2001-08-19 Al Riddoch <alriddoch@zepler.org>
* client/CharacterClient.cpp: Removed commented out code.
* client/CreatorClient.cpp: Fixed processing the response
to a create operation, and cleaned up debugging output.
* client/ObjserverClient.cpp, client/ObserverClient.h,
client/client.cpp: Added setup method, which which handles
connecting, negotiation, logging in and creating character.
* client/Py_CreatorClient.cpp: Added check if make() failed.
* rulesets/Python_API.cpp: Fixed setting the import hooks
list properlly to include the ruleset list in use, instead
of hardcoding it.
* rulesets/acorn/define_world.py: Copied define_world.py script
from client directory for Acorn.
* rulesets/basic/editor.py: Modified to be used from C++ core.
* rulesets/basic/mind/goals/__init__.py,
rulesets/basic/mind/goals/humanoid/werewolf.py:
Added in goals file to contain goals related to werewolf.
* rulesets/basic/mind/panlingua/interlinguish.py:
Added in vote and execute verbs for werewolf.
* rulesets/werewolf: Added in new ruleset for werewolf.
2001-08-16 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Ensure that login op is flushed after it is sent.
* server/Player.cpp: Arg order of std::string.compare() is
incompatable between recent libstdc++ versions. Switch
back to old version, still in most common use.
* rulesets/Thing.cpp: Set refno on ops handled in game.
* rulesets/Python_API.cpp: Modify Entity() python constructor
so that commonly used attributes from old atlas are translated
to their modern equivalents.
* rulesets/Py_Thing.cpp, rulesets/Py_Mind.cpp: Differentiate
between previously identical error messages in several places.
* rulesets/Py_Object.cpp: Rework conversion of python dict to
Atlas map to be more efficient and clean.
* rulesets/Py_Location.cpp: Rework setting of vector parts of
location so that it can accept vectors from python in more
formats, including lists and tuples.
* rulesets/Creator.h, rulesets/Character.h, common/BaseEntity.h:
Re-order virtual methods declarations to fit a convention.
* common/stringstream.h: Hardcode use of local stringstream class,
as the version provided with older libstdc++ seems to be broken.
* common/database.cpp: Use the common header to pick the right
stringstream implementation.
* common/BaseWorld.cpp, server/Persistance.cpp: Removed unused
stringstream include.
* rulesets/Creator.cpp: Added extra debug output.
* client/define_world.h, client/define_world.cpp, client/CommClient.h:
Use CreatorClient to store Creators mind, instead of BaseMind.
* client/client.cpp,
client/ObserverClient.h, client/ObserverClient.cpp,
client/CreatorClient.h, client/CommClient.h, client/CommClient.cpp:
Modify method names to fit capitalisation conventions.
* client/CreatorClient.cpp: Implement creation of in-game entities,
using creator entity.
* client/CommClient.cpp: Added correct client side monitoring of
creator entity.
* client/ClientConnection.h, client/ClientConnection.cpp: Added
pending method to establish if ops are in the queue. Switched send()
method so we only send ops. Add setting of serialno of sent
ops, starting with an offset of 512.
* client/CharacterClient.h: Removed unused member, opFound.
* client/CharacterClient.cpp: Debugged sendAndWait() method.
2001-08-14 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, server/CommClient.h, client/ClientConnection.h,
tools/cycmd.cpp: Switched to using skstream library for socket
comms instead of hand rolled fstream based version.
* ALL FILES: Fixed use of std namespace throughout all code.
2001-08-14 Al Riddoch <alriddoch@zepler.org>
* module/DataTime.h: Added includes so header is independant.
* client/CommClient.cpp: Fixed leak of operations.
* client/CharacterClient.h, client/CharacterClient.cpp,
client/CreatorClient.h, client/CreatorClient.cpp:
Added in mind classes for handling creator on client side.
2001-08-13 Al Riddoch <alriddoch@zepler.org>
* client/client.cpp,
client/ObserverClient.cpp, client/ObserverClient.h,
client/ClientConnection.cpp, client/ClientConnection.h,
client/define_world.cpp, client define_world.h:
Started re-coding of python client code in C++.
* common/accountbase.h:
Database class used for simply accessing accounts.
* common/OOGThing.cpp, common/OOGThing.h, server/Account.h,
server/Routing.h:
Moved OOGThing class into common as it is not server specific.
* common/BaseWorld.cpp, common/BaseWorld.h,
server/WorldRouter.cpp, server/WorldRouter.h,
rulesets/Entity.h, rulesets/Py_World.cpp,
rulesets/PythonThingScript.cpp, rulesets/Python_API.h,
rulesets/Thing.cpp, rulesets/Thing.h:
Added base class for WorldRouter so that code that previously
used WorldRouter now used the interface defined by this
new class. This means that the code in rulesets no longer
has dependencies on code in server, so can be used in the client.
* server/ExternalMind.cpp, server/ExternalMind.h,
rulesets/Character.h, rulesets/Creator.cpp,
server/Account.cpp:
Moved ExternalMind class into server as it is server specific,
so that there is no dependancy on server in rulesets.
* server/Persistance.cpp. server/Persistance.h,
server/Admin.cpp, server/ServerRouting.cpp, server/server.cpp:
Moved high level server specific persistance class into
server, so there is no dependency on server in common.
* common/database.cpp, common/database.h, server/Admin.cpp,
tools/cydbload.cpp, tools/cyisoload.cpp, tools/cypasswd.cpp:
Increases efficiency of some interfaces by passing Object::MapType
instead of MapType, when the value must be a map.
* modules/WorldTime.cpp, modules/WorldTime.h,
rulesets/Py_WorldTime.cpp, rulesets/Python_API.cpp:
Brought the version of WorldTime in modules up to date, as this is
the version now used.
* rulesets/Character.cpp, server/WorldRouter.cpp, rulesets/Thing.cpp,
server/Admin.cpp:
Made world objects dictionary private.
* rulesets/EntityFactory.cpp, rulesets/EntityFactory.h:
Change newThing parameters so entity factory does not need to
know about WorldRouter.
* server/Lobby.cpp: Added support for people and rooms attributes
of OOG room class.
2001-08-02 Al Riddoch <alriddoch@zepler.org>
* common/inheritance.cpp, common/inheritance.h: Added code to store
atlas object inheritance tree.
* server/Connection.cpp: Added code to allow client to query
atlas object inheritance using get ops.
* example/client/InheritanceClient.*: Added example client which
queries the inheritance tree of the server.
* rulesets/MemMap.h, rulesets/Py_Map.cpp: Made hooks lists private,
and added methods to access them.
* server/Account.cpp, server/Lobby.h: Added correct handling of OOG
look ops when looking at own characters, other accounts, or the
lobby.
* server/ServerRouting.h: Added function to generate serial numbers
for operations.
* server/WorldRouter.cpp: Assign genuine serial number to all
in game operations as they are pulled off the queue.
* Cleaned up header file multiple inclusion checks for uniqueness,
and made sure of ISO compliant use of std::string.
2001-07-28 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Fixed setting parents and objtype on world
entity.
2001-07-23 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Fixed setting name of characters startup coin
objects.
* modules/Location.cpp: Added bounding median to attributes sent
using Atlas.
* common/BaseEntity.cpp: Always set the id on an entity.
2001-07-16 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, server/ServerRouting.h, server/ServerRouting.cpp,
server/CommServer.h: Added support for server "name" which
defaults to the hostname of the server machine, but is
customisable in the config. This can be used in preference to
IP address when doing lookups with the metaserver.
* server/Lobby.h, server/ServerRouting.h, server/Account.h,
server/Account.cpp, rulesets/Stackable.h, rulesets/Stackable.cpp,
rulesets/Python_API.cpp, rulesets/Py_Object.cpp, rulesets/Plant.cpp,
rulesets/Pedestrian.cpp, rulesets/Entity.h, rulesets/Entity.cpp,
rulesets/Character.h, rulesets/Character.cpp, common/BaseEntity.h,
common/BaseEntity.cpp: Modied asObect() and addToObject()
methods to make them more efficient.
* modules/Location.h, modules/Location.cpp: Removed old obsolete
Message::Object based addToObject() method.
* rulesets/Thing.cpp: Optimised apperance/disappearance code.
2001-07-12 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Cleaned up loading of config files, so that
an invalid installation is reported more clearly, and more
usefully.
* rulesets/acorn/world/objects/animals/Pig.py: Fixed creating ham in
the right place.
* rulesets/Movement.cpp: Fixed leaving containers so that if the initial collision with parnet bounding box is missed, character
does not get stuck.
* rulesets/EntityFactory.h: Cleanup code is now cleaner.
* rulesets/EntityFactory.cpp: Removed unecessary varconf dependancy
in rulesets code.
* rulesets/Character.cpp: Allow move ops from mind with no loc set.
* physics/Vector3D.h: Included check for inTime so that if entering
time is in the future, this is detected.
* modules/Location.cpp, modules/Location.h: Provided method
to add location to a map.
2001-07-04 Al Riddoch <alriddoch@zepler.org>
* client/define_world.py: Fixed and refined the market traders.
Sorted out random face direction.
* tools/cypasswd.c: Re-wrote tool to use database class, and thus
ensure it is trying to access the right database.
* common/database.cpp, common/database.h: Added function to remove
accounts from the account database.
2001-07-01 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Characters now sober up over time.
* client/define_world.py: Add in market traders to run all the
stalls in the market.
* common/persistance.cpp: Set default admin password to something
a bit more difficult to guess.
* rulesets/basic/mind/goals/common/misc_goal.py:
Fixed run_shop() goal, so NPCs now open and close their market
stall.
* agrilan*.xml: These really are the final versions for Acorn 0.4
2001-06-26 Al Riddoch <alriddoch@zepler.org>
* agrilan*.xml: Final versions for Acorn 0.4
2001-06-24 Al Riddoch <alriddoch@zepler.org>
* server/Lobby.h, server/Lobby.cpp, server/Account.cpp: Added code
for querying lobby, then disabled it as it seems to hang uclient.
* rulesets/basic/mind/panlingua/interlinguish.py,
rulesets/basic/mind/goals/common/misc_goal.py,
client/mind/panlingua/interlinguish.py: Added goal to
maintain opening and closing market stalls, and goal for having
a meal.
* rulesets/basic/mind/goals/common/move.py: Fixed assemble goal
meaning lych now works again.
* rulesets/basic/mind/Memory.py: Adapted query for location of
entity so that it accepts lists of possible types.
* rulesets/Character.cpp: Enabled creating items by NPCs.
* client/define_world.py: Updated NPC behavoir.
2001-06-23 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Fixed leak of codec and varconf configuration.
2001-06-22 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Handle cleaning up after database load.
* server/WorldRouter.cpp: Switch to using stringstream to
generate ids.
* rulesets/Thing.cpp: Re-write SetupOperation so Sight
operation is not lost and leaked.
* rulesets/Python_API.h, rulesets/Python_API.cpp,
rulesets/Py_WorldTime.cpp, rulesets/Py_World.cpp,
rulesets/Py_Thing.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Object.cpp: Sort out correct handling of
python references, and ensure C++ objects are
deleted as required.
2001-06-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/acorn/world/objects/plants/seeds/Seed.py,
rulesets/acorn/world/objects/plants/seeds/Apple.py,
rulesets/acorn/world/objects/plants/Tree.py,
rulesets/acorn/world/objects/plants/AppleTree.py:
Adjusted the weight and therefor the nutritional value of
apples and acorns. Reduced the number dropped by trees to
improve game performance.
2001-06-18 Al Riddoch <alriddoch@zepler.org>
* rulesets/acorn/world/objects/plants/Tree.py,
rulesets/acorn/world/objects/plants/Oak.py,
rulesets/acorn/world/objects/plants/AppleTree.py:
Modified tree code so mode is set to fruit if they are carrying
any fruit.
* Added xml entity maps for agrilan.
2001-06-17 Al Riddoch <alriddoch@zepler.org>
* tools/cydbload.cpp: Modified database loader so it can
load multiple maps and merge them into the database.
* rulesets/acorn/world/objects/buildings/FarmHouse2.py: Fix typo
in the class name.
* acorn.vconf, rulesets/acorn/world/objects/buildings/Stall.py:
Added proper support for market stalls.
2001-06-17 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp: Fixed bug in looking at characters code.
* rulesets/acorn/world/objects/buildings/Inn2.py: Fix walk bounding
box.
* acorn.vconf: Added normal square brown tent.
2001-06-17 Al Riddoch <alriddoch@zepler.org>
* server/Account.cpp, server/Account.h: Added ability to look
at characters to get details fter login before joining game.
2001-06-16 Al Riddoch <alriddoch@zepler.org>
* Manual tweaks of build files to build static binaries.
2001-06-16 Al Riddoch <alriddoch@zepler.org>
* Fixed up build files to install in a conformant way.
* acorn.vconf: Added in new building classes which set up
wall objects for collision purposes. Building now seem to
work.
* common/database.cpp, common/database.h, common/globals.cpp,
common/globals.h, rulesets/Python_API.cpp, server/server.cpp,
watchdog/control.c, watchdog/watchdog.c: Implemented
correct way of getting installation directories from
autoconf.
* rulesets/Movement.h, rulesets/Movement.cpp, rulesets/Pedestrian.h,
rulesets/Pedestrian.cpp: Fixed collisions with the solid
wall of a structure.
* rulesets/Thing.cpp: Modified setup operation so that a sight
of create operation is always generated even if setup is
overloaded.
* Many fixes from Anders Petersson to get the build working under
debian.
2001-06-12 Al Riddoch <alriddoch@zepler.org>
* client/define_world.py: Removed heap of coins from startup.
No longer required as characters get given coins at startup.
* rulesets/ThingFactory.h, rulesets/ThingFactory.cpp,
rulesets/EntityFactory.h, rulesets/EntityFactory.cpp:
Removed bulky manual factory system with a proper template based
factory system.
2001-06-11 Al Riddoch <alriddoch@zepler.org>
* client/define_world.py: Add bounding boxes to oak trees.
* rulesets/Entity.cpp: Added support for setting bounding box.
* rulesets/MemMap.cpp, rulesets/MemMap.h: Add looking at
contains attribute of entities to mind's map.
2001-06-09 Al Riddoch <alriddoch@zepler.org>
* tools/cycmd.cpp: Code cleanup and rationalisation. The
arguments now make more sense, the usage info is correct,
and works, and the code should be more portable.
* server/server.cpp, rulesets/Pedestrian.cpp: Shifted output over
to debug only.
* server/Account.cpp: Added in a hack which gives characters
some money on startup.
* modules/DateTime.cpp: Hardcoded Acorn 1:3 time.
* common/const.h: Increased sight range to be closer to the client
view size.
* client/world/objects/Thing.py: Tweak so that server side money
creation does not crash client.
* client/define_world.py: Move warriors to be spead around the
inn courtyard.
* cyphesis.vconf: Enable metaserver by default, and automatic
loading of world state from db at startup.
2001-06-04 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.h, server/WorldRouter.cpp, rulesets/Thing.cpp,
server/Account.cpp: Modified server to use Entity * instead
of Thing *.
* Removed unnecessary includes from many files.
* common/config.h, configure.in, common/persistance.cpp:
More config changes to try and get it working on Debian.
2001-06-04 Al Riddoch <alriddoch@zepler.org>
* tools/cydbload.cpp: Added parameter handling so any file can
be loaded into the database.
* tools/cycmd.cpp: Cleaned up usage and help functions.
* tools/cyisoload.cpp: Cleaned up usage(), and made sure build
completes okay if libraries are missing, and missing
functionality is reported to the user.
* server/server.cpp: Added config options that specifies that
the contents of the db should loaded on server startup. Cleaned
up some debug code.
* server/WorldTime.cpp, server/WorldRouter.cpp,
server/Connection.cpp, rulesets/Structure.h,
rulesets/Python_API.cpp, rulesets/Py_WorldTime.cpp,
rulesets/Movement.cpp, rulesets/Entity.cpp,
physics/Vector3D.h, common/persistance.cpp,
common/database.h, common/database.cpp: Removed output either
to debug mode, or removed altogether.
* common/BaseEntity.h, common/BaseEntity.cpp: Removed redundant header
includes.
* server/ServerRouting.cpp, common/persistance.h,
common/persistance.cpp: Modified admin account function names it
fit convention.
* module/Location.h: Fixed collision detection so that entities
with velocity set to 0 still get checked.
* rulesets/Entity.cpp, rulesets/Thing.cpp, rulesets/Character.cpp,
rulesets/BaseMind.cpp, rulesets/Creator.cpp,
rulesets/ExternalMind.cpp, rulesets/Food.cpp, rulesets/MemMap.cpp,
rulesets/Movement.cpp, rulesets/Pedestrian.cpp, rulesets/Plant.cpp,
rulesets/Py_Location.cpp, rulesets/Py_*.cpp, rulesets/World.cpp:
Removed unnecessary #includes.
2001-06-03 Al Riddoch <alriddoch@zepler.org>
* configure.in: Tiny fix to jmt's improved sigc detection.
Bumped version up to 0.0.13 for pre-release of Acorn 0.4.
2001-06-01 Al Riddoch <alriddoch@zepler.org>
* rulesets/Pedestrian.cpp: Fixed setting of walking direction when
a collision occurs.
* server/WorldRouter.cpp, server/WorldRouter.h: Fixed uptime
measurement which was grossly out because it subtracted the
server initTime twice, and did not take account of the
in game start time offset.
2001-05-30 Al Riddoch <alriddoch@zepler.org>
* configure.in, common/config.h, common/database.h, tools/cypasswd.cpp:
Added config check that looks for DB3's db_cxx.h on default
include path if it cannot be found in db3/. This fixes building
on Debian.
* server/server.cpp, server/WorldRouter.cpp, acorn.vconf,
globals.h, globals.cpp: Added inittime config option used to
influence the game time used at server startup.
* server/WorldTime.cpp: Added in new time of day descriptions for
more flexible goals.
* server/ServerRouting.cpp: Removed output used to debug memory
cleanup code.
* rulesets/basic/mind/goals/common/misc_goal.py: Added time
parameters to trading goals.
* rulesets/Thing.cpp: Fixed appearance/disappearance operations
which were not getting sent most of the time.
* client/define_world.py: Added in more NPC and modified behavoir.
Everyone now goes to the inn for lunch and in the evening, and
market traders only work during the day.
2001-05-29 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp, server/CommClient.h, server/Account.h,
server/Account.cpp, rulesets/Entity.h, rulesets/Entity.cpp,
rulesets/Character.h, rulesets/Character.cpp, rulesets/BaseMind.h,
rulesets/BaseMind.cpp, common/types.h, common/operations.h,
common/op_switch.h, common/BaseEntity.h, common/BaseEntity.cpp:
Added support for imaginary operations used in a similar way
to emoting.
* server/WorldTime.h: Added update method so underlying DataTime
can be updated.
* server/ServerRouting.h, server/Lobby.h, server/Lobby.cpp
server/ServerRouting.cpp, server/Connection.h,
server/Connection.cpp, server/Account.h, server/Account.cpp: Added
a lobby object which handles lobby chat. Essentially it stores
a list of accounts and allows operations to be sent or broadcast
to other accounts.
* rulesets/Py_WorldTime.cpp: Added python is_now() method because
using comparison does not appear to work.
* rulesets/BaseMind.cpp: Added updating of minds WorldTime each
time an operation is received.
* modules/DateTime.h: Added operator << so DateTime can be sent
to cout.
* common/types.h: Added types for storing accounts in Lobby.
2001-05-28 Al Riddoch <alriddoch@zepler.org>
* Renamed Operataion method names throughout so they no longer
all have the name Operation but are now called MoveOperation,
according to the type of operation they handle.
* modules/DateTime.cpp, modules/DataTime.h: Filled in functionality,
allowing initialisation and updating from a time values in seconds.
* modules/Location.h: Modified collision detection code so no
checking is done between two moving objects.
* rulesets/BaseMind.h, rulesets/BaseMind.cpp, rulesets/Entity.h,
rulesets/Entity.cpp: Removed virtual getMap() method and replaced
with a fixed method in BaseMind only. Added time member veriable
to BaseMind so each mind keeps track of time by itself.
* rulesets/Python_API.h, rulesets/Py_Mind.cpp, rulesets/Py_Mind.h:
Added specific python interface for mind objects, because if
increasing differences in the way this must be handled.
* rulesets/Character.h, rulesets/Character.cpp: Added isAlive flag
which is cleared if the character is dead. If this flag is cleared,
operations are no longer sent to the mind.
* rulesets/Movement.h, rulesets/Movement.cpp, rulesets/Pedestrian.h,
rulesets/Pedestrian.cpp: Cleaned up the code, made members more
distinctive, and make interface more general.
* rulesets/Py_Thing.cpp: Removed features used to support mind.
* rulesets/Py_WorldTime.cpp: Added support for comparison of
time with strings, to establish whether it matches descriptions
of time.
* rulesets/Python_API.cpp: Modified creating of scripts so mind
scripts use a slightly different interface from entity scripts,
to support the fact that a mind handles its own timekeeping,
has a memory map, and has no access to the world.
* server/WorldTime.cpp, server/WorldTime.h: Brought WorldTime into
the build. Used to track details of the time. Added support for
checking time descriptions such as "midday", "summer" against
DateTime.
2001-05-24 Al Riddoch <alriddoch@zepler.org>
* rulesets/Entity.cpp: Added dynamic attributes to atlas entity
representation.
* rulesets/Py_World.cpp: Added get_object() method so that python
scripts can actually interact with other objects.
* rulesets/basic/mind/goals/common/misc_goal.py: Fixed hunt goal
so that the arrow is removed from inventory as it is fired.
* client/define_world.py: Added archer, arrow and deer to test
shooting code.
* server/server.cpp: Made CommClient more robust in the event
if immediate disconnection by initialising pointers to NULL;
2001-05-23 Al Riddoch <alriddoch@zepler.org>
The memory leak crackdown
* rulesets/BaseMind.cpp, rulesets/MemMap.h, rulesets/MemMap.cpp:
Add code to flush a characters memory as its mind is
deleted.
* rulsets/Character.cpp: Delete movement class associated with
character when character is deleted.
* rulesets/EntityFactory.h, rulesets/EntityFactory.cpp: Delete
all the entity factories when the server shuts down.
* rulesets/PythonScript.cpp: Decrease reference of and thereby
delete the python script at delete time.
* server/ServerRouting.cpp: Delete all the objects in idDict,
which should include all in game objects, and all explicitly
out of game objects, like accounts.
* server/WorldRouter.cpp: Delete all pending operations, gameWorld
object. Ensure that an object is deleted from ServerRouting's
idDict when it is deleted from the world.
* server/CommServer.h, server/server.cpp: Added CommServer destructor
which deletes all client objects and the server object.
* server/server.cpp: Delete the database persistant object and the
entity factory at shutdown.
2001-05-22 Al Riddoch <alriddoch@zepler.org>
* client/define_world.py: Added archers who can hunt deer.
* rulesets/basic/mind/goals/common/misc_goal.py:
Added the hunting goal.
* rulesets/basic/mind/goals/common/move.py: Modified hunt_for()
goal so it has variable attack proximity.
* common/op_switch.h, common/operations.h, common/Generic.h,
rulesets/Character.cpp, rulesets/Entity.h, rulesets/Entity.cpp,
rulesets/Python_API.cpp: Added handling of operation types not
directly supported by C++ classes in the scripting engine. In
order for these to be used they must be created in a script, and
received in a script.
* rulesets/Character.cpp: Avoid using RootOperation pointers unless
that is really what we mean.
* rulesets/Character.cpp: Added code to delete operations from
internal mind when external mind is active.
* rulesets/Entity.cpp: Handled leaking of null script objects,
and python script objects.
* rulesets/Connection.cpp: Delete characters external mind when
connection goes down.
2001-05-22 Al Riddoch <alriddoch@zepler.org>
* client/define_world.py: Started coding new NPC's for Acorn 0.4
* rulesets/basic/mind/goals/common/misc_goal.py: Fixed bug in
announcing trade left over from old mode code.
2001-05-21 Al Riddoch <alriddoch@zepler.org>
* rulesets/Character.cpp: Added sending of appearance and
disappearance operations to mind and client.
* rulesets/BaseMind.cpp, rulesets/MemMap.cpp: Removed redundant debug
output.
2001-05-20 Al Riddoch <alriddoch@zepler.org>
* rulesets/BaseMind.h/cpp: Added isAwake flag to indicate whether the
mind is active or not. Defaults to true.
* rulesets/Py_Object.cpp: Reverted to storing complex attributes
in a python dict.
* rulesets/Python_API.cpp: Get complex attributes from operation
arguments.
* rulesets/Thing.cpp: Added in broadcast of sight(create) operation
to setup when object is created. See Thing::Opertion(Create) for
details.
* rulesets/basic/mind/goals/common/misc_goal.py: Cleaned up comments.
2001-05-18 Al Riddoch <alriddoch@zepler.org>
* Added ruleset entries for characters to match all the recently
added animations.
* server/Player.cpp: Added checks which allow player to be any of
the currently available characters.
2001-05-14 Al Riddoch <alriddoch@zepler.org>
* configure.in: Added termcap to sort out dependency on termcap
by readline on some systems.
* physics/Vector3D.cpp: Added definition of static consts members.
I really don't understand why these are required, and as far
as I can tell this does not conform to the C++ spec.
* server/Makefile.am, aiclient/Makefile.am: Re-ordered linking so
that physics is picked up.
2001-05-14 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Added several options to the config file to
make server operation customisable. Added comments.
* server/server.cpp, server/CommServer.h: Changed methods which
return int to returning bool if they are success/faul results.
* server/WorldRouter.cpp: Removed some unused debugging code.
Optimised heavily used code. Changed error message on
sending to a non-existant entity so that it is no longer
reported as a critical error.
* server/ServerRouting.h, server/Connection.h,
server/Connection_methods.h: inlined simple methods.
* server/Connection.cpp: Optimised frequently used code.
* server/CommClient.h: Simplified read method so it no
longer checks status redundantly.
* common/BaseEntity.h, rulesets/Thing.h, rulesets/Entity.h: Added
comments explaing purpose of classes.
* rulesets/Thing.cpp: Added detailed comments, and removed unnecessary
initialisation of some attributes.
* rulesets/PythonMindScript.cpp: Removed redundant NULL check.
* rulesets/MemMap.h: Added inlines for inlined methods.
* rulesets/Entity.h, common/BaseEntity.h: Moved seq from BaseEntity
to Entity as it does not apply to Out Of Game objects.
* rulesets/Entity.cpp: Added in stamp/seq attribute. Nade name
attribute optional.
* rulesets/Character.cpp: Simplified some op handling code
to make it more readable and hopefully faster. Added comments
explaining movement, removed unused commented out code, and
removed some unnecessary debugging code.
* common/operations.h: Explanatory comments.
* common/*.h: Re-wrote extended operations to fit in
with Atlas-C++ 0.4.2 conventions.
* common/log.*: Commented out unused logging code.
2001-05-06 Al Riddoch <alriddoch@zepler.org>
* server/Admin.cpp: Modified database loading code so it picks up
the object parent correctly instead of looking for a type attribute.
* server/server.cpp: Made metaserver address a config file option.
* common/database.h: Put in compiler error if code is built without
database support.
* common/BaseEntity.cpp: Switched over to using stamp instead of seq
as the attribute used to check whether entity needs to be
updated.
* Used action operation throughout python code to denote performing
an action, as differentiated from setting mode.
* rulesets/skills: Added the beginnings of a skill system.
* example/client: Fixed Atlas-C++ 0.5 example client so it
compiles again.
* README: Wrote a README file
2001-05-04 Al Riddoch <alriddoch@zepler.org>
* Added handling of action operations to operation handling core.
2001-05-03 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Object.cpp: Added support for complex attributes
for Entities used as argument for operations.
2001-04-20 Al Riddoch <alriddoch@zepler.org>
* configure.in: Added a bit of support for later version of the Python
interpretter to configure script.
2001-04-20 Al Riddoch <alriddoch@zepler.org>
* common/database.*, common/persistance.*: Added new database tables
for mind data, and server data.
* common/persistance.*, server/Admin.cpp: Implemented saving and
loading of mind state to mind table. Initially only saving the
contents of the memory map is supported.
* rulesets/MemMap.h: Added asObject() method to convert contents
into Atlas representation.
* rulesets/BaseMind.*: Added handling of load and save operations
which in conjunction with the Python mind component build an
Atlas representation of the mind state.
2001-04-19 Al Riddoch <alriddoch@zepler.org>
* common/persistance.cpp, server/Admin.cpp: Modified database loading
of world entities so that it is done hierarchically starting
with the top level container.
* rulesets/Entity.cpp, rulesets/Character.cpp: Added some needed
attributes to those added to Atlas Objects when converting in
game entities.
2001-04-17 Al Riddoch <alriddoch@zepler.org>
* Changed many return statements to match convention.
* rulesets/Thing.cpp: Tweaked ranges code in movement to cut
down CPU time used.
* common/BaseEntity.cpp: Re-ordered opEnumerate so that most
frequently used ops are detected soonest.
* modules/WorldTime.h/.cpp: Moved WorldTime to modules directory.
2001-04-16 Al Riddoch <alriddoch@zepler.org>
* Substantial re-work of object model. Moved many attributes out
of BaseEntity class. Changed WoldRouter so it now handles
objects in terms of Entity, rather than BaseEntity.
* Code cleanups, including removing reduntant includes, and
getting rid of C style comments.
* Fixed the way attributes are handled in Set operations and
when merging from an Atlas::Message::Object. This fixed
problem with setting gender of characters.
* rulesets/Pedestrian.*, rulesets/Movement.*: Re-named
Movement variables to make them clearer. Added in
separate handling for collisions from moving to
target position. Modified collision handling so
objects can slide next to each other.
* rulesets/Thing.cpp, rulesets/Character.cpp: Cleaned up and
rationalised movement code. Much shorter, faster and
more compact than before.
* Made better use of iterators throughout, eliminating unnecessary
lookups, and copying of data.
* Moved all virtual functions out of header files, making
less work for the linker.
* Made more use of const references to avoid the need to copy
data before being able to inspect it.
2001-04-12 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.*: Changed addToObject to take reference
instead of pointer.
* physics/Vector3D.h: Re-ordered functions to allow correct inlining.
Changed member names to correct convention.
* rulesets/MemMap.cpp,rulesets/MemMap_methods.h: Re-ordered function
to allow inlining, and moved non-inlinable functions into .cpp file.
* Changed new operation initialisation to be done at construction
time instead of imediatly after construction for performance
reasons.
* server/WorldTime.*: Modified member names for convention, and
moved non-inlineable function to .cpp file.
2001-04-11 Al Riddoch <alriddoch@zepler.org>
* common/WorldInfo.*: Removed WorldInfo class, a hangup from
the python Atlas implementation.
2001-04-11 Al Riddoch <alriddoch@zepler.org>
* Re-wrote class headers files so that all class members now
begin with a lower case letter and do not contain _.
* Fixed retrieval of Account from database so that the Account
is now correctly referenced in the server object.
* common/types.h: Changed type name to make them clearer.
* rulesets/Character.h: Moved MovementInfo into its own class
file, and made it a base class, with a Pedestrian super class.
This allows different types of movement handling classes
to be used to handle things that move differently.
2001-04-10 Al Riddoch <alriddoch@zepler.org>
* Complete re-write of python script interface to allow other
script types to be cleanly dropped in.
* Re-work on server and communication related classes to use
references where they are apropriate. Code is now much more
robust.
* Huge cleanup of header files removing redundant includes.
* server/WorldRouter.h: Removed is_object_deleted because it
is broken and not used.
* server/Connection.h: Removed unused disconnect() methods.
* rulesets/Entity.*: Added new in game base class from which
all mind and object classes are derived. This removes
clutter of Thing class from mind classes.
* aiclient/*: Progress with creating AI client for mind handling.
* common/globals.*: Moved some globals out of server specific files.
* rulesets/Makefile.am: Separated rulesets code into 3 almost stand
alone packages; entities, mind and python interface code.
2001-04-05 Al Riddoch <alriddoch@zepler.org>
* common/BaseEntity.h: Moved many of the extra parts of this file
into individual files for each bit.
* aiclient/*: Added client mode cyphesis for handling AI in another
server. Not yet operational.
* */*: Moved large and virtual functions out of headers to reduce
multiple instance problems, keep the binary size down, and speed
up compilation.
* server/Admin.h/cpp: Added Get operation handling, thus dividing
admin commands into two classes, one which does not alter
the state of the server, the other which does. Added query
command which allows admin client to retrive arbitrary objects
from server id dictionary.
2001-04-02 Al Riddoch <alriddoch@zepler.org>
* rulesets/acorn/world/objects/animals/Deer.py, acorn.vconf: Added
deer, with same basic code as pig.
* server/server.cpp: Pass on objects which are not know by the
Atlas::Objects::Decoder straight to the operation handler.
* server/Admin.*: Re-structured the way commands are handled from
admin client, so that apropriate operations are used instead of
always using Set.
* server/Admin.cpp: Added saving world state to the database.
* tools/cycmd.cpp: Updated to use the new admin command semantics.
Added save command.
* common/persistance.*: Added interface for saving world status.
* common/database.*: Added interface for deleting contents of database.
2001-03-30 Al Riddoch <ajr@ecs.soton.ac.uk>
* tools/cycmd.cpp: Added support for interactive mode.
* server/Admin.cpp: Fixed returning of info op from database load
message, and counting of objects loaded from database.
* configure.in: Added readline check for cycmd.
2001-03-29 Al Riddoch <ajr@ecs.soton.ac.uk>
* tools/cyisoload.cpp: Complete functionality for loadin iso map
into world database.
* example/client/CyphesisClient.cpp: Fixed ListType usage in example
client.
2001-03-28 Al Riddoch <ajr@ecs.soton.ac.uk>
* tools/cyisoload.cpp: Added tool which loads an iso format map into
the server database.
* configure.in: Added check for coal (0.2) which is used in map
loader tool.
* common/database.cc: Modified database initialisation functions
so that whether or not the database should be created can be
specified. Added separate function for decoding a database
object into an Atlas::Message::Object. Fix to the way objects
are added to the database which solves some corruption problems.
* common/database.*: Added database iterator class that can be
used to iterate over the database.
* server/Admin.cpp: Added handler for admin load command, which
loads world state from database.
* server/WorldRouter.*: Tweak to allow objects added to world
to have pre-defined id.
2001-03-26 Al Riddoch <ajr@ecs.soton.ac.uk>
* common/persistance.*: Re-designed persistance code is it uses
a database subclass rather than implementing the databse code
itself.
* common/database.*: Added generic class for accessing database,
which can be used from any program.
* tools/cydbload.cpp: Added simple tool to load objects into the
world database from a flat map file.
* basic.vconf: Shifted houses over to using the structure base class.
2001-03-21 Al Riddoch <ajr@ecs.soton.ac.uk>
* physics/Vector3D.h: Changed boundary condition of inBox() from
when part of entity leaves box to when the whole entity leaves the
box.
* basic.vconf: Make tent use the structure base class.
* client/define_world.py: Add bounding box to tent.
* tools/cycmd.cpp: Added password entry.
* server/Admin.cpp: Added "stat" admin command, to get server
details.
* server/CommClient.h: Fixed include dependencies.
* common/persistance.cpp: Added findAccount() method for systems
without db3.
* rulesets/Thing.cpp: Added sending Apperance and Disappearance
operations to static entities when another entity moves out
of sight.
* rulesets/Character.cpp: Added check to make sure an entity does
not collide with itself.
* rulesets/Thing.cpp: Added check to make sure entity does not move
inside itself.
* rulesets/Py_Location.cpp: Modified python location.copy() method
so that only the position and velocity is copied. This should
bounding boxes getting set on things which should not have them.
* rulesets/Character.cpp: Added return statement to movement
handling, so move ops without arguments are not handled.
2001-03-20 Al Riddoch <ajr@ecs.soton.ac.uk>
* physics/Vector3D.h: Detect leaving time of bounding box, even if
entity is not yet in it.
* modules/Location.h, modules/Location.cpp: Added get_xyz() to
find absolute coordinates.
* modules/Location.h: Added true location based range checking.
* servers/WorldRouter.cpp: Implemented new location based range
checking so that operations that take place inside buildings are
range checked properly.
* servers/WorldRouter.cpp: Re-wrote id generation code to be a bit
more robust.
2001-03-19 Al Riddoch <ajr@ecs.soton.ac.uk>
* physics/Vector3D.h: Corrected variable name convention error in
inTime() function.
* rulesets/Character.cpp: Detect what if entity has already left
refs bounding box.
* basic.vconf: Made sty use the Structure base class.
2001-03-19 Al Riddoch <ajr@ecs.soton.ac.uk>
* modules/Location.h, physics/Vector3D.h: Added collision checking
functions to work out when an entity inside a box will hit the
outside.
* rulesets/Character.cpp: Added check in collision code to see when
entity will leave the bouding box of its current parent.
2001-03-18 Al Riddoch <ajr@ecs.soton.ac.uk>
* Modified database code so that entries have the correct begin
and end encodings, which is <atlas>..</atlas> in the case of
XML-like codec.
* modules/Location.h: Added a flag which indicates whether the
bounding box of an entity is solid. If it is not solid, then
the entities contents much be checked for collisions rather
than the entity itself.
* rulesets/Character.h: Added target_ref attribute to MovementInfo
as a means to track character movement between entities.
* rulsets/Character.cpp: Modified collision code to handle
detecting of collisions with non-solid objects, and handling
movement when characters moves into a non-solid object but
does not collide with it.
* rulesets/Structure.h, StructFactory.*: Added base class for
buildings and other structure, which are not solid, and the
character can move in and out of freely.
* server/server.cpp: Made metaserver functionality optional, and
added a config option to the config file.
2001-03-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* tools/cycmd.cpp: Added functionality to allow commands to be
sent to the admin account on the server.
* server/WorldRouter.cpp: Removed mechanism for shutting down server
after a fixed run period.
* server/Admin.*: Added reception of Set operation by admin account
` which contain commands from an admin client. Implemented shutdown
command, which sets a flag indicating server shutdown should start.
* server/server.cpp: Added output indicating that shutdown is taking
place, to make it clear that it is not a crash.
2001-03-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* watchdog/*.c: Corrected C++ style comments in c code.
* */*: Fixed mistake in copyright statement.
* tools/cypasswd.cpp: Fixed usage message.
* tools/cycmd.cpp: Added tools for sending administrative commands
to server.
* server/server.cpp: Send terminate instruction to metaserver on
server shutdown.
2001-03-15 Al Riddoch <ajr@ecs.soton.ac.uk>
* server/server.cpp: Increased time between pings to metaserver
to 5 minutes instead of 5 seconds.
* common/persistance.*: Implemented de-serialisation of database
objects, and added the necessary code for pulling accounts out
of the database.
* common/sstream.*: Added an implementation of stringstream which
is the preferred ANSI form of strstream, but is missing from
the GNU std C++ library.
* configure.in: Added check for system sstream.h, which falls
back to using version included.
* server/Connection.cpp: Check for account in database when
user tries to create new account.
* tools/cypasswd.cpp: Use stringstream instead of strstream.
2001-03-15 Al Riddoch <ajr@ecs.soton.ac.uk>
* common/persistance.*: Added restricted mode set by config file,
which prevents users from being able to create accounts.
* server/ServerRouting.cpp: Added restricted flag to the
server Object passed to client as result of a Get operation, so
the client can report it to the user.
* tools/cypasswd.cpp: Added tool to administrate password database
table.
* server/server.*: Added exit flag to ensure that of exit is requested
database is shutdown properlly.
* server/WorldRouter.cpp: Maintenance shutdown is now done cleanly.
* server/Connection.cpp: Added code to handle accounts using the
persistance system. Accounts would now be handled by the
database if the persistance code was complete.
* common/persistance.*: More work on database code.
2001-03-14 Al Riddoch <ajr@ecs.soton.ac.uk>
* common/persistance.*: More progress on database persistance code.
2001-03-14 Al Riddoch <ajr@ecs.soton.ac.uk>
* *: Removed use of "using namespace ..." throughout.
* modules/Location.h: Fixed error in inRange() and finally got rid
of the Compiler warning.
* rulesets/Food.cpp: Fleshed out the cooking code, including how
food burns when it is overcooked.
* rulesets/Stackable.cpp: Implemented divide.
* common/persistance.*: Added the beginnings of a database backend
using the Berkeley db library.
* server/Account.cpp: Modified addObject, because the attrivutes
added by BaseEntity::addObject are not important to accounts.
2001-03-09 Al Riddoch <ajr@ecs.soton.ac.uk>
* rulesets/EntityFactory.cpp: Removed ThingShape.h
which was unused, and thus removed dependancy on SOLID.
2001-03-09 Al Riddoch <ajr@ecs.soton.ac.uk>
* rulesets/Stackable.cpp: Fixed Stackable code so it now compiles.
2001-03-05 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added Fire operation handling to Thing class, so that any entity
with a burn_speed attribute will burn.
* Added Food C++ base class, which implements cooking.
* Altered the semantics of the Eat/Fire/Nourish operations so
multiple arguments are no longer required. from is used to
determine the other entity involved.
* Added the beginnings of an astronomy system, but not yet used
anywhere.
* Added appearance handling to BaseMind and Memory.
* Added sequence no to all entities, which is incremented each time
a move or set operation is received. sequence no "seq" is included
in args of Appearance operations.
* Moved functionality from Animal python base class into Character
C++ base class. This much improves the performance of modelling
animals, and means that player characters, and NPCs get hungry and
need to eat. Reduced the speed at which animals consume energy
so they don't starve quite as quickly.
* Added collision prediction functions that handle both entities
having velocity.
* Added combine functionality to Stackable. Divide comes next.
2001-03-01 Al Riddoch <ajr@ecs.soton.ac.uk>
* rulesets/Py_Location.cpp: Added bbox and bmedian attributes of
location object to python wrappers.
* rulesets/Character.cpp: Added initialisation of bounding box
median for characters.
* modules/DateTime.*: Added configurability to date so that
each period of time has definable number of divisions. Default
is as per real world calendar restricted to 30 day months.
2001-02-27 Al Riddoch <ajr@ecs.soton.ac.uk>
* server/CommServer.h, server/server.cpp: Added metaserver code
to network classes.
* server/CommServer.h, server/WorldRouter.h, server/ServerRouting.cpp:
Added fields to server entity for number of players and uptime
in seconds.
* Started implementation of WorldTime class for processing of calendric
time.
2001-02-26 Al Riddoch <ajr@ecs.soton.ac.uk>
* Re-wrote the way creating various types of in-game objects is
handled to allow for easier adding of more classes.
2001-02-25 Al Riddoch <ajr@ecs.soton.ac.uk>
* Changed oplist to use std::vector. Recoded and re-optimised use
of oplist to take advantage of vector's best performance.
* Modified OP_SWITCH macros to improve speed, and made it inlinable.
* Cleaned up python interface code to improve compile and link time.
* Moved custom operation definitions in one header file per class
to improve modularity and compile time.
* Modified boundingbox handling so it now uses size and median.
* Added collision check and inbox member function to Vector3D class.
* Added collision prediction and checking to Location and Vector3D
classes.
* Added collision prediction into MovementInfo class.
* Modified Thing::operator[] so that static attributes can be handled
and added Thing::set() which must be used to modify attributes.
* Added collision resolution so characters can no longer walk through
each other.
* Moved weight attribute to being static attribute of Thing, so it
can be much more easily handled in movement code.
2001-02-19 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added handling of Get operation from client before login, to
determine game type, status and other info.
2001-02-18 Al Riddoch <ajr@ecs.soton.ac.uk>
* Commiting tweak to guards patrol route which was included in
Acorn 0.3.
2001-02-17 Al Riddoch <ajr@ecs.soton.ac.uk>
* Implemented beginnings of ranges code:
* modules/Location.h: Added inRange() method which can be used
to check whether location, including bounding box, is within
given range of a given location. Changed parent member
variable to ref to fit with Atlas spec. Changed all code
related to using the term ref instead of parent so
that there is no confusion between ref for coordinates
and parent in the Atlas hierarchy.
* rulesets/Thing.cpp: Added code to move operation to check
what entities come into and out of range when entity moves.
Appearance and Disappearance operations are sent to the
moving entity with a list of the relevant entities as their
argument.
* server/WorldRouter.h/cpp: Added overloaded Look operation
handler which applies range constraints to the contains
attribute before returning.
* common/BaseEntity.h, rulesets/Thing.h, rulesets/Character.h:
Added handling of Appearance and Disappearance operations.
* server/WorldRouter.cpp: Added primitive check to broadcast
operations to avoid delivering broadcast operation to
entities out of range.
* Removed world.get_object() use from server python code, as
its use is not required.
* server/WorldRouter.h: Implemented fetching of floating point time
from the OS so movement is much smoother.
2001-02-07 Al Riddoch <ajr@ecs.soton.ac.uk>
* watchdog/*: Watchdog and control program now work just fine,
though it is not always easy to tell whether the acorn script
is working or not.
2001-02-05 Al Riddoch <ajr@ecs.soton.ac.uk>
* watchdog/*: Fleshed out watchdog functionality, which is now working
and in long term testing. Added control script which handles sending
signals to the daemon in a more friendly way.
2001-02-05 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added watchdog daemon which handles maintaining a running server
automatically. Work in progress.
2001-02-03 Al Riddoch <ajr@ecs.soton.ac.uk>
* all files: Re-worked the way debugging is handled to that it no
longer gives warnings.
2001-01-26 Al Riddoch <ajr@ecs.soton.ac.uk>
* all file: Added copyright statement
2001-01-25 Al Riddoch <ajr@ecs.soton.ac.uk>
* rulesets/Character.cpp: Removed debuggin output.
* client/define_world.py: Modified entity positions for use with new
agrilan.map
2001-01-24 Al Riddoch <ajr@ecs.soton.ac.uk>
* server/Makefile.am: Added libstdc++ to static libraries list.
2001-01-24 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added THANKS file.
* Added rules to top level Makefile to install some docs.
2001-01-24 Al Riddoch <ajr@ecs.soton.ac.uk>
* Throughout entire code base:
Removed all obsolete code and commented out code relating to porting
from python. Removed interim data types bad_type and None. Added
const throughout where apropriate. Change various flags to bool
type. Removed unused members.
* Added TODO list.
2001-01-23 Al Riddoch <ajr@ecs.soton.ac.uk>
* rulesets/Thing.cpp: Removed default description.
2001-01-23 Al Riddoch <ajr@ecs.soton.ac.uk>
* configure.in: Re-ordered lib checks so that python gets libdl
and pthread.
2001-01-23 Al Riddoch <ajr@ecs.soton.ac.uk>
* rulesets/Character.cpp: Set character mode to "touching" when a
touch operation is created by the mind.
2001-01-23 Al Riddoch <ajr@ecs.soton.ac.uk>
* Modified build system so a static binary can be built.
* server/WorldRouter.cpp: Modified some behavoir on critical errors.
Server no longer aborts on criticial errors.
2001-01-20 Al Riddoch <ajr@ecs.soton.ac.uk>
* server/Character.cpp: Modified mind2body so that to is not set on
look operations from mind.
2001-01-20 Al Riddoch <ajr@ecs.soton.ac.uk>
* server/server.cpp: Modified argument processing so that installation
directory can be set as a command line argument, and then stored
persistantly in users config file.
2001-01-18 Al Riddoch <ajr@ecs.soton.ac.uk>
* Change default acorn script to be text, and made the alternative
acorn graphic.
* Fixed addition of client scripts to distribution.
2001-01-14 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added client python code to RPM spec.
2001-01-13 Al Riddoch <ajr@ecs.soton.ac.uk>
* Copied client code across from cyphesis, and created infrastructure
so it can be cleanly installed and run with the rest of cyphesis.
2001-01-06 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added code so that error operations are reported on standard error.
* Added re-connection of client connection object to character when
a player logs in and wants to use the same character again.
2001-01-04 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed pig behavoir bug so location coordinates are now not added
to object if they have not been set.
* Added code to example client so it now reads characters list
when it logs in.
* Removed support for obsolete old-atlas locations.
* Changed behavoir on unexpected error from client socket, so
it no longer causes an abort.
2001-01-02 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed pig mind so it is now better able to detect "Sowee"
* Removed map from Thing, and put it into basmind. Re-wrote
script_Operation for thing so it now looks things up in world
dictionary rather than in local map. This removes a memory leak.
2000-12-27 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed inheritance bug in BaseMind::operation()
* Tweaked the way Look operations are handled when sent from mind, so
an argument is not required if to is set.
* Made some performance enhancements.
2000-12-26 Al Riddoch <ajr@ecs.soton.ac.uk>
* Implemented nourish operation.
2000-12-25 Al Riddoch <ajr@ecs.soton.ac.uk>
* Modifed move_me() goal so it sets face direction.
* Fixed memory leak in MemMap.
* Implemented fully deleting of entities.
2000-12-23 Al Riddoch <ajr@ecs.soton.ac.uk>
* Cleaned up and tweaked python scripts so eating acorns now works.
* Implemented hooks in MemMap for python scripts.
2000-12-17 Al Riddoch <ajr@ecs.soton.ac.uk>
* Cleaned up auto-* stuff, and created spec file for RPMs.
2000-12-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed error in Thing::operator[] which meant attributes could not
be accessed, and certain move operations caused an abort.
* Removed attributes from python object which don't have attributes.
* Added Py*_Check() macros, and used them for easier code reading.
* Added snow attribute to weather.
* Commented out code which makes server exit(0) after a certain time.
2000-12-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* Removed unecessary type checks
2000-12-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* Modifed initialisation of Vector3D from python to be less error
prone, and more complete.
2000-12-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* Another bit of code to prevent code from aborting if weight is
not a float.
2000-12-15 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added in exception handler to catch if weight is not a float.
* Tweaked SkeletonMind so it now works.
2000-12-14 Al Riddoch <ajr@ecs.soton.ac.uk>
* Modifed python interface Operation() function so that it accepts
strings for to and from as well as entities.
* Adapt python Operation() function so operations can be given as
arguments.
* Add Eat, Chop, Cut and Fire operations into the main operation
handling functions.
* Added code so that intelligent entities can use python mind classes
other than NPCMind, and added config section for specifying which.
* Tweaked python mind code for Pig, Wolf and Skeleton so they work.
2000-12-13 Al Riddoch <ajr@ecs.soton.ac.uk>
* Set up rulesets processing so that everything is handled dynamically
from config files. Global ruleset should indicate top level ruleset
which can depend on a list of other rulesets.
* Sorted out installation directories. Cyphesis will now need to be
installed before it can be run.
* Cleaned up a load more python scripts for more Acorn stuff.
* Added getting x y and z from Vector3D.
* Made acorn the default ruleset.
2000-12-12 Al Riddoch <ajr@ecs.soton.ac.uk>
* Started work on auto* files to make cyphesis install correctly.
2000-12-12 Al Riddoch <ajr@ecs.soton.ac.uk>
* Massive code cleaning efforts, removing dead code, trimming reviewing
and shifting code around to optimise it.
* Heavy use of inlining to improve code performance.
* Added global exception handler to catch exceptions while processing
operations.
2000-12-11 Al Riddoch <ajr@ecs.soton.ac.uk>
* Removed lots of extraneous debugging output, and turned the rest
off using debug flags.
* Added halt_time, which is number of seconds server should run before
it exits.
* Cleaned a bunch if the remaining memory leaks.
* Cleaned up the way time is handled.
* More tweaks to Python code and API to get Acorn working.
* Inlined some methods into the class definitions, for performance.
* Updated movement code to sort out setting mode properlly, and
deal with stuttering NPC movement.
2000-12-08 Al Riddoch <ajr@ecs.soton.ac.uk>
* Major attack on the more fiddly memory leaks. The only noticable
leak now is copied Location objects in the python interface code.
* Added hook into the time code so the server can be set to exit
after a given number of seconds. This is required for LeakTracer
to generate its report.
2000-12-07 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed so that we are no longer sending broadcast look ops, which
clag the server up and are not correct behavoir.
* Minor fixes/python tweaks.
* Slight change to ordering of ops in the queue, so more recently
created ops with the same time stamp come of the queue after
older ops.
* Implemented contains attribute so newly created objects are added
to their parents contains list, and when objects are move, they are
transfered from old parents to new parents contains list.
2000-12-07 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added handling for removing connections.
* Removed some unused code.
* Tweaked some python scripts so they import correctly.
* Added in_game flag to BaseEntity so it is possible to tell
if an object is in game.
* Increased the number of operations handled by Message()
* Added handling for initialisation of location.parent using me
in mind code.
* Added is_object_delete() functionality to python interface to world
object.
* Added handling for converting Tuple into Message::Object, and then
ensured that non-basic python types don't get stored as attributes
of a Message::Object.
2000-12-06 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixes to worlds object list so it now contains world.
* More python code tweaks to work with modifications to interface.
* Modified code which gets Thing attributes from Message::Object
so it can use any object dictionary to look up parent object.
* Fixed handling of Thing's static type attribute.
* Modified creation of operations from python to eliminate
some strange segfaults.
* Re-wrote and fixed Entity creation from python.
* Implemented dictlist.remove_value for removing things from inventory.
* Implemented Vector3D arithmetic and methods from python.
* Implemented as_entity() and get_xyz() methods for Thing from
python.
* Commented out deletion of operations from python OperationObject
dealloc() function as it was causing segfaults. There is a problem
somewhere with ownership not being cleared, but I can't find it.
* Implemented conversion of Python Operation and Oplist objects
to Message::Object.
* Fixed MemMap so that attributes of Things are accuratly updated.
* Fixed it so that look ops from mind are broadcast rather than sent
to world. This may have to be reverted.
* Tweaked autoconf to make it cleaner and work better. Still needs
alot of work.
2000-12-05 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added new common namespace to prevent collision with math function
log.
* Added in lots of deletes to sort memory leaks.
* More python tweaks.
* Implemented status attributes of thing.
* Re-wrote some code which needlessly creates objects in the
free store.
2000-12-04 Al Riddoch <ajr@ecs.soton.ac.uk>
* Started working on sorting out memory leaks.
* Implemented python function to deal with not being able to check
type of python objects implemented in C.
* Added method to thing for extracting location data from a
Message::Object
* More work on python references to improve leakage.
* Added flag so that python Operation object can own
the operation they point to, and thus delete it in dealloc().
* Implemented find_by_location() and find_by_type() as required in
MemMap, and corresponding python interface.
* Put in temporary work around to deal with the fact that a mind
does not know its name. Currently the mind is not able to
discover any of its bodies attributes, and I am not sure how
to solve this.
* Fixed Location and Vector3D so they use operator bool() to detect
whether they are set.
* Fixed bugs in getting parent from Location in python which caused
segfaults.
* Imported all the basic ruleset entity python scripts.
2000-12-03 Al Riddoch <ajr@ecs.soton.ac.uk>
* Corrected broadcasting of non-perception operations to
non-perceptive entities.
* Sorted out removing spaces from id strings.
* Implemented Entity arguments to Operaiton creation in python.
2000-12-03 Al Riddoch <ajr@ecs.soton.ac.uk>
* Debugged set_kw() and confirmed that it does work.
* Added python API support for self.world.
2000-12-03 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added support for varconf config files.
* Used config file to list enitity types and their python class files.
* Cleaned up reference counting in Python API related C++ code.
References should all now be handled correctly.
* Added support for adding None to Operation and Oplist.
2000-11-30 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added dictfunc functionality to Python interface.
* Added creation of Entities for use in Operation arguments.
* Added initialisation of Vector3D through constructor
arguments in python.
* Added append() method to python interface for Oplist.
* Added support for coercion of operation into addable form.
2000-11-30 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added more required functionality to base python Thing class
so that operation manipulations can now work.
* Implemented getting of object name to python/C API, and added
methods for differentiating between op and object.
* Implemented on-the-fly de-coding of operations, from operation
arguuments in python/C API. This will be obsolete once Atlas-C++
does full decode later.
* Implemented get and setattr for Message Object from
python. Attributes are stored both in Object, and in supplementary
python dictionary for non Atlas compatable attributes.
* Implemented copy() method for Python/C Location class.
2000-11-29 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added in debug function for python code.
* Fixed coersion of non-oplist types for addition.
* Implemented getting attributes from Message::Object maps
from python.
2000-11-29 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added support for decoding Sound operations in BaseMind.
* Added Talk operation throughout operation handling code.
* Added basic WorldTime class together with python wrapper.
Can fill in functionality as required.
* Put debugging back in cos I still need it.
2000-11-26 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added in Python interface code to deal with manipulation of operation
time.
* Made basic_tick a float, because it should be.
* Imported all the rulesets python code from python cyphesis.
2000-11-26 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed and changes to code so that operations created in python
mind code are delivered as required.
2000-11-24 Al Riddoch <ajr@ecs.soton.ac.uk>
* Disabled some of the excessive debugging.
* Implemented getting and setting of to and from in operations
using map to lookup what the mind knows about the entities
in question. This involved adding an extra field to the
RootOperationObject structure to store to and from entities.
* Sorted out base_init() python member so __init__() of all
classes in inheritance tree are called.
* Started work on set_kw() replacement.
* Added python module finding mechanism which is required to deal
with rulesets correctly. I am not convinced this works.
2000-11-23 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added oplist python interface, and implemented returning of
operations from python code.
2000-11-22 Al Riddoch <ajr@ecs.soton.ac.uk>
* Moved character mode calculation into MovementInfo class.
* Added new MovementInfo method which creates a movement op to
change the rotation of a character when no other update is needed.
2000-11-22 Al Riddoch <ajr@ecs.soton.ac.uk>
* Filled out Location python interface so it is now fully functional.
* Inlined Vector3D class for performance.
2000-11-21 Al Riddoch <ajr@ecs.soton.ac.uk>
* Bug fix that meant that updates to MemMap object caused segfault.
2000-11-21 Al Riddoch <ajr@ecs.soton.ac.uk>
* Filled out the python common.const module with all its values.
* Added code required to create an operation from with python.
* Modified the Thing python interface so that python objects
that Atlas doesn't want to know about are stored in a normal
attributes list.
2000-11-20 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added some more python interface classes. There is now enough code
here to start importing real mind code from cyphesis-py.
2000-11-19 Al Riddoch <ajr@ecs.soton.ac.uk>
* Two small bug fixes. One stops a crash when the client tries
to move an object which does not exist, the other removes an
unnecessary pointer check which stopped the admin client from
working.
2000-11-19 Al Riddoch <ajr@ecs.soton.ac.uk>
* Filled in BaseMind functionality so it now keeps memory map up to date. Added necessary features to Python/C++ interface
for sight operations to be passed onto python code after processing
in C++. Added new type of op switch to deal with operations
in the argument of a sight/sound operation.
* Added features to Opeation python interface for args to be
accessed as if operation is a sequence object.
* Implemented python API for C++ memory map class.
* Added utility function which uses code borrowed from Atlas-C++
to convert a Message::Object into something from the Objects
code.
2000-11-18 Al Riddoch <ajr@ecs.soton.ac.uk>
* Moved some of BaseMind functionality in a python class and
added the necessary interface code.
* Initial port of MemMap class from python to C++, together with
python interface. Hopefully maintenance of MemMap can be kept
in C++ for speed if possible.
2000-11-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* Sorted out error handling from python code, and no-longer treat
no method as an error.
* Got python interface code to the point that python classes can now
access the C++ attributes of a Thing.
* Split the python interface code into separate files depending
on the type of C++ class the code relates to.
2000-11-16 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added code for standard Get/Set methods for operations.
Eventually this functionality will be moved into getattr
and setattr methods.
* Added code for a Thing object which wrappers a C++ Thing * pointer.
2000-11-15 Al Riddoch <ajr@ecs.soton.ac.uk>
* Cleaned up problems with mode in move operations, and dealt
with stopping when velocity is set to zero.
2000-11-15 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed silly typo in movement code which meant that velocity was
not being used to calculate direction when only velocity is
specified.
2000-11-14 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added more Python/C API code. Basic framework now exists for
creating and manipulating Operations in the python code.
2000-11-10 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed setting location of newly created objects
* Fixed setting weight as float on default Thing.
* Added more support for mode and face in movement code.
* Cleaned up the debugging output code.
* Fixed looking, and added support for contains attribute
2000-11-10 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added more refno capabilities
* Fixed some operation instantiation bugs
* Added full support for creator entity. Admin client can now populate
the world with items and NPCs.
2000-11-09 Al Riddoch <ajr@ecs.soton.ac.uk>
* Removed two conflicting "WorldRouter * world" members from
class hierarchy.
* Added setting of refno to operations, so client can tell
what they apply to.
* Sorted out initialisation of python path.
* Added loading of admin account, allowing admin client to communicate.
* Made sure all attributes of created objects are set, so that
character gender works.
* Added face attribute to Thing, to indicate what direction it faces!
* Modified error operation so it complies with traditional format
2000-11-08 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added enough python interface to load a simple module, get the
class from it, instantiate that class, and call operation methods
from it. Still to be implented is the Atlas-C++ API for embedded
python.
2000-11-07 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed movement code so that id of object to be moved is correctly
present. uclient now sees movement. Woohoo!
2000-11-07 Al Riddoch <ajr@ecs.soton.ac.uk>
* More movement fixed. uclient movement now works within the server,
but uclient does not like the responses it gets.
* Fixed a bug which caused a segfault when movement stops.
2000-11-05 Al Riddoch <ajr@ecs.soton.ac.uk>
* More movement fixes, including lots of clearer debugging output.
Still does not seem to correctly handle moves which don't
specify direction.
2000-11-04 Al Riddoch <ajr@ecs.soton.ac.uk>
* More movement fixes. I now get almost expected behavoir
* Switched over to new Atlas location spec now that this is supported
by uclient.
2000-11-04 Al Riddoch <ajr@ecs.soton.ac.uk>
* Improved debugging output in movement code, and fixed some critical
bugs which meant that movement was not working correctly.
2000-11-02 Al Riddoch <ajr@ecs.soton.ac.uk>
* Modified legacy location code so it is now activated by a single
#define
2000-11-02 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added temporary support for old Atlas style location object
in entity to move operations. This allows uclient to work for
now until it moves over to the latest Atlas spec.
2000-11-02 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed some attributes of in-game object
* Added temporary support for old style Atlas location so we still
work with uclient.
2000-11-02 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed it so that server does not exit if client negotiation fails.
* Cleaned up detection of disconnected client
* Re-wrote thing factory so it is now a static object instance rather
that a static method, and added the beginnings of support for
python "Thing" classes.
2000-10-31 Al Riddoch <ajr@ecs.soton.ac.uk>
* Modified stream code to get rid of seeking-on socket problem
2000-10-24 Al Riddoch <ajr@ecs.soton.ac.uk>
* Added handling of client disconnection
2000-10-24 Al Riddoch <ajr@ecs.soton.ac.uk>
* Fixed movement code which now works.
* Fixed set operation, and added attributes map to Thing.
* Started adding Python interface code.
* Starting changelog from initial attempt to port cyphesis into C++.
|