pushing some changes!

diff --git a/DEBUG.16W b/DEBUG.16W
deleted file mode 100755 (executable)
index 7703117..0000000
--- a/DEBUG.16W
+++ /dev/null
@@ -1,210 +0,0 @@
-\e[0mSeg:0      Size:9873       Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m000\r
-\e[0m\e[0mSeg:2758       Size:44 Owner:0x0\r
-\e[41;31m++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2784       Size:256        Owner:0x1970\r
-\e[44;34m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2884       Size:256        Owner:0x1762\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2984       Size:256        Owner:0x1764\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2a84       Size:256        Owner:0x1766\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2b84       Size:256        Owner:0x1768\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2c84       Size:256        Owner:0x176a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2d84       Size:256        Owner:0x176c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2e84       Size:256        Owner:0x176e\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2f84       Size:256        Owner:0x1770\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3084       Size:256        Owner:0x1772\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3184       Size:256        Owner:0x1774\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3284       Size:256        Owner:0x1776\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3384       Size:256        Owner:0x1778\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3484       Size:256        Owner:0x177a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3584       Size:256        Owner:0x177c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3684       Size:256        Owner:0x177e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3784       Size:256        Owner:0x1780\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3884       Size:256        Owner:0x1782\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3984       Size:256        Owner:0x1784\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3a84       Size:256        Owner:0x1786\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3b84       Size:256        Owner:0x1788\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3c84       Size:256        Owner:0x178a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3d84       Size:256        Owner:0x178c\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3e84       Size:256        Owner:0x178e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3f84       Size:256        Owner:0x1790\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4084       Size:256        Owner:0x1792\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4184       Size:256        Owner:0x1794\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4284       Size:256        Owner:0x1796\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4384       Size:256        Owner:0x1798\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4484       Size:256        Owner:0x179a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4584       Size:256        Owner:0x179c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4684       Size:256        Owner:0x179e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4784       Size:256        Owner:0x17a0\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4884       Size:256        Owner:0x17a2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4984       Size:256        Owner:0x17a4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4a84       Size:256        Owner:0x17a6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4b84       Size:256        Owner:0x17a8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4c84       Size:256        Owner:0x17aa\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4d84       Size:256        Owner:0x17ac\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4e84       Size:256        Owner:0x17ae\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4f84       Size:256        Owner:0x17b0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5084       Size:256        Owner:0x17b2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5184       Size:256        Owner:0x17b4\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5284       Size:256        Owner:0x17b6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5384       Size:256        Owner:0x17b8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5484       Size:256        Owner:0x17ba\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5584       Size:256        Owner:0x17bc\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5684       Size:256        Owner:0x17be\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5784       Size:256        Owner:0x17c0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5884       Size:256        Owner:0x17c2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5984       Size:256        Owner:0x17c4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5a84       Size:256        Owner:0x17c6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5b84       Size:256        Owner:0x17c8\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5c84       Size:256        Owner:0x17ca\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5d84       Size:256        Owner:0x17cc\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5e84       Size:256        Owner:0x17ce\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5f84       Size:256        Owner:0x17d0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6084       Size:256        Owner:0x17d2\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6184       Size:256        Owner:0x17d4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6284       Size:256        Owner:0x17d6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6384       Size:256        Owner:0x17d8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6484       Size:256        Owner:0x17da\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6584       Size:256        Owner:0x17dc\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6684       Size:256        Owner:0x17de\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6784       Size:256        Owner:0x17e0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6884       Size:256        Owner:0x17e2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6984       Size:256        Owner:0x17e4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6a84       Size:256        Owner:0x17e6\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6b84       Size:256        Owner:0x17e8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6c84       Size:256        Owner:0x17ea\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6d84       Size:256        Owner:0x17ec\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6e84       Size:256        Owner:0x17ee\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6f84       Size:256        Owner:0x17f0\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7084       Size:256        Owner:0x17f2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7184       Size:256        Owner:0x17f4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7284       Size:256        Owner:0x17f6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7384       Size:256        Owner:0x17f8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7484       Size:256        Owner:0x17fa\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7584       Size:256        Owner:0x17fc\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7684       Size:256        Owner:0x17fe\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7784       Size:256        Owner:0x1800\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7884       Size:256        Owner:0x1802\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7984       Size:256        Owner:0x1804\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7a84       Size:256        Owner:0x1806\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7b84       Size:256        Owner:0x1808\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7c84       Size:256        Owner:0x180a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7d84       Size:256        Owner:0x180c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7e84       Size:256        Owner:0x180e\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7f84       Size:256        Owner:0x1810\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8084       Size:256        Owner:0x1812\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8184       Size:256        Owner:0x1814\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8284       Size:256        Owner:0x1816\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8384       Size:256        Owner:0x1818\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8484       Size:256        Owner:0x181a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8584       Size:256        Owner:0x181c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8684       Size:256        Owner:0x181e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8784       Size:256        Owner:0x1820\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8884       Size:256        Owner:0x1822\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8984       Size:256        Owner:0x1824\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8a84       Size:256        Owner:0x1826\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8b84       Size:256        Owner:0x1828\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8c84       Size:401        Owner:0xef42\r
-\e[44;34m++++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:b784       Size:18555      Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
deleted file mode 100755 (executable)
index 6080bed..0000000
--- a/HEAP.16W
+++ /dev/null
@@ -1,69 +0,0 @@
-\r
-       == default ==\r
-\r
-  USED block at 277a0016 of size 136\r
-  FREE block at 277a009e of size 68\r
-  USED block at 277a00e2 of size 50\r
-  USED block at 277a0114 of size 50\r
-  USED block at 277a0146 of size 50\r
-  USED block at 277a0178 of size 50\r
-  USED block at 277a01aa of size 50\r
-  USED block at 277a01dc of size 50\r
-  USED block at 277a020e of size 50\r
-  USED block at 277a0240 of size 50\r
-  USED block at 277a0272 of size 50\r
-  USED block at 277a02a4 of size 50\r
-  USED block at 277a02d6 of size 50\r
-  USED block at 277a0308 of size 50\r
-  FREE block at 277a033a of size 14\r
-  USED block at 277a0348 of size 20\r
-  FREE block at 277a035c of size 7328\r
-OK - end of heap\r
-\r
-       == near ==\r
-\r
-  USED block at 1779ef86 of size 12\r
-  USED block at 1779ef92 of size 330\r
-  USED block at 1779f0dc of size 52\r
-  USED block at 1779f110 of size 20\r
-  USED block at 1779f124 of size 20\r
-  USED block at 1779f138 of size 20\r
-  USED block at 1779f14c of size 20\r
-  USED block at 1779f160 of size 20\r
-  USED block at 1779f174 of size 3720\r
-OK - end of heap\r
-\r
-       == far ==\r
-\r
-  USED block at 277a0016 of size 136\r
-  USED block at 277a009e of size 68\r
-  USED block at 277a00e2 of size 50\r
-  USED block at 277a0114 of size 50\r
-  USED block at 277a0146 of size 50\r
-  USED block at 277a0178 of size 50\r
-  USED block at 277a01aa of size 50\r
-  USED block at 277a01dc of size 50\r
-  USED block at 277a020e of size 50\r
-  USED block at 277a0240 of size 50\r
-  USED block at 277a0272 of size 50\r
-  USED block at 277a02a4 of size 50\r
-  USED block at 277a02d6 of size 50\r
-  USED block at 277a0308 of size 50\r
-  USED block at 277a033a of size 14\r
-  USED block at 277a0348 of size 20\r
-  USED block at 277a035c of size 7328\r
-OK - end of heap\r
-\r
-Memory Type         Total      Used       Free\r
-----------------  --------   --------   --------\r
-Default                   8166         756       7410\r
-Near              4214         494       3720\r
-Far               8166         756       7410\r
-----------------  --------   --------   --------\r
-coreleft = 3718\r
-farcoreleft = 35534\r
-GetFreeSize = 31836\r
-GetNearFreeSize = 3720\r
-GetFarFreeSize = 31836\r
-memavl = 3718\r
-stackavail = 31545\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
deleted file mode 100755 (executable)
index 7a2c9d9..0000000
Binary files a/MMDUMP.16W and /dev/null differ

diff --git a/src/bakapi.c b/src/bakapi.c
index 381badd1c4e0c2c223d52379849e0c83d39d9738..e7adbd22275b56e13d987c08efb3cafbe68bcfc8 100755 (executable)
--- a/src/bakapi.c
+++ b/src/bakapi.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -107,7 +107,12 @@ main(int argc, char *argvar[])
        bakapee.bakax=0;\r
        bakapee.bakay=0;\r
        bakapee.coor=0;\r
+\r
+       //once where #defines\r
        bakapee.tile=0;\r
+       bakapee.bonk=400;\r
+       bakapee.lgq=32;\r
+       bakapee.hgq=55;\r
 \r
        /* setup camera and screen~ */\r
        gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);\r
@@ -220,6 +225,7 @@ main(int argc, char *argvar[])
                                        printf("on.\n");\r
                                break;\r
                        }\r
+                       printf("Incrementation of color happens at every %uth plot.\n", bakapee.bonk);\r
                        printf("Enter 1, 2, 3, 4, 5, 6, 8, or 9 to run a screensaver, or enter 0 to quit.\n");\r
 pee:\r
                        c = getch();\r
@@ -268,6 +274,15 @@ pee:
                // we'll integrate DOSLIB vga into that part of the code instead for less disruption. -- J.C.\r
                                        modexShowPage(&gvar.video.page[0]);\r
                                        break;\r
+                               case '-':\r
+                                       if(bakapee.bonk>0)\r
+                                               bakapee.bonk-=100;\r
+                               break;\r
+                               case '=':\r
+                               case '+':\r
+                                       if(bakapee.bonk<1000)\r
+                                               bakapee.bonk+=100;\r
+                               break;\r
                                default:\r
                                        key=0;\r
                                        break;\r

diff --git a/src/lib/16_enti.c b/src/lib/16_enti.c
new file mode 100755 (executable)
index 0000000..1d8a1b9
--- /dev/null
+++ b/src/lib/16_enti.c
@@ -0,0 +1,22 @@
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+\r

diff --git a/src/lib/16_enti.h b/src/lib/16_enti.h
index 4e92d99027566635f4c536769144e70d44721dc4..bfda2c15f9b39f42c2cbd17bfba02222314ab7f3 100755 (executable)
--- a/src/lib/16_enti.h
+++ b/src/lib/16_enti.h
@@ -1,3 +1,25 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 #ifndef __16_NPC__
 #define __16_NPC__
 

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 126ae581f17011de42f2e495738486544f2742cd..125e0a233a4ee2a6520f143250637bfca6d9ec66 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -137,9 +137,9 @@ typedef     struct
        int triggery; //entity's trigger box tile position on the viewable map\r
        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
+       nibble 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
+       nibble q,preq;  //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
        struct sprite *spri; // sprite used by entity\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 408c349e97e7ee0c077745e72c4b6fb29c5c77c2..8199666f3f4ff29e4cb7e05e0e366228232553eb 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -296,7 +296,7 @@ void modexHiganbanaPageSetup(video_t *video)
        video->omemptr=                 vga_state.vga_graphics_ram;\r
        video->vga_draw_stride= vga_state.vga_draw_stride;\r
        video->vga_draw_stride_limit=   vga_state.vga_draw_stride_limit;\r
-\r
+       //sprite render switch\r
        video->rs=0;\r
 \r
        //setup the buffersize\r

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 3b45f105c1a5ceeccfe40a360b4b95a226263899..917784f52966765a4f82009aa78393f73a0568a2 100755 (executable)
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -42,11 +42,11 @@ void colortest(page_t *page, bakapee_t *pee)
 //color \82Ä\82·\82Æ\r
 void colorz(page_t *page, bakapee_t *pee)\r
 {\r
-       if(pee->coor <= HGQ)\r
+       if(pee->coor <= pee->hgq)\r
        {\r
                modexcls(page, pee->coor, VGA);\r
                pee->coor++;\r
-       }else pee->coor = LGQ;\r
+       }else pee->coor = pee->lgq;\r
 }\r
 \r
 //slow spectrum down\r
@@ -75,12 +75,7 @@ void dingpp(page_t *page, bakapee_t *pee)
 {\r
        if(pee->tile)\r
        {\r
-#ifndef MXLIB\r
-       //fill_block(pee->xx, pee->yy, pee->xx+TILEWH, pee->yy+TILEWH, pee->coor);\r
-               mxFillBox(pee->xx, pee->yy, TILEWH, TILEWH, pee->coor, OP_SET);\r
-#else\r
                modexClearRegion(page, pee->xx, pee->yy, TILEWH, TILEWH, pee->coor);\r
-#endif\r
        }\r
        else\r
                modexputPixel(page, pee->xx, pee->yy, pee->coor);\r
@@ -107,7 +102,7 @@ void dingo(page_t *page, bakapee_t *pee)
 //assigning values from randomizer\r
 void dingas(bakapee_t *pee)\r
 {\r
-       if(pee->gq == BONK) dingu(pee);\r
+       if(pee->gq == pee->bonk) dingu(pee);\r
        if(!pee->bakax)\r
        {\r
                if(pee->tile)\r
@@ -136,7 +131,7 @@ void dingas(bakapee_t *pee)
 \r
 void dingaso(bakapee_t *pee)\r
 {\r
-       if(pee->gq == BONK) dingu(pee);\r
+       if(pee->gq == pee->bonk) dingu(pee);\r
        if(!pee->bakax)\r
        {\r
                if(pee->tile)\r
@@ -165,19 +160,19 @@ void dingaso(bakapee_t *pee)
 \r
 void dingu(bakapee_t *pee)\r
 {\r
-       if(pee->coor < HGQ && pee->coor < LGQ) pee->coor = LGQ;\r
-       if(pee->coor < HGQ)\r
+       if(pee->coor < pee->hgq && pee->coor < pee->lgq) pee->coor = pee->lgq;\r
+       if(pee->coor < pee->hgq)\r
        {\r
                pee->coor++;\r
        }else{\r
-               pee->coor = LGQ;\r
+               pee->coor = pee->lgq;\r
        }\r
 }\r
 \r
 //randomizer\r
 void dingq(bakapee_t *pee)\r
 {\r
-       if(pee->gq<BONK)\r
+       if(pee->gq<pee->bonk)\r
        {\r
                pee->gq++;\r
        }\r
@@ -191,7 +186,7 @@ void dingq(bakapee_t *pee)
 \r
 void dingqo(bakapee_t *pee)\r
 {\r
-       if(pee->gq<BONK)\r
+       if(pee->gq<pee->bonk)\r
        {\r
                pee->gq++;\r
                pee->bakax = rand()%3; pee->bakay = rand()%3;\r
@@ -211,7 +206,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
 {\r
        word tx=0,ty=0;//d3y,\r
 \r
-//++++  if(q <= 4 && q!=2 && gq == BONK-1) coor = rand()%HGQ;\r
+//++++  if(q <= 4 && q!=2 && gq == pee->bonk-1) coor = rand()%pee->hgq;\r
        switch(q)\r
        {\r
                case 1:/*\r
@@ -289,22 +284,22 @@ void ding(page_t *page, bakapee_t *pee, word q)
                        modexcls(page, pee->coor, VGA);\r
                break;\r
                case 7:\r
-                       if(pee->coor <= HGQ)\r
+                       if(pee->coor <= pee->hgq)\r
                        {\r
                                ssd(page, pee, q);\r
                                pee->coor++;\r
-                       }else pee->coor = LGQ;\r
+                       }else pee->coor = pee->lgq;\r
                break;\r
                case 8:\r
                        colorz(page, pee);\r
                        modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi");\r
                break;\r
                case 9:\r
-                       if(pee->coor <= HGQ)\r
+                       if(pee->coor <= pee->hgq)\r
                        {\r
                                ssd(page, pee, q);\r
                                pee->coor++;\r
-                       }else pee->coor = LGQ;\r
+                       }else pee->coor = pee->lgq;\r
                break;\r
                case 10:\r
                        ssd(page, pee, q); /*printf("%d\n", pee->coor);*/\r

diff --git a/src/lib/bakapee.h b/src/lib/bakapee.h
index f734f2e55780542607fbbaec457c20ad7e3fd736..06c5e7055ebf22b50a8842d6dc48fd8c21771089 100755 (executable)
--- a/src/lib/bakapee.h
+++ b/src/lib/bakapee.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -23,46 +23,14 @@
 #ifndef __BAKAPEE_H_\r
 #define __BAKAPEE_H_\r
 \r
-/* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
- *\r
- * This file is part of Project 16.\r
- *\r
- * Project 16 is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * Project 16 is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
- * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
- * Fifth Floor, Boston, MA 02110-1301 USA.\r
- *\r
- */\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_vl.h"\r
 #include <hw/cpu/cpu.h>\r
 #include <hw/dos/dos.h>\r
 #include <hw/vga/vga.h>\r
 \r
-//#include "src/lib/modex/modex.h"\r
-//#include "16/x/modex.h"\r
-\r
-#define TILEWH 16\r
-#define QUADWH                 TILEWH/2\r
-#define BONK       400\r
-#define LGQ         32\r
-#define HGQ         55\r
-\r
-#define TILE\r
-\r
-//which lib?\r
-#define MXLIB\r
+#define TILEWH 16\r
+#define QUADWH TILEWH/2\r
 \r
 typedef struct {\r
        word gq;\r
@@ -70,6 +38,7 @@ typedef struct {
        sword xx, yy, sx, sy;\r
        byte coor;\r
        boolean tile;\r
+       word bonk,lgq,hgq;\r
 } bakapee_t;\r
 \r
 void clrstdin();\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 63a094a0676f90265e154280d8e2718fa87aba9f..df5af21ddfeebf270c86c6ba16b35768287f8bf0 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -74,17 +74,11 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-//#ifdef SPRITE\r
-//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR);\r
                                ANIMATESPRIFUN(pip, player, pn, 0);\r
-//#else\r
-//                             modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 14);\r
-//#endif\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx+1;\r
                        player[pn].enti.triggery = player[pn].enti.ty;\r
-                       //WALKTYPE_FRAM_PRINT\r
                break;\r
                //left movement\r
                case 1:\r
@@ -117,17 +111,11 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-//#ifdef SPRITE\r
-//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR);\r
                                ANIMATESPRIFUN(pip, player, pn, 0);\r
-//#else\r
-//                             modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 10);\r
-//#endif\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx-1;\r
                        player[pn].enti.triggery = player[pn].enti.ty;\r
-                       //WALKTYPE_FRAM_PRINT\r
                break;\r
                //down movement\r
                case 4:\r
@@ -160,17 +148,11 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-//#ifdef SPRITE\r
-//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR);\r
                                ANIMATESPRIFUN(pip, player, pn, 0);\r
-//#else\r
-//                             modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 9);\r
-//#endif\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
                        player[pn].enti.triggery = player[pn].enti.ty+1;\r
-                       //WALKTYPE_FRAM_PRINT\r
                break;\r
                //up movement\r
                case 0:\r
@@ -203,21 +185,13 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
                        else\r
                        {\r
                                player[pn].walktype=0;\r
-//#ifdef SPRITE\r
-//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR);\r
                                ANIMATESPRIFUN(pip, player, pn, 0);\r
-//#else\r
-//                             modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 12);\r
-//#endif\r
                                player[pn].enti.d = 2;\r
                        }\r
                        player[pn].enti.triggerx = player[pn].enti.tx;\r
                        player[pn].enti.triggery = player[pn].enti.ty-1;\r
-                       //WALKTYPE_FRAM_PRINT\r
                break;\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
@@ -903,7 +877,8 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
                mapDrawWRow(&mv[0], tx-1, ty, py);\r
        i+=mv->map->width - tx;\r
        }\r
-       if(!pageploop) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);\r
+       //if(!pageploop)\r
+               modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);\r
 //     {\r
 //             unsigned int k,j,o;\r
 //             /* fill screen with a distinctive pattern */\r
@@ -1319,6 +1294,12 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr
                break;\r
        }\r
        pip->video->r=1;\r
+       if(player[pn].enti.persist_aniframe!=player[pn].enti.q)\r
+       {\r
+               sprintf(global_temp_status_text, "[%u]%u", player[pn].enti.persist_aniframe, player[pn].enti.q);\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
+               delay(500);\r
+       }\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

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index c2bacfbdc00588247503b54787ee85b42175af84..396798e0a2c084a25e5b3d94bde9c41957999a13 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -94,6 +94,7 @@ typedef struct {
 //printf("gvar.kurokku:        "); printf("%.0f ", clock());   printf("tiku=%lu ", gvar.kurokku.tiku); printf("t=%.0f ", gvar.kurokku.t);      printf("ticktock()=%f ", ticktock(&gvar));      printf("%.0f fps", (double)gvar.kurokku.tiku/ticktock(&gvar));\r
 //printf("map.width=%d map.height=%d   map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);\r
 //printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);\r
+//print_anim_ids(player[0].ent->spri);\r
 #define SCROLLEXITMESG         printf("tx: %d  ", mv[0].tx);\\r
        printf("ty: %d\n", mv[0].ty);\\r
        printf("\n");\\r
@@ -115,7 +116,6 @@ typedef struct {
 \\r
        printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);\\r
        printf("pageflipflop=%u\n", pageflipflop);\\r
-       print_anim_ids(player[0].ent->spri);\\r
        printf("\n");\r
 \r
 #define SHOWMVFUN ZC_ShowMV(&mv, 0, 0);\r
@@ -160,7 +160,6 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
 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 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
 \r
 // Move an entity around. Should actually be in 16_entity\r

diff --git a/src/test.c b/src/test.c
index b85e785945ac1a10f3c3bf44c5f517d0f82f3a90..c933f9534e8aa212f609798e46187cacf58342ed 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -24,7 +24,9 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/16_in.h"\r
 #include "src/lib/scroll16.h"\r
-#include "src/lib/bakapee.h"\r
+\r
+#define LGQ 32\r
+#define HGQ 55\r
 \r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r