]> 4ch.mooo.com Git - 16.git/commitdiff
i actually fixed a bug instantly O_O on 1st try holy shit lol i gotta now work on...
authorsparky4 <sparky4@cock.li>
Wed, 18 Jan 2017 14:30:09 +0000 (08:30 -0600)
committersparky4 <sparky4@cock.li>
Wed, 18 Jan 2017 14:30:09 +0000 (08:30 -0600)
DEBUG.16W [deleted file]
HEAP.16W [deleted file]
MMDUMP.16W [deleted file]
src/lib/16_sprit.c
src/lib/doslib

diff --git a/DEBUG.16W b/DEBUG.16W
deleted file mode 100755 (executable)
index fa556aa..0000000
--- a/DEBUG.16W
+++ /dev/null
@@ -1,210 +0,0 @@
-\e[0mSeg:0      Size:9819       Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0000\r
-\e[0m\e[0mSeg:2723       Size:44 Owner:0x0\r
-\e[41;31m+\e[0m\e[42;32m\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:2a4f       Size:256        Owner:0x175a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2b4f       Size:256        Owner:0x175c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2c4f       Size:256        Owner:0x175e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2d4f       Size:256        Owner:0x1760\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2e4f       Size:256        Owner:0x1762\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2f4f       Size:256        Owner:0x1764\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:304f       Size:256        Owner:0x1766\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:314f       Size:256        Owner:0x1768\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:324f       Size:256        Owner:0x176a\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:334f       Size:256        Owner:0x176c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:344f       Size:256        Owner:0x176e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:354f       Size:256        Owner:0x1770\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:364f       Size:256        Owner:0x1772\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:374f       Size:256        Owner:0x1774\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:384f       Size:256        Owner:0x1776\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:394f       Size:256        Owner:0x1778\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3a4f       Size:256        Owner:0x177a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3b4f       Size:256        Owner:0x177c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3c4f       Size:256        Owner:0x177e\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3d4f       Size:256        Owner:0x1780\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3e4f       Size:256        Owner:0x1782\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3f4f       Size:256        Owner:0x1784\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:404f       Size:256        Owner:0x1786\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:414f       Size:256        Owner:0x1788\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:424f       Size:256        Owner:0x178a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:434f       Size:256        Owner:0x178c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:444f       Size:256        Owner:0x178e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:454f       Size:256        Owner:0x1790\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:464f       Size:256        Owner:0x1792\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:474f       Size:256        Owner:0x1794\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:484f       Size:256        Owner:0x1796\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:494f       Size:256        Owner:0x1798\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4a4f       Size:256        Owner:0x179a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4b4f       Size:256        Owner:0x179c\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4c4f       Size:256        Owner:0x179e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4d4f       Size:256        Owner:0x17a0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4e4f       Size:256        Owner:0x17a2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4f4f       Size:256        Owner:0x17a4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:504f       Size:256        Owner:0x17a6\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:514f       Size:256        Owner:0x17a8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:524f       Size:256        Owner:0x17aa\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:534f       Size:256        Owner:0x17ac\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:544f       Size:256        Owner:0x17ae\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:554f       Size:256        Owner:0x17b0\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:564f       Size:256        Owner:0x17b2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:574f       Size:256        Owner:0x17b4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:584f       Size:256        Owner:0x17b6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:594f       Size:256        Owner:0x17b8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5a4f       Size:256        Owner:0x17ba\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5b4f       Size:256        Owner:0x17bc\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5c4f       Size:256        Owner:0x17be\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5d4f       Size:256        Owner:0x17c0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5e4f       Size:256        Owner:0x17c2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5f4f       Size:256        Owner:0x17c4\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:604f       Size:256        Owner:0x17c6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:614f       Size:256        Owner:0x17c8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:624f       Size:256        Owner:0x17ca\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:634f       Size:256        Owner:0x17cc\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:644f       Size:256        Owner:0x17ce\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:654f       Size:256        Owner:0x17d0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:664f       Size:256        Owner:0x17d2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:674f       Size:256        Owner:0x17d4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:684f       Size:256        Owner:0x17d6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:694f       Size:256        Owner:0x17d8\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6a4f       Size:256        Owner:0x17da\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6b4f       Size:256        Owner:0x17dc\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6c4f       Size:256        Owner:0x17de\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6d4f       Size:256        Owner:0x17e0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6e4f       Size:256        Owner:0x17e2\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6f4f       Size:256        Owner:0x17e4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:704f       Size:256        Owner:0x17e6\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:714f       Size:256        Owner:0x17e8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:724f       Size:256        Owner:0x17ea\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:734f       Size:256        Owner:0x17ec\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:744f       Size:256        Owner:0x17ee\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:754f       Size:256        Owner:0x17f0\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:764f       Size:256        Owner:0x17f2\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:774f       Size:256        Owner:0x17f4\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:784f       Size:256        Owner:0x17f6\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:794f       Size:256        Owner:0x17f8\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7a4f       Size:256        Owner:0x17fa\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7b4f       Size:256        Owner:0x17fc\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7c4f       Size:256        Owner:0x17fe\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7d4f       Size:256        Owner:0x1800\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7e4f       Size:256        Owner:0x1802\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7f4f       Size:256        Owner:0x1804\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:804f       Size:256        Owner:0x1806\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:814f       Size:256        Owner:0x1808\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:824f       Size:256        Owner:0x180a\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:834f       Size:256        Owner:0x180c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:844f       Size:256        Owner:0x180e\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:854f       Size:256        Owner:0x1810\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:864f       Size:256        Owner:0x1812\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:874f       Size:256        Owner:0x1814\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:884f       Size:256        Owner:0x1816\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:894f       Size:256        Owner:0x1818\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8a4f       Size:256        Owner:0x181a\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8b4f       Size:256        Owner:0x181c\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8c4f       Size:401        Owner:0xef32\r
-\e[44;34m++++++\e[0m\e[42;32m\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
deleted file mode 100755 (executable)
index f92ff98..0000000
--- a/HEAP.16W
+++ /dev/null
@@ -1,69 +0,0 @@
-\r
-       == default ==\r
-\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 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 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
-----------------  --------   --------   --------\r
-Default                   8166         756       7410\r
-Near              4230         494       3736\r
-Far               8166         756       7410\r
-----------------  --------   --------   --------\r
-coreleft = 3734\r
-farcoreleft = 35550\r
-GetFreeSize = 31836\r
-GetNearFreeSize = 3736\r
-GetFarFreeSize = 31836\r
-memavl = 3734\r
-stackavail = 31545\r
diff --git a/MMDUMP.16W b/MMDUMP.16W
deleted file mode 100755 (executable)
index b22737e..0000000
Binary files a/MMDUMP.16W and /dev/null differ
index 28808614ff43c12627af6ce7dca49d3cffb5b649..3895cc720a4084d7dd37469b9a77b39ae53a8285 100755 (executable)
@@ -164,7 +164,7 @@ void animate_spri(struct sprite *spri, video_t *video)
        // 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;//-4;\r
        y=spri->y;\r
 \r
index a4f5c4446c10647f26a89ffcba7acada1605e3c2..b9ab630a721c6f7503b9b76f981ef89046219a6a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a4f5c4446c10647f26a89ffcba7acada1605e3c2
+Subproject commit b9ab630a721c6f7503b9b76f981ef89046219a6a