====animation mostly converted==== set_anim_by_id(player[pn].ent->spri, player[pn...

diff --git a/DEBUG.16W b/DEBUG.16W
index 2d5543e2ee44dbbc2202804ee612b17f75729a66..fea14d113e55e96a47e70c8646a3934de67599b7 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,210 +1,210 @@
-\e[0mSeg:0      Size:9861       Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m000\r
-\e[0m\e[0mSeg:274c       Size:44 Owner:0x0\r
-\e[41;31m++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2778       Size:256        Owner:0x1970\r
+\e[0mSeg:0      Size:9881       Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0000\r
+\e[0m\e[0mSeg:2760       Size:44 Owner:0x0\r
+\e[41;31m+\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:278c       Size:256        Owner:0x1970\r
 \e[44;34m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2878       Size:256        Owner:0x1762\r
+\e[0m\e[0mSeg:288c       Size:256        Owner:0x1762\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2978       Size:256        Owner:0x1764\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2a78       Size:256        Owner:0x1766\r
+\e[0m\e[0mSeg:298c       Size:256        Owner:0x1764\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2b78       Size:256        Owner:0x1768\r
+\e[0m\e[0mSeg:2a8c       Size:256        Owner:0x1766\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2c78       Size:256        Owner:0x176a\r
+\e[0m\e[0mSeg:2b8c       Size:256        Owner:0x1768\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2d78       Size:256        Owner:0x176c\r
+\e[0m\e[0mSeg:2c8c       Size:256        Owner:0x176a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2e78       Size:256        Owner:0x176e\r
+\e[0m\e[0mSeg:2d8c       Size:256        Owner:0x176c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2f78       Size:256        Owner:0x1770\r
+\e[0m\e[0mSeg:2e8c       Size:256        Owner:0x176e\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3078       Size:256        Owner:0x1772\r
+\e[0m\e[0mSeg:2f8c       Size:256        Owner:0x1770\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3178       Size:256        Owner:0x1774\r
+\e[0m\e[0mSeg:308c       Size:256        Owner:0x1772\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3278       Size:256        Owner:0x1776\r
+\e[0m\e[0mSeg:318c       Size:256        Owner:0x1774\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3378       Size:256        Owner:0x1778\r
+\e[0m\e[0mSeg:328c       Size:256        Owner:0x1776\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3478       Size:256        Owner:0x177a\r
+\e[0m\e[0mSeg:338c       Size:256        Owner:0x1778\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3578       Size:256        Owner:0x177c\r
+\e[0m\e[0mSeg:348c       Size:256        Owner:0x177a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3678       Size:256        Owner:0x177e\r
+\e[0m\e[0mSeg:358c       Size:256        Owner:0x177c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3778       Size:256        Owner:0x1780\r
+\e[0m\e[0mSeg:368c       Size:256        Owner:0x177e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3878       Size:256        Owner:0x1782\r
+\e[0m\e[0mSeg:378c       Size:256        Owner:0x1780\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3978       Size:256        Owner:0x1784\r
+\e[0m\e[0mSeg:388c       Size:256        Owner:0x1782\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3a78       Size:256        Owner:0x1786\r
+\e[0m\e[0mSeg:398c       Size:256        Owner:0x1784\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3b78       Size:256        Owner:0x1788\r
+\e[0m\e[0mSeg:3a8c       Size:256        Owner:0x1786\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3c78       Size:256        Owner:0x178a\r
+\e[0m\e[0mSeg:3b8c       Size:256        Owner:0x1788\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3d78       Size:256        Owner:0x178c\r
+\e[0m\e[0mSeg:3c8c       Size:256        Owner:0x178a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3e78       Size:256        Owner:0x178e\r
+\e[0m\e[0mSeg:3d8c       Size:256        Owner:0x178c\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3f78       Size:256        Owner:0x1790\r
+\e[0m\e[0mSeg:3e8c       Size:256        Owner:0x178e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4078       Size:256        Owner:0x1792\r
+\e[0m\e[0mSeg:3f8c       Size:256        Owner:0x1790\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4178       Size:256        Owner:0x1794\r
+\e[0m\e[0mSeg:408c       Size:256        Owner:0x1792\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4278       Size:256        Owner:0x1796\r
+\e[0m\e[0mSeg:418c       Size:256        Owner:0x1794\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4378       Size:256        Owner:0x1798\r
+\e[0m\e[0mSeg:428c       Size:256        Owner:0x1796\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4478       Size:256        Owner:0x179a\r
+\e[0m\e[0mSeg:438c       Size:256        Owner:0x1798\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4578       Size:256        Owner:0x179c\r
+\e[0m\e[0mSeg:448c       Size:256        Owner:0x179a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4678       Size:256        Owner:0x179e\r
+\e[0m\e[0mSeg:458c       Size:256        Owner:0x179c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4778       Size:256        Owner:0x17a0\r
+\e[0m\e[0mSeg:468c       Size:256        Owner:0x179e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4878       Size:256        Owner:0x17a2\r
+\e[0m\e[0mSeg:478c       Size:256        Owner:0x17a0\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4978       Size:256        Owner:0x17a4\r
+\e[0m\e[0mSeg:488c       Size:256        Owner:0x17a2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4a78       Size:256        Owner:0x17a6\r
+\e[0m\e[0mSeg:498c       Size:256        Owner:0x17a4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4b78       Size:256        Owner:0x17a8\r
+\e[0m\e[0mSeg:4a8c       Size:256        Owner:0x17a6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4c78       Size:256        Owner:0x17aa\r
+\e[0m\e[0mSeg:4b8c       Size:256        Owner:0x17a8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4d78       Size:256        Owner:0x17ac\r
+\e[0m\e[0mSeg:4c8c       Size:256        Owner:0x17aa\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4e78       Size:256        Owner:0x17ae\r
+\e[0m\e[0mSeg:4d8c       Size:256        Owner:0x17ac\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4f78       Size:256        Owner:0x17b0\r
+\e[0m\e[0mSeg:4e8c       Size:256        Owner:0x17ae\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5078       Size:256        Owner:0x17b2\r
+\e[0m\e[0mSeg:4f8c       Size:256        Owner:0x17b0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5178       Size:256        Owner:0x17b4\r
+\e[0m\e[0mSeg:508c       Size:256        Owner:0x17b2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5278       Size:256        Owner:0x17b6\r
+\e[0m\e[0mSeg:518c       Size:256        Owner:0x17b4\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5378       Size:256        Owner:0x17b8\r
+\e[0m\e[0mSeg:528c       Size:256        Owner:0x17b6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5478       Size:256        Owner:0x17ba\r
+\e[0m\e[0mSeg:538c       Size:256        Owner:0x17b8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5578       Size:256        Owner:0x17bc\r
+\e[0m\e[0mSeg:548c       Size:256        Owner:0x17ba\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5678       Size:256        Owner:0x17be\r
+\e[0m\e[0mSeg:558c       Size:256        Owner:0x17bc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5778       Size:256        Owner:0x17c0\r
+\e[0m\e[0mSeg:568c       Size:256        Owner:0x17be\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5878       Size:256        Owner:0x17c2\r
+\e[0m\e[0mSeg:578c       Size:256        Owner:0x17c0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5978       Size:256        Owner:0x17c4\r
+\e[0m\e[0mSeg:588c       Size:256        Owner:0x17c2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5a78       Size:256        Owner:0x17c6\r
+\e[0m\e[0mSeg:598c       Size:256        Owner:0x17c4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5b78       Size:256        Owner:0x17c8\r
+\e[0m\e[0mSeg:5a8c       Size:256        Owner:0x17c6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5c78       Size:256        Owner:0x17ca\r
+\e[0m\e[0mSeg:5b8c       Size:256        Owner:0x17c8\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5d78       Size:256        Owner:0x17cc\r
+\e[0m\e[0mSeg:5c8c       Size:256        Owner:0x17ca\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5e78       Size:256        Owner:0x17ce\r
+\e[0m\e[0mSeg:5d8c       Size:256        Owner:0x17cc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5f78       Size:256        Owner:0x17d0\r
+\e[0m\e[0mSeg:5e8c       Size:256        Owner:0x17ce\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6078       Size:256        Owner:0x17d2\r
+\e[0m\e[0mSeg:5f8c       Size:256        Owner:0x17d0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6178       Size:256        Owner:0x17d4\r
+\e[0m\e[0mSeg:608c       Size:256        Owner:0x17d2\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6278       Size:256        Owner:0x17d6\r
+\e[0m\e[0mSeg:618c       Size:256        Owner:0x17d4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6378       Size:256        Owner:0x17d8\r
+\e[0m\e[0mSeg:628c       Size:256        Owner:0x17d6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6478       Size:256        Owner:0x17da\r
+\e[0m\e[0mSeg:638c       Size:256        Owner:0x17d8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6578       Size:256        Owner:0x17dc\r
+\e[0m\e[0mSeg:648c       Size:256        Owner:0x17da\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6678       Size:256        Owner:0x17de\r
+\e[0m\e[0mSeg:658c       Size:256        Owner:0x17dc\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6778       Size:256        Owner:0x17e0\r
+\e[0m\e[0mSeg:668c       Size:256        Owner:0x17de\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6878       Size:256        Owner:0x17e2\r
+\e[0m\e[0mSeg:678c       Size:256        Owner:0x17e0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6978       Size:256        Owner:0x17e4\r
+\e[0m\e[0mSeg:688c       Size:256        Owner:0x17e2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6a78       Size:256        Owner:0x17e6\r
+\e[0m\e[0mSeg:698c       Size:256        Owner:0x17e4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6b78       Size:256        Owner:0x17e8\r
+\e[0m\e[0mSeg:6a8c       Size:256        Owner:0x17e6\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6c78       Size:256        Owner:0x17ea\r
+\e[0m\e[0mSeg:6b8c       Size:256        Owner:0x17e8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6d78       Size:256        Owner:0x17ec\r
+\e[0m\e[0mSeg:6c8c       Size:256        Owner:0x17ea\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6e78       Size:256        Owner:0x17ee\r
+\e[0m\e[0mSeg:6d8c       Size:256        Owner:0x17ec\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6f78       Size:256        Owner:0x17f0\r
+\e[0m\e[0mSeg:6e8c       Size:256        Owner:0x17ee\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7078       Size:256        Owner:0x17f2\r
+\e[0m\e[0mSeg:6f8c       Size:256        Owner:0x17f0\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7178       Size:256        Owner:0x17f4\r
+\e[0m\e[0mSeg:708c       Size:256        Owner:0x17f2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7278       Size:256        Owner:0x17f6\r
+\e[0m\e[0mSeg:718c       Size:256        Owner:0x17f4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7378       Size:256        Owner:0x17f8\r
+\e[0m\e[0mSeg:728c       Size:256        Owner:0x17f6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7478       Size:256        Owner:0x17fa\r
+\e[0m\e[0mSeg:738c       Size:256        Owner:0x17f8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7578       Size:256        Owner:0x17fc\r
+\e[0m\e[0mSeg:748c       Size:256        Owner:0x17fa\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7678       Size:256        Owner:0x17fe\r
+\e[0m\e[0mSeg:758c       Size:256        Owner:0x17fc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7778       Size:256        Owner:0x1800\r
+\e[0m\e[0mSeg:768c       Size:256        Owner:0x17fe\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7878       Size:256        Owner:0x1802\r
+\e[0m\e[0mSeg:778c       Size:256        Owner:0x1800\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7978       Size:256        Owner:0x1804\r
+\e[0m\e[0mSeg:788c       Size:256        Owner:0x1802\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7a78       Size:256        Owner:0x1806\r
+\e[0m\e[0mSeg:798c       Size:256        Owner:0x1804\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7b78       Size:256        Owner:0x1808\r
+\e[0m\e[0mSeg:7a8c       Size:256        Owner:0x1806\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7c78       Size:256        Owner:0x180a\r
+\e[0m\e[0mSeg:7b8c       Size:256        Owner:0x1808\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7d78       Size:256        Owner:0x180c\r
+\e[0m\e[0mSeg:7c8c       Size:256        Owner:0x180a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7e78       Size:256        Owner:0x180e\r
+\e[0m\e[0mSeg:7d8c       Size:256        Owner:0x180c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7f78       Size:256        Owner:0x1810\r
+\e[0m\e[0mSeg:7e8c       Size:256        Owner:0x180e\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8078       Size:256        Owner:0x1812\r
+\e[0m\e[0mSeg:7f8c       Size:256        Owner:0x1810\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8178       Size:256        Owner:0x1814\r
+\e[0m\e[0mSeg:808c       Size:256        Owner:0x1812\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8278       Size:256        Owner:0x1816\r
+\e[0m\e[0mSeg:818c       Size:256        Owner:0x1814\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8378       Size:256        Owner:0x1818\r
+\e[0m\e[0mSeg:828c       Size:256        Owner:0x1816\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8478       Size:256        Owner:0x181a\r
+\e[0m\e[0mSeg:838c       Size:256        Owner:0x1818\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8578       Size:256        Owner:0x181c\r
+\e[0m\e[0mSeg:848c       Size:256        Owner:0x181a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8678       Size:256        Owner:0x181e\r
+\e[0m\e[0mSeg:858c       Size:256        Owner:0x181c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8778       Size:256        Owner:0x1820\r
+\e[0m\e[0mSeg:868c       Size:256        Owner:0x181e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8878       Size:256        Owner:0x1822\r
+\e[0m\e[0mSeg:878c       Size:256        Owner:0x1820\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8978       Size:256        Owner:0x1824\r
+\e[0m\e[0mSeg:888c       Size:256        Owner:0x1822\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8a78       Size:256        Owner:0x1826\r
+\e[0m\e[0mSeg:898c       Size:256        Owner:0x1824\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:8a8c       Size:256        Owner:0x1826\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8b78       Size:256        Owner:0x1828\r
+\e[0m\e[0mSeg:8b8c       Size:256        Owner:0x1828\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8c78       Size:401        Owner:0xef42\r
+\e[0m\e[0mSeg:8c8c       Size:401        Owner:0xef42\r
 \e[44;34m++++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:b778       Size:18567      Owner:0x0\r
+\e[0m\e[0mSeg:b78c       Size:18547      Owner:0x0\r
 \e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
index 47db1fc984fd90e8bd486f56315658ec59786d06..715afb22691467d521cc29a0b0e865d93521f285 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,57 +1,57 @@
 \r
        == default ==\r
 \r
-  USED block at 276e0016 of size 136\r
-  FREE block at 276e009e of size 68\r
-  USED block at 276e00e2 of size 50\r
-  USED block at 276e0114 of size 50\r
-  USED block at 276e0146 of size 50\r
-  USED block at 276e0178 of size 50\r
-  USED block at 276e01aa of size 50\r
-  USED block at 276e01dc of size 50\r
-  USED block at 276e020e of size 50\r
-  USED block at 276e0240 of size 50\r
-  USED block at 276e0272 of size 50\r
-  USED block at 276e02a4 of size 50\r
-  USED block at 276e02d6 of size 50\r
-  USED block at 276e0308 of size 50\r
-  FREE block at 276e033a of size 14\r
-  USED block at 276e0348 of size 20\r
-  FREE block at 276e035c of size 7328\r
+  USED block at 27820016 of size 136\r
+  FREE block at 2782009e of size 68\r
+  USED block at 278200e2 of size 50\r
+  USED block at 27820114 of size 50\r
+  USED block at 27820146 of size 50\r
+  USED block at 27820178 of size 50\r
+  USED block at 278201aa of size 50\r
+  USED block at 278201dc of size 50\r
+  USED block at 2782020e of size 50\r
+  USED block at 27820240 of size 50\r
+  USED block at 27820272 of size 50\r
+  USED block at 278202a4 of size 50\r
+  USED block at 278202d6 of size 50\r
+  USED block at 27820308 of size 50\r
+  FREE block at 2782033a of size 14\r
+  USED block at 27820348 of size 20\r
+  FREE block at 2782035c of size 7328\r
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 176def86 of size 12\r
-  USED block at 176def92 of size 330\r
-  USED block at 176df0dc of size 52\r
-  USED block at 176df110 of size 20\r
-  USED block at 176df124 of size 20\r
-  USED block at 176df138 of size 20\r
-  USED block at 176df14c of size 20\r
-  USED block at 176df160 of size 20\r
-  USED block at 176df174 of size 3720\r
+  USED block at 1781ef86 of size 12\r
+  USED block at 1781ef92 of size 330\r
+  USED block at 1781f0dc of size 52\r
+  USED block at 1781f110 of size 20\r
+  USED block at 1781f124 of size 20\r
+  USED block at 1781f138 of size 20\r
+  USED block at 1781f14c of size 20\r
+  USED block at 1781f160 of size 20\r
+  USED block at 1781f174 of size 3720\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 276e0016 of size 136\r
-  USED block at 276e009e of size 68\r
-  USED block at 276e00e2 of size 50\r
-  USED block at 276e0114 of size 50\r
-  USED block at 276e0146 of size 50\r
-  USED block at 276e0178 of size 50\r
-  USED block at 276e01aa of size 50\r
-  USED block at 276e01dc of size 50\r
-  USED block at 276e020e of size 50\r
-  USED block at 276e0240 of size 50\r
-  USED block at 276e0272 of size 50\r
-  USED block at 276e02a4 of size 50\r
-  USED block at 276e02d6 of size 50\r
-  USED block at 276e0308 of size 50\r
-  USED block at 276e033a of size 14\r
-  USED block at 276e0348 of size 20\r
-  USED block at 276e035c of size 7328\r
+  USED block at 27820016 of size 136\r
+  USED block at 2782009e of size 68\r
+  USED block at 278200e2 of size 50\r
+  USED block at 27820114 of size 50\r
+  USED block at 27820146 of size 50\r
+  USED block at 27820178 of size 50\r
+  USED block at 278201aa of size 50\r
+  USED block at 278201dc of size 50\r
+  USED block at 2782020e of size 50\r
+  USED block at 27820240 of size 50\r
+  USED block at 27820272 of size 50\r
+  USED block at 278202a4 of size 50\r
+  USED block at 278202d6 of size 50\r
+  USED block at 27820308 of size 50\r
+  USED block at 2782033a of size 14\r
+  USED block at 27820348 of size 20\r
+  USED block at 2782035c of size 7328\r
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index b025a31336bde3b4c4f79f316b51d7db89578766..e1da355d285701eb73c76414f43f472bb3aab72e 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index e3587bf704e8523a85471bb4175076ec1e55b251..71307a6e9bcf22b00eabb750ee73f7310cfd9ca2 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -1287,10 +1287,10 @@ void IN_initplayer(player_t *player, word pn)
        player[0].info.xaxis = player[0].tx*TILEWH;\r
        player[0].info.y = player[0].ty;\r
        player[0].info.yaxis = player[0].ty*TILEWH;*/\r
-       player[pn].enti.q =1;\r
+       player[pn].enti.q =                             1;\r
        player[pn].enti.d =2;\r
        player[pn].enti.hp=4;\r
        player[pn].enti.speed=4;\r
-       player[pn].enti.persist_aniframe=0;\r
+       player[pn].enti.persist_aniframe=       1;\r
        player[pn].enti.spt=(TILEWH/(player[pn].enti.speed));   //speed per tile wwww\r
 }\r

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index 6c6cde553f127c2888493d0aef74ae1c10c68f05..c41994f98abf8b136a07965c9dafb51365e93224 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -52,7 +52,6 @@ void init_anim(struct sprite *spri, int anim_index)
        spri->curr_anim_list = anim_list;\r
 }\r
 \r
-\r
 int set_anim_by_id(struct sprite *spri, int anim_id)\r
 {\r
        int new_anim_index = 0;\r
@@ -155,6 +154,7 @@ void oldanimate_spri(struct sprite *spri, video_t *video)
                        spri->delay--;\r
                        break;\r
        }\r
+       vga_state.vga_graphics_ram = video->omemptr;\r
 }\r
 \r
 \r
@@ -165,14 +165,13 @@ void animate_spri(struct sprite *spri, video_t *video)
 #define VMEMPAGEDATA2  GVARVIDEO->page[2].data\r
        unsigned int i,o,o2; int j;\r
        int x,y,rx,ry,w,h;\r
-       int overdraw = 0;//16;  // how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.\r
+       int overdraw = 4;//16;  // how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.\r
                                                // if the sprite's edge pixels are clear anyway, you can set this to 0.\r
        VGA_RAM_PTR omemptr;\r
 \r
        // Events go here\r
 \r
 \r
-       //omemptr = vga_state.vga_graphics_ram; // save original mem ptr\r
        omemptr = (VGA_RAM_PTR)video->page[0].data;//vga_state.vga_graphics_ram; // save original mem ptr\r
        x=spri->x;\r
        y=spri->y;\r
@@ -223,7 +222,6 @@ void animate_spri(struct sprite *spri, video_t *video)
        );\r
 #endif\r
        // restore ptr\r
-       //vga_state.vga_graphics_ram = video->omemptr;\r
        vga_state.vga_graphics_ram = omemptr;\r
 \r
        // block copy to visible RAM from offscreen\r
@@ -235,7 +233,6 @@ void animate_spri(struct sprite *spri, video_t *video)
        vga_restore_rm0wm0();\r
 \r
        // restore stride\r
-       //vga_state.vga_draw_stride_limit=      video->vga_draw_stride_limit; vga_state.vga_draw_stride=                video->vga_draw_stride;\r
        vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = GVARVIDEO->page[0].stridew;\r
 \r
        // Depending on delay, update indices\r
@@ -260,4 +257,5 @@ void animate_spri(struct sprite *spri, video_t *video)
                        spri->delay--;\r
                        break;\r
        }\r
+       vga_state.vga_graphics_ram = video->omemptr;\r
 }\r

diff --git a/src/lib/16_sprit.h b/src/lib/16_sprit.h
index a72e9671de90e52662c290204ddea9c33db21809..7fc360c6aa8a295d0f4c3a34549c0797051df1ed 100755 (executable)
--- a/src/lib/16_sprit.h
+++ b/src/lib/16_sprit.h
@@ -60,7 +60,7 @@ char* get_curr_anim_name(struct sprite *spri);
  * Out:\r
  * int - 0 on success, -1 on error\r
  */\r
-int set_anim_by_id(struct sprite *spri, int id);\r
+int set_anim_by_id(struct sprite *spri, int anim_id);\r
 \r
 /* Animate sprite, triggering any events and changing indices if necessary\r
  * NB: if you want to change animation sequence after a specific sprite is shown, you should call animate_spri first\r

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index ece035e2a59980447a6dad7c4d2330e8e3c5a725..08ad6244b6975a7e7e775efb07c7e7866198bf2e 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -386,7 +386,6 @@ void walktypeinfo(player_t *player, word pn)
                        sprintf(global_temp_status_text, "%s", "s");\r
                break;\r
        }\r
-\r
 }\r
 \r
 const char *nibble_to_binary(nibble x)\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index ffa4e1569e2304f2477f8da0cb5b2cda66dddcca..126ae581f17011de42f2e495738486544f2742cd 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -108,16 +108,16 @@ typedef struct {
        word dy;                /* row we are viewing on virtual screen (on page[0]) */ /* off screen buffer on the top size */\r
        word sw;                /* screen width */      /* resolution */\r
        word sh;                /* screen heigth */     /* resolution */\r
-       word tw;                /* screen width in tiles */\r
-       word th;                /* screen height in tiles */\r
+               word tw;                /* screen width in tiles */\r
+               word th;                /* screen height in tiles */\r
        word width;             /* virtual width of the page */\r
        word height;    /* virtual height of the page */\r
-       word tilesw;            /* virtual screen width in tiles */\r
-       word tilesh;            /* virtual screen height in tiles */\r
-       sword tilemidposscreenx;        /* middle tile x position */    /* needed for scroll system to work accordingly */\r
-       sword tilemidposscreeny;        /* middle tile y position */    /* needed for scroll system to work accordingly */\r
-       sword tileplayerposscreenx;     /* player position on screen */ /* needed for scroll and map system to work accordingly */\r
-       sword tileplayerposscreeny;     /* player position on screen */ /* needed for scroll and map system to work accordingly */\r
+               word tilesw;            /* virtual screen width in tiles */\r
+               word tilesh;            /* virtual screen height in tiles */\r
+               sword tilemidposscreenx;        /* middle tile x position */    /* needed for scroll system to work accordingly */\r
+               sword tilemidposscreeny;        /* middle tile y position */    /* needed for scroll system to work accordingly */\r
+               sword tileplayerposscreenx;     /* player position on screen */ /* needed for scroll and map system to work accordingly */\r
+               sword tileplayerposscreeny;     /* player position on screen */ /* needed for scroll and map system to work accordingly */\r
        word stridew;                   /* width/4 */   /* VGA */\r
        word pagesize;                  /* page size */\r
        word pi;                                /* increment page by this much to preserve location */\r
@@ -138,6 +138,7 @@ typedef     struct
        int sheetsetx; //NOT USED YET! entity sprite sheet set on the image x\r
        int sheetsety; //NOT USED YET! entity sprite sheet set on the image y\r
        byte d;         //direction to render sprite!! wwww\r
+       word dire;              //sprite in use\r
        byte q;         //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www\r
        word speed;             //entity speed!\r
        word spt;               //speed per tile\r
@@ -267,7 +268,7 @@ typedef struct
        byte vga_draw_stride_limit;             // further X clipping\r
 //\r
        word __near rs;                 //render switch\r
-       int __near sprifilei;           //player file's i\r
+       sword __near sprifilei;         //player file's i\r
        boolean __near p;                       //render page number //BLEH\r
        boolean __near r;                       //page flip if true\r
        word pr[MAXPAGE][4];    //render sections of pages (this is supposed to be set up to draw sections of the screen if updated)\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 8ad0156a0e1cf5baa622efb3fed43462c0c320e4..9285f13b3dde6d8b2c97bff3f38283d91e94e2c1 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -27,11 +27,13 @@
 #define INC_PER_FRAME_PRINT    sprintf(global_temp_status_text, "%u", player[pn].enti.persist_aniframe);\\r
 modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe), player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\r
 \r
-#define WALKTYPE_FRAM_PRINT    walktypeinfo(player, pn);\\r
-modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe)+8, player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\\r
-INC_PER_FRAME_PRINT\r
+#define WALKTYPE_FRAM_PRINT INC_PER_FRAME_PRINT\r
+//walktypeinfo(player, pn);\r
+//modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe)+8, player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\r
 \r
-#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = 1;\r
+#define PERSIST_ANIFRAME_INIT 1\r
+#define Q_INIT PERSIST_ANIFRAME_INIT\r
+#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = PERSIST_ANIFRAME_INIT;\r
 \r
 void ZC_walk(map_view_t *pip, player_t *player, word pn)\r
 {\r
@@ -56,7 +58,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        mapScrollRight(pip, player, (pip[0].video->p), pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else if(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))\r
                        {\r
@@ -67,7 +69,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        player[pn].enti.x+=(player[pn].enti.speed);\r
                                        ANIMATESPRIFUN(pip, player, pn, 0);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else\r
                        {\r
@@ -82,7 +84,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx+1;\r
                        player[pn].enti.triggery = player[pn].enti.ty;\r
-                       WALKTYPE_FRAM_PRINT\r
+                       //WALKTYPE_FRAM_PRINT\r
                break;\r
                //left movement\r
                case 1:\r
@@ -99,7 +101,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        mapScrollLeft(pip, player, (pip[0].video->p), pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
                        }\r
                        else if(player[pn].enti.tx > 1 && !(pip[0].map->data[(player[pn].enti.tx-2)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))\r
                        {\r
@@ -110,7 +112,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        player[pn].enti.x-=(player[pn].enti.speed);\r
                                        ANIMATESPRIFUN(pip, player, pn, 0);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
                        }\r
                        else\r
                        {\r
@@ -125,7 +127,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx-1;\r
                        player[pn].enti.triggery = player[pn].enti.ty;\r
-                       WALKTYPE_FRAM_PRINT\r
+                       //WALKTYPE_FRAM_PRINT\r
                break;\r
                //down movement\r
                case 4:\r
@@ -142,7 +144,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        mapScrollDown(pip, player, (pip[0].video->p), pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
                        }\r
                        else if(player[pn].enti.ty < pip[0].map->height && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))\r
                        {\r
@@ -153,7 +155,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        player[pn].enti.y+=(player[pn].enti.speed);\r
                                        ANIMATESPRIFUN(pip, player, pn, 0);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
                        }\r
                        else\r
                        {\r
@@ -168,7 +170,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
                        player[pn].enti.triggery = player[pn].enti.ty+1;\r
-                       WALKTYPE_FRAM_PRINT\r
+                       //WALKTYPE_FRAM_PRINT\r
                break;\r
                //up movement\r
                case 0:\r
@@ -185,7 +187,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        mapScrollUp(pip, player, (pip[0].video->p), pn);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
                        }\r
                        else if(player[pn].enti.ty > 1 && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty-2))] == 0))//!(player[pn].enti.tx == TRIGGX &&  player[pn].enti.ty-1 == TRIGGY))\r
                        {\r
@@ -196,7 +198,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                        player[pn].enti.y-=(player[pn].enti.speed);\r
                                        ANIMATESPRIFUN(pip, player, 0, pn);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
                        }\r
                        else\r
                        {\r
@@ -211,14 +213,11 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
                        player[pn].enti.triggery = player[pn].enti.ty-1;\r
-                       WALKTYPE_FRAM_PRINT\r
+                       //WALKTYPE_FRAM_PRINT\r
                break;\r
        }\r
-       if(player[pn].enti.d!=2 && pip[0].video->rs)\r
-       {\r
-               IN_UserInput(1,1);\r
-               delay(500);\r
-       }\r
+       //if(player[pn].enti.d!=2 && pip[0].video->rs) IN_UserInput(1,1);\r
+       //else if(!pip[0].video->rs) delay(500);\r
 }\r
 \r
 \r
@@ -257,7 +256,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else if(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))\r
                        {\r
@@ -268,7 +267,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        ANIMATESPRIFUN(pip, player, pn, 0);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; }\r
                        }\r
                        else\r
                        {\r
@@ -301,7 +300,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
                        }\r
                        else if(player[pn].enti.tx > 1 && !(pip[0].map->data[(player[pn].enti.tx-2)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))\r
                        {\r
@@ -312,7 +311,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        ANIMATESPRIFUN(pip, player, pn, 0);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; }\r
                        }\r
                        else\r
                        {\r
@@ -345,7 +344,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
                        }\r
                        else if(player[pn].enti.ty < pip[0].map->height && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))\r
                        {\r
@@ -356,7 +355,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        ANIMATESPRIFUN(pip, player, pn, 0);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; }\r
                        }\r
                        else\r
                        {\r
@@ -389,7 +388,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
                                        //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
                        }\r
                        else if(player[pn].enti.ty > 1 && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty-2))] == 0))//!(player[pn].enti.tx == TRIGGX &&  player[pn].enti.ty-1 == TRIGGY))\r
                        {\r
@@ -400,7 +399,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                        ANIMATESPRIFUN(pip, player, 0, pn);\r
                                        if(!pageflipflop) modexShowPage(pip[1].page);\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; }\r
                        }\r
                        else\r
                        {\r
@@ -434,7 +433,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
                                        pip[0].page->dx+=4;\r
                                        SHOWMVFUN_;\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].tx++; }\r
                        }\r
                break;\r
 \r
@@ -447,7 +446,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
                                        pip[0].page->dx-=4;\r
                                        SHOWMVFUN_;\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].tx--; }\r
                        }\r
                break;\r
 \r
@@ -460,7 +459,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
                                        pip[0].page->dy+=4;\r
                                        SHOWMVFUN_;\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty++; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].ty++; }\r
                        }\r
                break;\r
 \r
@@ -473,7 +472,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
                                        pip[0].page->dy-=4;\r
                                        SHOWMVFUN_;\r
                                        player[pn].enti.q++;\r
-                               } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty--; }\r
+                               } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].ty--; }\r
                        }\r
                break;\r
        }\r
@@ -1127,57 +1126,32 @@ void shinku(global_game_variables_t *gv)
        }\r
 }\r
 \r
-void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word dire, word sw)\r
+void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word sw)\r
 {\r
-       pip->video->sprifilei=0;\r
-\r
-       switch(sw)\r
-       {\r
-               case 1:\r
-                       dire+=2;\r
-               break;\r
-               case 2:\r
-                       dire+=1;\r
-               break;\r
-//             case 3:\r
-//                     dire=dire;\r
-//             break;\r
-               case 4:\r
-                       dire+=2;\r
-               break;\r
-       }\r
-\r
        switch(pip[0].video->rs)\r
        {\r
                case 0:\r
-                       pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, dire);     if(pip->video->sprifilei == -1) return;\r
                        animate_spri(player[pn].ent->spri, pip->video);\r
                break;\r
                case 1:\r
-                       pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, dire);     if(pip->video->sprifilei == -1) return;\r
                        oldanimate_spri(player[pn].ent->spri, pip->video);\r
                break;\r
                case 2:\r
-                       modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, dire);\r
+                       modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, player[pn].enti.dire);\r
                break;\r
        }\r
 }\r
 \r
-/*void ZC_odrawframe()\r
-{\r
-\r
-}*/\r
-\r
 #ifdef SPRITE\r
-#define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32,   PLAYERBMPDATAPTR);\r
-#define FRAME3 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 0, dire, 24, 32,    PLAYERBMPDATAPTR);\r
-#define FRAME4 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32,   PLAYERBMPDATAPTR);\r
+#define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
+#define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
+#define FRAME3 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 0, player[pn].enti.dire, 24, 32,    PLAYERBMPDATAPTR);\r
+#define FRAME4 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32,   PLAYERBMPDATAPTR);\r
 #else\r
-#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+dire);\r
-#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
-#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, dire);\r
-#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+dire);\r
+#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+player[pn].enti.dire);\r
+#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
+#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, player[pn].enti.dire);\r
+#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire);\r
 #endif\r
 \r
 void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
@@ -1186,9 +1160,9 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
        sword y = player[pn].enti.y;\r
        sword bx = x+16;        //buffer's x\r
        sword by = y+16;        //buffer's y\r
-       word dire=32; //direction\r
        sword qq; //scroll offset\r
        word ls = player[pn].enti.persist_aniframe;\r
+       player[pn].enti.dire=32; //direction\r
 \r
        switch(scrollswitch)\r
        {\r
@@ -1205,13 +1179,13 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
        {\r
                case 0:\r
                        //up\r
-                       dire*=player[pn].enti.d;\r
+                       player[pn].enti.dire*=player[pn].enti.d;\r
                        y-=qq;\r
                        by-=4;\r
                break;\r
                case 3:\r
                        // right\r
-                       dire*=(player[pn].enti.d-2);\r
+                       player[pn].enti.dire*=(player[pn].enti.d-2);\r
                        x+=qq;\r
                        bx+=4;\r
                break;\r
@@ -1219,13 +1193,13 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll
                break;\r
                case 4:\r
                        //down\r
-                       dire*=(player[pn].enti.d-2);\r
+                       player[pn].enti.dire*=(player[pn].enti.d-2);\r
                        y+=qq;\r
                        by+=4;\r
                break;\r
                case 1:\r
                        //left\r
-                       dire*=(player[pn].enti.d+2);\r
+                       player[pn].enti.dire*=(player[pn].enti.d+2);\r
                        x-=qq;\r
                        bx-=4;\r
                break;\r
@@ -1272,9 +1246,9 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
 {\r
        sword x = player[pn].enti.x;\r
        sword y = player[pn].enti.y;\r
-       word dire=10; //direction\r
        sword qq; //scroll offset\r
        word ls = player[pn].enti.persist_aniframe;\r
+       player[pn].enti.dire=10; //direction\r
 \r
        switch(scrollswitch)\r
        {\r
@@ -1292,27 +1266,31 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
        {\r
                case 0:\r
                        //up\r
-                       dire*=player[pn].enti.d+1;\r
+                       player[pn].enti.dire*=player[pn].enti.d+1;\r
                        y-=qq;\r
                break;\r
                case 3:\r
                        // right\r
-                       dire*=(player[pn].enti.d-1);\r
+                       player[pn].enti.dire*=(player[pn].enti.d-1);\r
                        x+=qq;\r
                break;\r
                case 2:\r
                break;\r
                case 4:\r
                        //down\r
-                       dire*=(player[pn].enti.d-1);\r
+                       player[pn].enti.dire*=(player[pn].enti.d-1);\r
                        y+=qq;\r
                break;\r
                case 1:\r
                        //left\r
-                       dire*=(player[pn].enti.d+3);\r
+                       player[pn].enti.dire*=(player[pn].enti.d+3);\r
                        x-=qq;\r
                break;\r
        }\r
+       player[pn].enti.dire++;\r
+\r
+       player[pn].ent->spri->delay=1;\r
+       //pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, player[pn].enti.dire);   if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; }\r
 \r
        //setting xy position\r
        player[pn].ent->spri->x = x;\r
@@ -1321,19 +1299,22 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
        switch(ls)\r
        {\r
                case 1:\r
-                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
+                       ZC_drawframe(pip, player, pn, x, y, ls);\r
                break;\r
                case 2:\r
-                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
+                       ZC_drawframe(pip, player, pn, x, y, ls);\r
                break;\r
                case 3:\r
-                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
+                       ZC_drawframe(pip, player, pn, x, y, ls);\r
                break;\r
                case 4:\r
-                       ZC_drawframe(pip, player, pn, x, y, dire, ls);\r
+                       ZC_drawframe(pip, player, pn, x, y, ls);\r
                break;\r
        }\r
        pip->video->r=1;\r
+       WALKTYPE_FRAM_PRINT;\r
+       sprintf(global_temp_status_text, " %u", player[pn].enti.dire);\r
+       modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe)+8, player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text);\\r
 }\r
 \r
 /*\r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 873197bc2c1f439a24ceca41a0a9558f2f730ff4..6b03e96fd95a2d61cde54ef86d585d195334f014 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -157,7 +157,7 @@ void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);\r
 //void qclean();\r
 void shinku(global_game_variables_t *gv);\r
-void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word dire, word sw);\r
+void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word sw);\r
 void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 void near ZC_animatePlayer_(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r

diff --git a/src/scroll.c b/src/scroll.c
index 6baefa2af368a8ba748aff10886215e24d02dcab..1d92d1fb4d6ede1b4f54aa08f55f44eb3d946947 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -123,7 +123,7 @@ void main(int argc, char *argv[])
        IN_initplayer(&player, 0);\r
        player[0].ent->spri->x = player[0].enti.x-4;\r
        player[0].ent->spri->y = player[0].enti.y-16;\r
-       player[0].ent->spri->delay = 0;\r
+       player[0].ent->spri->delay = 1;\r
 \r
 #ifndef        SPRITE\r
        modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);\r
@@ -232,6 +232,7 @@ void main(int argc, char *argv[])
        }\r
 #endif\r
        FUNCTIONKEYFUNCTIONS;\r
+       if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }\r
 \r
        //9\r
 #ifdef FADE\r

diff --git a/src/vrstest.c b/src/vrstest.c
index 094f4a9fdd4036dffd323f6ebd0954b3af8d7d1f..707832a2b6fe3540c3d560148f171e27ad1527f0 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -92,12 +92,12 @@ void main()
        //read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs);\r
        spri.spritesheet = &vrs;\r
        spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));\r
-       i = set_anim_by_id(&spri, 11);\r
+       i = set_anim_by_id(&spri, 31);\r
        if (i == -1)\r
        {\r
                return;\r
        }\r
-       spri.x = TILEWH;\r
+       spri.x = TILEWH-4;\r
        spri.y = TILEWH;\r
 \r
 //     Uncomment to see broken sprites\r
@@ -121,7 +121,8 @@ void main()
        modexPalUpdate1(pal);*/\r
        VL_LoadPalFile("data/spri/chikyuu.pal", &palette);\r
        for (i = 0; i < 5; i++){\r
-               spri.delay = 1; animate_spri(&spri, &gvar.video);// spri.x += 16;\r
+               spri.delay = 1;\r
+               animate_spri(&spri, &gvar.video);// spri.x += 16;\r
                delay(500);\r
        }\r
 \r

diff --git a/src/zcroll.c b/src/zcroll.c
index 789a8eb30f65b887060032229df287821ce93fcf..e056fdec17d2c5fcac0a9b7a6344fc480bb5df29 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -115,9 +115,10 @@ void main(int argc, char *argv[])
        player[0].ent->spri->y = player[0].enti.y-16;\r
        player[0].ent->spri->delay = 0;\r
 \r
-       i = set_anim_by_id(player[0].ent->spri, 31);\r
-       print_anim_ids(player[0].ent->spri);\r
-       if (i == -1)\r
+       player[0].enti.dire=31;\r
+       gvar.video.sprifilei = set_anim_by_id(player[0].ent->spri, player[0].enti.dire);\r
+       //print_anim_ids(player[0].ent->spri);\r
+       if (gvar.video.sprifilei == -1)\r
        {\r
 #ifdef FADE\r
                modexFadeOff(4, gpal);\r
@@ -202,6 +203,7 @@ void main(int argc, char *argv[])
                        }\r
                }\r
                FUNCTIONKEYFUNCTIONS;\r
+               if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }\r
 \r
                //9\r
 #ifdef FADE\r