palllist not being worked on right now... i will work on sprite animation VERY soon

diff --git a/DEBUG.16W b/DEBUG.16W
index 8eb06ade7470f097f0ecfbb69a12fab5b63fe21a..fa556aa7f7a14f59137e20677f860f5a4eebe931 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,210 +1,210 @@
-\e[0mSeg:0      Size:9822       Owner:0x0\r
+\e[0mSeg:0      Size:9819       Owner:0x0\r
 \e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0000\r
-\e[0m\e[0mSeg:2726       Size:44 Owner:0x0\r
+\e[0m\e[0mSeg:2723       Size:44 Owner:0x0\r
 \e[41;31m+\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2752       Size:256        Owner:0x1964\r
-\e[44;34m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2852       Size:256        Owner:0x1756\r
+\e[0m\e[0mSeg:274f       Size:256        Owner:0x1964\r
+\e[44;34m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:284f       Size:256        Owner:0x1756\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:294f       Size:256        Owner:0x1758\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2952       Size:256        Owner:0x1758\r
+\e[0m\e[0mSeg:2a4f       Size:256        Owner:0x175a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2a52       Size:256        Owner:0x175a\r
+\e[0m\e[0mSeg:2b4f       Size:256        Owner:0x175c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2b52       Size:256        Owner:0x175c\r
+\e[0m\e[0mSeg:2c4f       Size:256        Owner:0x175e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2c52       Size:256        Owner:0x175e\r
+\e[0m\e[0mSeg:2d4f       Size:256        Owner:0x1760\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2d52       Size:256        Owner:0x1760\r
+\e[0m\e[0mSeg:2e4f       Size:256        Owner:0x1762\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2e52       Size:256        Owner:0x1762\r
+\e[0m\e[0mSeg:2f4f       Size:256        Owner:0x1764\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2f52       Size:256        Owner:0x1764\r
+\e[0m\e[0mSeg:304f       Size:256        Owner:0x1766\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3052       Size:256        Owner:0x1766\r
+\e[0m\e[0mSeg:314f       Size:256        Owner:0x1768\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3152       Size:256        Owner:0x1768\r
+\e[0m\e[0mSeg:324f       Size:256        Owner:0x176a\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3252       Size:256        Owner:0x176a\r
+\e[0m\e[0mSeg:334f       Size:256        Owner:0x176c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3352       Size:256        Owner:0x176c\r
+\e[0m\e[0mSeg:344f       Size:256        Owner:0x176e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3452       Size:256        Owner:0x176e\r
+\e[0m\e[0mSeg:354f       Size:256        Owner:0x1770\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3552       Size:256        Owner:0x1770\r
+\e[0m\e[0mSeg:364f       Size:256        Owner:0x1772\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3652       Size:256        Owner:0x1772\r
+\e[0m\e[0mSeg:374f       Size:256        Owner:0x1774\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3752       Size:256        Owner:0x1774\r
+\e[0m\e[0mSeg:384f       Size:256        Owner:0x1776\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3852       Size:256        Owner:0x1776\r
+\e[0m\e[0mSeg:394f       Size:256        Owner:0x1778\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3952       Size:256        Owner:0x1778\r
+\e[0m\e[0mSeg:3a4f       Size:256        Owner:0x177a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3a52       Size:256        Owner:0x177a\r
+\e[0m\e[0mSeg:3b4f       Size:256        Owner:0x177c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3b52       Size:256        Owner:0x177c\r
+\e[0m\e[0mSeg:3c4f       Size:256        Owner:0x177e\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3c52       Size:256        Owner:0x177e\r
+\e[0m\e[0mSeg:3d4f       Size:256        Owner:0x1780\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3d52       Size:256        Owner:0x1780\r
+\e[0m\e[0mSeg:3e4f       Size:256        Owner:0x1782\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3e52       Size:256        Owner:0x1782\r
+\e[0m\e[0mSeg:3f4f       Size:256        Owner:0x1784\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3f52       Size:256        Owner:0x1784\r
+\e[0m\e[0mSeg:404f       Size:256        Owner:0x1786\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4052       Size:256        Owner:0x1786\r
+\e[0m\e[0mSeg:414f       Size:256        Owner:0x1788\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4152       Size:256        Owner:0x1788\r
+\e[0m\e[0mSeg:424f       Size:256        Owner:0x178a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4252       Size:256        Owner:0x178a\r
+\e[0m\e[0mSeg:434f       Size:256        Owner:0x178c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4352       Size:256        Owner:0x178c\r
+\e[0m\e[0mSeg:444f       Size:256        Owner:0x178e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4452       Size:256        Owner:0x178e\r
+\e[0m\e[0mSeg:454f       Size:256        Owner:0x1790\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4552       Size:256        Owner:0x1790\r
+\e[0m\e[0mSeg:464f       Size:256        Owner:0x1792\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4652       Size:256        Owner:0x1792\r
+\e[0m\e[0mSeg:474f       Size:256        Owner:0x1794\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4752       Size:256        Owner:0x1794\r
+\e[0m\e[0mSeg:484f       Size:256        Owner:0x1796\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4852       Size:256        Owner:0x1796\r
+\e[0m\e[0mSeg:494f       Size:256        Owner:0x1798\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4952       Size:256        Owner:0x1798\r
+\e[0m\e[0mSeg:4a4f       Size:256        Owner:0x179a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4a52       Size:256        Owner:0x179a\r
+\e[0m\e[0mSeg:4b4f       Size:256        Owner:0x179c\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4b52       Size:256        Owner:0x179c\r
+\e[0m\e[0mSeg:4c4f       Size:256        Owner:0x179e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4c52       Size:256        Owner:0x179e\r
+\e[0m\e[0mSeg:4d4f       Size:256        Owner:0x17a0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4d52       Size:256        Owner:0x17a0\r
+\e[0m\e[0mSeg:4e4f       Size:256        Owner:0x17a2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4e52       Size:256        Owner:0x17a2\r
+\e[0m\e[0mSeg:4f4f       Size:256        Owner:0x17a4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4f52       Size:256        Owner:0x17a4\r
+\e[0m\e[0mSeg:504f       Size:256        Owner:0x17a6\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5052       Size:256        Owner:0x17a6\r
+\e[0m\e[0mSeg:514f       Size:256        Owner:0x17a8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5152       Size:256        Owner:0x17a8\r
+\e[0m\e[0mSeg:524f       Size:256        Owner:0x17aa\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5252       Size:256        Owner:0x17aa\r
+\e[0m\e[0mSeg:534f       Size:256        Owner:0x17ac\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5352       Size:256        Owner:0x17ac\r
+\e[0m\e[0mSeg:544f       Size:256        Owner:0x17ae\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5452       Size:256        Owner:0x17ae\r
+\e[0m\e[0mSeg:554f       Size:256        Owner:0x17b0\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5552       Size:256        Owner:0x17b0\r
+\e[0m\e[0mSeg:564f       Size:256        Owner:0x17b2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5652       Size:256        Owner:0x17b2\r
+\e[0m\e[0mSeg:574f       Size:256        Owner:0x17b4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5752       Size:256        Owner:0x17b4\r
+\e[0m\e[0mSeg:584f       Size:256        Owner:0x17b6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5852       Size:256        Owner:0x17b6\r
+\e[0m\e[0mSeg:594f       Size:256        Owner:0x17b8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5952       Size:256        Owner:0x17b8\r
+\e[0m\e[0mSeg:5a4f       Size:256        Owner:0x17ba\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5a52       Size:256        Owner:0x17ba\r
+\e[0m\e[0mSeg:5b4f       Size:256        Owner:0x17bc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5b52       Size:256        Owner:0x17bc\r
+\e[0m\e[0mSeg:5c4f       Size:256        Owner:0x17be\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5c52       Size:256        Owner:0x17be\r
+\e[0m\e[0mSeg:5d4f       Size:256        Owner:0x17c0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5d52       Size:256        Owner:0x17c0\r
+\e[0m\e[0mSeg:5e4f       Size:256        Owner:0x17c2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5e52       Size:256        Owner:0x17c2\r
+\e[0m\e[0mSeg:5f4f       Size:256        Owner:0x17c4\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5f52       Size:256        Owner:0x17c4\r
+\e[0m\e[0mSeg:604f       Size:256        Owner:0x17c6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6052       Size:256        Owner:0x17c6\r
+\e[0m\e[0mSeg:614f       Size:256        Owner:0x17c8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6152       Size:256        Owner:0x17c8\r
+\e[0m\e[0mSeg:624f       Size:256        Owner:0x17ca\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6252       Size:256        Owner:0x17ca\r
+\e[0m\e[0mSeg:634f       Size:256        Owner:0x17cc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6352       Size:256        Owner:0x17cc\r
+\e[0m\e[0mSeg:644f       Size:256        Owner:0x17ce\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6452       Size:256        Owner:0x17ce\r
+\e[0m\e[0mSeg:654f       Size:256        Owner:0x17d0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6552       Size:256        Owner:0x17d0\r
+\e[0m\e[0mSeg:664f       Size:256        Owner:0x17d2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6652       Size:256        Owner:0x17d2\r
+\e[0m\e[0mSeg:674f       Size:256        Owner:0x17d4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6752       Size:256        Owner:0x17d4\r
+\e[0m\e[0mSeg:684f       Size:256        Owner:0x17d6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6852       Size:256        Owner:0x17d6\r
+\e[0m\e[0mSeg:694f       Size:256        Owner:0x17d8\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6952       Size:256        Owner:0x17d8\r
+\e[0m\e[0mSeg:6a4f       Size:256        Owner:0x17da\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6a52       Size:256        Owner:0x17da\r
+\e[0m\e[0mSeg:6b4f       Size:256        Owner:0x17dc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6b52       Size:256        Owner:0x17dc\r
+\e[0m\e[0mSeg:6c4f       Size:256        Owner:0x17de\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6c52       Size:256        Owner:0x17de\r
+\e[0m\e[0mSeg:6d4f       Size:256        Owner:0x17e0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6d52       Size:256        Owner:0x17e0\r
+\e[0m\e[0mSeg:6e4f       Size:256        Owner:0x17e2\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6e52       Size:256        Owner:0x17e2\r
+\e[0m\e[0mSeg:6f4f       Size:256        Owner:0x17e4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6f52       Size:256        Owner:0x17e4\r
+\e[0m\e[0mSeg:704f       Size:256        Owner:0x17e6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7052       Size:256        Owner:0x17e6\r
+\e[0m\e[0mSeg:714f       Size:256        Owner:0x17e8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7152       Size:256        Owner:0x17e8\r
+\e[0m\e[0mSeg:724f       Size:256        Owner:0x17ea\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7252       Size:256        Owner:0x17ea\r
+\e[0m\e[0mSeg:734f       Size:256        Owner:0x17ec\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7352       Size:256        Owner:0x17ec\r
+\e[0m\e[0mSeg:744f       Size:256        Owner:0x17ee\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7452       Size:256        Owner:0x17ee\r
+\e[0m\e[0mSeg:754f       Size:256        Owner:0x17f0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7552       Size:256        Owner:0x17f0\r
+\e[0m\e[0mSeg:764f       Size:256        Owner:0x17f2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7652       Size:256        Owner:0x17f2\r
+\e[0m\e[0mSeg:774f       Size:256        Owner:0x17f4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7752       Size:256        Owner:0x17f4\r
+\e[0m\e[0mSeg:784f       Size:256        Owner:0x17f6\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7852       Size:256        Owner:0x17f6\r
+\e[0m\e[0mSeg:794f       Size:256        Owner:0x17f8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7952       Size:256        Owner:0x17f8\r
+\e[0m\e[0mSeg:7a4f       Size:256        Owner:0x17fa\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7a52       Size:256        Owner:0x17fa\r
+\e[0m\e[0mSeg:7b4f       Size:256        Owner:0x17fc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7b52       Size:256        Owner:0x17fc\r
+\e[0m\e[0mSeg:7c4f       Size:256        Owner:0x17fe\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7c52       Size:256        Owner:0x17fe\r
+\e[0m\e[0mSeg:7d4f       Size:256        Owner:0x1800\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7d52       Size:256        Owner:0x1800\r
+\e[0m\e[0mSeg:7e4f       Size:256        Owner:0x1802\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7e52       Size:256        Owner:0x1802\r
+\e[0m\e[0mSeg:7f4f       Size:256        Owner:0x1804\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7f52       Size:256        Owner:0x1804\r
+\e[0m\e[0mSeg:804f       Size:256        Owner:0x1806\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8052       Size:256        Owner:0x1806\r
+\e[0m\e[0mSeg:814f       Size:256        Owner:0x1808\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8152       Size:256        Owner:0x1808\r
+\e[0m\e[0mSeg:824f       Size:256        Owner:0x180a\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8252       Size:256        Owner:0x180a\r
+\e[0m\e[0mSeg:834f       Size:256        Owner:0x180c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8352       Size:256        Owner:0x180c\r
+\e[0m\e[0mSeg:844f       Size:256        Owner:0x180e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8452       Size:256        Owner:0x180e\r
+\e[0m\e[0mSeg:854f       Size:256        Owner:0x1810\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8552       Size:256        Owner:0x1810\r
+\e[0m\e[0mSeg:864f       Size:256        Owner:0x1812\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8652       Size:256        Owner:0x1812\r
+\e[0m\e[0mSeg:874f       Size:256        Owner:0x1814\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8752       Size:256        Owner:0x1814\r
+\e[0m\e[0mSeg:884f       Size:256        Owner:0x1816\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8852       Size:256        Owner:0x1816\r
+\e[0m\e[0mSeg:894f       Size:256        Owner:0x1818\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8952       Size:256        Owner:0x1818\r
+\e[0m\e[0mSeg:8a4f       Size:256        Owner:0x181a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8a52       Size:256        Owner:0x181a\r
+\e[0m\e[0mSeg:8b4f       Size:256        Owner:0x181c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8b52       Size:256        Owner:0x181c\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8c52       Size:401        Owner:0xef32\r
+\e[0m\e[0mSeg:8c4f       Size:401        Owner:0xef32\r
 \e[44;34m++++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:b752       Size:18605      Owner:0x0\r
+\e[0m\e[0mSeg:b74f       Size:18608      Owner:0x0\r
 \e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
index 456f1a6238b60a6f16ca4e7a99ee22a37d93f6ef..f92ff98fccf0f4e08b0e4ec71280e7faa18b9075 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,57 +1,57 @@
 \r
        == default ==\r
 \r
-  USED block at 27480016 of size 136\r
-  FREE block at 2748009e of size 68\r
-  USED block at 274800e2 of size 50\r
-  USED block at 27480114 of size 50\r
-  USED block at 27480146 of size 50\r
-  USED block at 27480178 of size 50\r
-  USED block at 274801aa of size 50\r
-  USED block at 274801dc of size 50\r
-  USED block at 2748020e of size 50\r
-  USED block at 27480240 of size 50\r
-  USED block at 27480272 of size 50\r
-  USED block at 274802a4 of size 50\r
-  USED block at 274802d6 of size 50\r
-  USED block at 27480308 of size 50\r
-  FREE block at 2748033a of size 14\r
-  USED block at 27480348 of size 20\r
-  FREE block at 2748035c of size 7328\r
+  USED block at 27450016 of size 136\r
+  FREE block at 2745009e of size 68\r
+  USED block at 274500e2 of size 50\r
+  USED block at 27450114 of size 50\r
+  USED block at 27450146 of size 50\r
+  USED block at 27450178 of size 50\r
+  USED block at 274501aa of size 50\r
+  USED block at 274501dc of size 50\r
+  USED block at 2745020e of size 50\r
+  USED block at 27450240 of size 50\r
+  USED block at 27450272 of size 50\r
+  USED block at 274502a4 of size 50\r
+  USED block at 274502d6 of size 50\r
+  USED block at 27450308 of size 50\r
+  FREE block at 2745033a of size 14\r
+  USED block at 27450348 of size 20\r
+  FREE block at 2745035c of size 7328\r
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 1747ef76 of size 12\r
-  USED block at 1747ef82 of size 330\r
-  USED block at 1747f0cc of size 52\r
-  USED block at 1747f100 of size 20\r
-  USED block at 1747f114 of size 20\r
-  USED block at 1747f128 of size 20\r
-  USED block at 1747f13c of size 20\r
-  USED block at 1747f150 of size 20\r
-  USED block at 1747f164 of size 3736\r
+  USED block at 1744ef76 of size 12\r
+  USED block at 1744ef82 of size 330\r
+  USED block at 1744f0cc of size 52\r
+  USED block at 1744f100 of size 20\r
+  USED block at 1744f114 of size 20\r
+  USED block at 1744f128 of size 20\r
+  USED block at 1744f13c of size 20\r
+  USED block at 1744f150 of size 20\r
+  USED block at 1744f164 of size 3736\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 27480016 of size 136\r
-  USED block at 2748009e of size 68\r
-  USED block at 274800e2 of size 50\r
-  USED block at 27480114 of size 50\r
-  USED block at 27480146 of size 50\r
-  USED block at 27480178 of size 50\r
-  USED block at 274801aa of size 50\r
-  USED block at 274801dc of size 50\r
-  USED block at 2748020e of size 50\r
-  USED block at 27480240 of size 50\r
-  USED block at 27480272 of size 50\r
-  USED block at 274802a4 of size 50\r
-  USED block at 274802d6 of size 50\r
-  USED block at 27480308 of size 50\r
-  USED block at 2748033a of size 14\r
-  USED block at 27480348 of size 20\r
-  USED block at 2748035c of size 7328\r
+  USED block at 27450016 of size 136\r
+  USED block at 2745009e of size 68\r
+  USED block at 274500e2 of size 50\r
+  USED block at 27450114 of size 50\r
+  USED block at 27450146 of size 50\r
+  USED block at 27450178 of size 50\r
+  USED block at 274501aa of size 50\r
+  USED block at 274501dc of size 50\r
+  USED block at 2745020e of size 50\r
+  USED block at 27450240 of size 50\r
+  USED block at 27450272 of size 50\r
+  USED block at 274502a4 of size 50\r
+  USED block at 274502d6 of size 50\r
+  USED block at 27450308 of size 50\r
+  USED block at 2745033a of size 14\r
+  USED block at 27450348 of size 20\r
+  USED block at 2745035c 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 8d3b00cfafde601881133d69ad6630238c7dd2f3..b22737eb2e1f302a5adb77c52b28844b7676f749 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index e74b3907ef23383b640b19c8c259dcb510c7379c..28808614ff43c12627af6ce7dca49d3cffb5b649 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -150,11 +150,11 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
        }\r
 }\r
 */\r
-void animate_spri(struct sprite *spri, global_game_variables_t *gv)\r
+void animate_spri(struct sprite *spri, video_t *video)\r
 {\r
-#define GVARVIDEO gv->video\r
-#define VMEMPAGESIZE2  GVARVIDEO.page[0].pagesize+GVARVIDEO.page[1].pagesize\r
-#define VMEMPAGEDATA2  GVARVIDEO.page[2].data\r
+#define GVARVIDEO video\r
+#define VMEMPAGESIZE2  GVARVIDEO->page[0].pagesize+GVARVIDEO->page[1].pagesize\r
+#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 = 1;       // how many pixels to "overdraw" so that moving sprites with edge pixels don't leave streaks.\r
@@ -165,37 +165,38 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
 \r
 \r
        omemptr = vga_state.vga_graphics_ram; // save original mem ptr\r
-       x=spri->x-4;\r
+       x=spri->x;//-4;\r
        y=spri->y;\r
 \r
        // Draw sprite\r
        j = get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);\r
        if(j < 0)\r
        {\r
-               Quit (gv, "Error retriving required sprite");\r
+               //Quit (gv, "Error retriving required sprite");\r
+               return;\r
        }\r
 \r
        // render box bounds. y does not need modification, but x and width must be multiple of 4\r
        if (x >= overdraw) rx = (x - overdraw) & (~3);\r
-               else rx = -(GVARVIDEO.page[0].dx);\r
+               else rx = -(GVARVIDEO->page[0].dx);\r
        if (y >= overdraw) ry = (y - overdraw);\r
-               else ry = -(GVARVIDEO.page[0].dy);\r
+               else ry = -(GVARVIDEO->page[0].dy);\r
        h = spri->sprite_vrl_cont->vrl_header->height + overdraw + y - ry;\r
        w = (x + spri->sprite_vrl_cont->vrl_header->width + (overdraw*2) + 3 - rx) & (~3);//round up\r
-       if ((rx+w) > GVARVIDEO.page[0].width) w = GVARVIDEO.page[0].width-rx;\r
-       if ((ry+h) > GVARVIDEO.page[0].height) h = GVARVIDEO.page[0].height-ry;\r
+       if ((rx+w) > GVARVIDEO->page[0].width) w = GVARVIDEO->page[0].width-rx;\r
+       if ((ry+h) > GVARVIDEO->page[0].height) h = GVARVIDEO->page[0].height-ry;\r
 \r
        // block copy pattern to where we will draw the sprite\r
        vga_setup_wm1_block_copy();\r
        o2 = VMEMPAGESIZE2;\r
-       o = (0x10000UL - (uint16_t)VMEMPAGEDATA2) + (ry * GVARVIDEO.page[0].stridew) + (rx >> 2); // source offscreen\r
-       for (i=0;i < h;i++,o += GVARVIDEO.page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
+       o = (0x10000UL - (uint16_t)VMEMPAGEDATA2) + (ry * GVARVIDEO->page[0].stridew) + (rx >> 2); // source offscreen\r
+       for (i=0;i < h;i++,o += GVARVIDEO->page[0].stridew,o2 += (w >> 2)) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
 \r
        // must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally\r
        vga_restore_rm0wm0();\r
 \r
        // replace VGA stride with our own and mem ptr. then sprite rendering at this stage is just (0,0)\r
-       vga_state.vga_draw_stride_limit = (GVARVIDEO.page[0].width + 3 - x) >> 2;//round up\r
+       vga_state.vga_draw_stride_limit = (GVARVIDEO->page[0].width + 3 - x) >> 2;//round up\r
        vga_state.vga_draw_stride = w >> 2;\r
        vga_state.vga_graphics_ram = omemptr + VMEMPAGESIZE2;\r
 \r
@@ -215,13 +216,13 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
        // block copy to visible RAM from offscreen\r
        vga_setup_wm1_block_copy();\r
        o = VMEMPAGESIZE2; // source offscreen\r
-       o2 = (ry * GVARVIDEO.page[0].stridew) + (rx >> 2); // dest visible (original stride)\r
-       for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += GVARVIDEO.page[0].stridew) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
+       o2 = (ry * GVARVIDEO->page[0].stridew) + (rx >> 2); // dest visible (original stride)\r
+       for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += GVARVIDEO->page[0].stridew) vga_wm1_mem_block_copy(o2,o,w >> 2);\r
        // must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally\r
        vga_restore_rm0wm0();\r
 \r
        // restore stride\r
-       vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = GVARVIDEO.page[0].stridew;\r
+       vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = GVARVIDEO->page[0].stridew;\r
 \r
        // Depending on delay, update indices\r
        switch(spri->delay){\r

diff --git a/src/lib/16_sprit.h b/src/lib/16_sprit.h
index 9ef500e5d0d76e0a554e6e64df84182fd4e7ceff..386b42f1619abd2eb6cc84750cf425d671468b8a 100755 (executable)
--- a/src/lib/16_sprit.h
+++ b/src/lib/16_sprit.h
@@ -66,7 +66,7 @@ int set_anim_by_id(struct sprite *spri, int id);
  * In:\r
  * + struct sprite *spri - sprite to animate\r
  */\r
-void animate_spri(struct sprite *spri, global_game_variables_t *gvar);\r
+void animate_spri(struct sprite *spri, video_t *video);\r
 \r
 void print_anim_ids(struct sprite *spri);\r
 \r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 8a29dc79b69e776a612f6dcbaa4bb7945caee971..d4a34e5ccc4879134b3a9242d10d54700c96efff 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -24,6 +24,8 @@
 */\r
 #include "src/lib/scroll16.h"\r
 \r
+#define ANIMATESPRIFUN ZC_animatePlayer\r
+\r
 void oldwalk(map_view_t *pip, player_t *player, word pn)\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
@@ -43,7 +45,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollRight(pip, player, 3, pn);\r
                                        ScrollRight(pip, player, 2, pn);\r
                                        //mapScrollRight(pip, player, !(pip[0].video->p), pn);\r
@@ -59,7 +61,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.x+=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, pn, 0);\r
+                                       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
@@ -87,7 +89,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollLeft(pip, player, 3, pn);\r
                                        ScrollLeft(pip, player, 2, pn);\r
                                        //mapScrollLeft(pip, player, !(pip[0].video->p), pn);\r
@@ -103,7 +105,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.x-=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, pn, 0);\r
+                                       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
@@ -131,7 +133,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollDown(pip, player, 3, pn);\r
                                        ScrollDown(pip, player, 2, pn);\r
                                        //mapScrollDown(pip, player, !(pip[0].video->p), pn);\r
@@ -147,7 +149,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.y+=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, pn, 0);\r
+                                       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
@@ -175,7 +177,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollUp(pip, player, 3, pn);\r
                                        ScrollUp(pip, player, 2, pn);\r
                                        //mapScrollUp(pip, player, !(pip[0].video->p), pn);\r
@@ -191,7 +193,7 @@ void oldwalk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.y-=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, 0, pn);\r
+                                       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
@@ -240,7 +242,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollRight(pip, player, 3, pn);\r
                                        ScrollRight(pip, player, 2, pn);\r
                                        mapScrollRight(pip, player, (pip[0].video->p), pn);\r
@@ -254,7 +256,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.x+=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, pn, 0);\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
                        }\r
@@ -278,7 +280,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollLeft(pip, player, 3, pn);\r
                                        ScrollLeft(pip, player, 2, pn);\r
                                        mapScrollLeft(pip, player, (pip[0].video->p), pn);\r
@@ -292,7 +294,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.x-=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, pn, 0);\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
                        }\r
@@ -316,7 +318,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollDown(pip, player, 3, pn);\r
                                        ScrollDown(pip, player, 2, pn);\r
                                        mapScrollDown(pip, player, (pip[0].video->p), pn);\r
@@ -330,7 +332,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.y+=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, pn, 0);\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
                        }\r
@@ -354,7 +356,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                if(player[pn].enti.q<=player[pn].enti.spt)\r
                                {\r
                                        INC_PER_FRAME;\r
-                                       animatePlayer(pip, player, pn, 1);\r
+                                       ANIMATESPRIFUN(pip, player, pn, 1);\r
                                        ScrollUp(pip, player, 3, pn);\r
                                        ScrollUp(pip, player, 2, pn);\r
                                        mapScrollUp(pip, player, (pip[0].video->p), pn);\r
@@ -368,7 +370,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                                {\r
                                        INC_PER_FRAME;\r
                                        player[pn].enti.y-=(player[pn].enti.speed);\r
-                                       animatePlayer(pip, player, 0, pn);\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
                        }\r
@@ -1296,16 +1298,13 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gv)
 //void animate_spri(struct sprite *spri, global_game_variables_t *gv)\r
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)\r
 {\r
-       struct sprite *spri = player[pn].ent->spri;\r
        sword x = player[pn].enti.x;\r
        sword y = player[pn].enti.y;\r
-       word dire=32; //direction\r
+       word dire=10; //direction\r
+       sword i;\r
        sword qq; //scroll offset\r
        word ls = player[pn].enti.persist_aniframe;\r
 \r
-       spri->x=x;\r
-       spri->y=y;\r
-\r
        switch(scrollswitch)\r
        {\r
                case 0:\r
@@ -1321,36 +1320,41 @@ 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;\r
+                       dire*=(player[pn].enti.d+1);// dire++;\r
                        y-=qq;\r
                break;\r
                case 3:\r
                        // right\r
-                       dire*=(player[pn].enti.d-2);\r
+                       dire*=(player[pn].enti.d-1);// dire++;\r
                        x+=qq;\r
                break;\r
                case 2:\r
                break;\r
                case 4:\r
                        //down\r
-                       dire*=(player[pn].enti.d-2);\r
+                       dire*=(player[pn].enti.d-1);// dire++;\r
                        y+=qq;\r
                break;\r
                case 1:\r
                        //left\r
-                       dire*=(player[pn].enti.d+2);\r
+                       dire*=(player[pn].enti.d+3);// dire++;\r
                        x-=qq;\r
                break;\r
        }\r
 \r
+       //setting xy position\r
+       player[pn].ent->spri->x = x;\r
+       player[pn].ent->spri->y = y;\r
+\r
 //#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire);\r
 //#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
 //#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire);\r
 //#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);\r
-#define NFRAME1\r
-#define NFRAME2\r
-#define NFRAME3\r
-#define NFRAME4\r
+#define DRAWFRAME if (i == -1) return; animate_spri(player[pn].ent->spri, pip->video)\r
+#define NFRAME1 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
+#define NFRAME2 i = set_anim_by_id(player[pn].ent->spri, 1+dire);      DRAWFRAME;\r
+#define NFRAME3 i = set_anim_by_id(player[pn].ent->spri, dire);        DRAWFRAME;\r
+#define NFRAME4 i = set_anim_by_id(player[pn].ent->spri, 2+dire);      DRAWFRAME;\r
 \r
        switch(ls)\r
        {\r
@@ -1358,7 +1362,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
                        NFRAME1\r
                break;\r
                case 2:\r
-                       NFRAME2\r
+                       NFRAME2;\r
                break;\r
                case 3:\r
                        NFRAME3\r

diff --git a/src/vrstest.c b/src/vrstest.c
index a7e48d1b4b53473513b16c5d458806df7b5ad3ef..f94f4c0ff10bb2ccaf2aba951b3853f8782a2466 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -121,7 +121,7 @@ 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);// spri.x += 16;\r
+               spri.delay = 1; animate_spri(&spri, &gvar.video);// spri.x += 16;\r
                sleep(1);\r
        }\r
 \r

diff --git a/src/zcroll.c b/src/zcroll.c
index 92f54d09dc71db352c385db40e2e6e82a7297ef7..4dd1359858ee7b5d7df135b22fd15d69f63cad6f 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -100,7 +100,7 @@ void main(int argc, char *argv[])
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
        ZC_MVSetup(&mv, &map, &gvar);\r
-       player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;\r
+       //player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;\r
 \r
        // set up paging\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
@@ -108,8 +108,10 @@ void main(int argc, char *argv[])
 \r
        playerXYpos(0, 0, &player, &mv, 0);\r
        IN_initplayer(&player, 0);\r
+       player[0].ent->spri->x = player[0].enti.x;\r
+       player[0].ent->spri->y = player[0].enti.y;\r
 \r
-       i = set_anim_by_id(player[0].ent->spri, 11);\r
+       i = set_anim_by_id(player[0].ent->spri, 31);\r
        print_anim_ids(player[0].ent->spri);\r
        if (i == -1)\r
        {\r
@@ -121,7 +123,7 @@ void main(int argc, char *argv[])
                modexFadeOn(4, dpal);\r
 #endif\r
        }\r
-       animate_spri((player[0].ent->spri), &gvar);\r
+       animate_spri((player[0].ent->spri), &gvar.video);\r
 \r
        VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
 #ifdef FADE\r
@@ -191,7 +193,7 @@ void main(int argc, char *argv[])
                                        player[0].ent->spri->x = TILEWH;\r
                                default:\r
                                        i++;\r
-                                       player[0].ent->spri->delay = 1; animate_spri((player[0].ent->spri), &gvar);// player[0].ent->spri->x += 16;\r
+                                       player[0].ent->spri->delay = 1; animate_spri((player[0].ent->spri), &gvar.video);// player[0].ent->spri->x += 16;\r
                                break;\r
                        }\r
                }\r