From: sparky4 Date: Mon, 31 Oct 2016 17:22:34 +0000 (-0500) Subject: 16_map is very glitchy wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=23dce1333da3fc460de2480cb6d1b2ff2501edce;p=16.git 16_map is very glitchy wwww --- diff --git a/DEBUG.16W b/DEBUG.16W index 86023db0..d60262d1 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -Seg:0 Size:11821 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++000 -Seg:2eb4 Size:37 Owner:0x0 -+ -Seg:2ed9 Size:256 Owner:0x1784 -+++++ -Seg:2fd9 Size:256 Owner:0x1572 +Seg:0 Size:11917 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0000 +Seg:2f7a Size:37 Owner:0x0 +++ +Seg:2f9f Size:256 Owner:0x1650 +++++ +Seg:309f Size:256 Owner:0x1442 ++++ -Seg:30d9 Size:256 Owner:0x1574 +Seg:319f Size:256 Owner:0x1444 ++++ -Seg:31d9 Size:256 Owner:0x1576 -++++ -Seg:32d9 Size:256 Owner:0x1578 -++++ -Seg:33d9 Size:256 Owner:0x157a +Seg:329f Size:256 Owner:0x1446 +++++ -Seg:34d9 Size:256 Owner:0x157c +Seg:339f Size:256 Owner:0x1448 ++++ -Seg:35d9 Size:256 Owner:0x157e +Seg:349f Size:256 Owner:0x144a ++++ -Seg:36d9 Size:256 Owner:0x1580 +Seg:359f Size:256 Owner:0x144c ++++ -Seg:37d9 Size:256 Owner:0x1582 +Seg:369f Size:256 Owner:0x144e ++++ -Seg:38d9 Size:256 Owner:0x1584 +Seg:379f Size:256 Owner:0x1450 +++++ -Seg:39d9 Size:256 Owner:0x1586 +Seg:389f Size:256 Owner:0x1452 ++++ -Seg:3ad9 Size:256 Owner:0x1588 +Seg:399f Size:256 Owner:0x1454 ++++ -Seg:3bd9 Size:256 Owner:0x158a +Seg:3a9f Size:256 Owner:0x1456 ++++ -Seg:3cd9 Size:256 Owner:0x158c +Seg:3b9f Size:256 Owner:0x1458 ++++ -Seg:3dd9 Size:256 Owner:0x158e +Seg:3c9f Size:256 Owner:0x145a +++++ -Seg:3ed9 Size:256 Owner:0x1590 +Seg:3d9f Size:256 Owner:0x145c ++++ -Seg:3fd9 Size:256 Owner:0x1592 +Seg:3e9f Size:256 Owner:0x145e ++++ -Seg:40d9 Size:256 Owner:0x1594 +Seg:3f9f Size:256 Owner:0x1460 ++++ -Seg:41d9 Size:256 Owner:0x1596 +Seg:409f Size:256 Owner:0x1462 ++++ -Seg:42d9 Size:256 Owner:0x1598 +Seg:419f Size:256 Owner:0x1464 +++++ -Seg:43d9 Size:256 Owner:0x159a +Seg:429f Size:256 Owner:0x1466 ++++ -Seg:44d9 Size:256 Owner:0x159c +Seg:439f Size:256 Owner:0x1468 ++++ -Seg:45d9 Size:256 Owner:0x159e +Seg:449f Size:256 Owner:0x146a ++++ -Seg:46d9 Size:256 Owner:0x15a0 +Seg:459f Size:256 Owner:0x146c ++++ -Seg:47d9 Size:256 Owner:0x15a2 +Seg:469f Size:256 Owner:0x146e +++++ -Seg:48d9 Size:256 Owner:0x15a4 +Seg:479f Size:256 Owner:0x1470 ++++ -Seg:49d9 Size:256 Owner:0x15a6 +Seg:489f Size:256 Owner:0x1472 ++++ -Seg:4ad9 Size:256 Owner:0x15a8 +Seg:499f Size:256 Owner:0x1474 ++++ -Seg:4bd9 Size:256 Owner:0x15aa +Seg:4a9f Size:256 Owner:0x1476 ++++ -Seg:4cd9 Size:256 Owner:0x15ac +Seg:4b9f Size:256 Owner:0x1478 +++++ -Seg:4dd9 Size:256 Owner:0x15ae +Seg:4c9f Size:256 Owner:0x147a ++++ -Seg:4ed9 Size:256 Owner:0x15b0 +Seg:4d9f Size:256 Owner:0x147c ++++ -Seg:4fd9 Size:256 Owner:0x15b2 +Seg:4e9f Size:256 Owner:0x147e ++++ -Seg:50d9 Size:256 Owner:0x15b4 +Seg:4f9f Size:256 Owner:0x1480 ++++ -Seg:51d9 Size:256 Owner:0x15b6 +Seg:509f Size:256 Owner:0x1482 +++++ -Seg:52d9 Size:256 Owner:0x15b8 +Seg:519f Size:256 Owner:0x1484 ++++ -Seg:53d9 Size:256 Owner:0x15ba +Seg:529f Size:256 Owner:0x1486 ++++ -Seg:54d9 Size:256 Owner:0x15bc +Seg:539f Size:256 Owner:0x1488 ++++ -Seg:55d9 Size:256 Owner:0x15be +Seg:549f Size:256 Owner:0x148a ++++ -Seg:56d9 Size:256 Owner:0x15c0 +Seg:559f Size:256 Owner:0x148c +++++ -Seg:57d9 Size:256 Owner:0x15c2 +Seg:569f Size:256 Owner:0x148e ++++ -Seg:58d9 Size:256 Owner:0x15c4 +Seg:579f Size:256 Owner:0x1490 ++++ -Seg:59d9 Size:256 Owner:0x15c6 +Seg:589f Size:256 Owner:0x1492 ++++ -Seg:5ad9 Size:256 Owner:0x15c8 +Seg:599f Size:256 Owner:0x1494 ++++ -Seg:5bd9 Size:256 Owner:0x15ca +Seg:5a9f Size:256 Owner:0x1496 +++++ -Seg:5cd9 Size:256 Owner:0x15cc +Seg:5b9f Size:256 Owner:0x1498 ++++ -Seg:5dd9 Size:256 Owner:0x15ce +Seg:5c9f Size:256 Owner:0x149a ++++ -Seg:5ed9 Size:256 Owner:0x15d0 +Seg:5d9f Size:256 Owner:0x149c ++++ -Seg:5fd9 Size:256 Owner:0x15d2 +Seg:5e9f Size:256 Owner:0x149e ++++ -Seg:60d9 Size:256 Owner:0x15d4 +Seg:5f9f Size:256 Owner:0x14a0 +++++ -Seg:61d9 Size:256 Owner:0x15d6 +Seg:609f Size:256 Owner:0x14a2 ++++ -Seg:62d9 Size:256 Owner:0x15d8 +Seg:619f Size:256 Owner:0x14a4 ++++ -Seg:63d9 Size:256 Owner:0x15da +Seg:629f Size:256 Owner:0x14a6 ++++ -Seg:64d9 Size:256 Owner:0x15dc +Seg:639f Size:256 Owner:0x14a8 ++++ -Seg:65d9 Size:256 Owner:0x15de +Seg:649f Size:256 Owner:0x14aa +++++ -Seg:66d9 Size:256 Owner:0x15e0 +Seg:659f Size:256 Owner:0x14ac ++++ -Seg:67d9 Size:256 Owner:0x15e2 +Seg:669f Size:256 Owner:0x14ae ++++ -Seg:68d9 Size:256 Owner:0x15e4 +Seg:679f Size:256 Owner:0x14b0 ++++ -Seg:69d9 Size:256 Owner:0x15e6 +Seg:689f Size:256 Owner:0x14b2 ++++ -Seg:6ad9 Size:256 Owner:0x15e8 +Seg:699f Size:256 Owner:0x14b4 +++++ -Seg:6bd9 Size:256 Owner:0x15ea +Seg:6a9f Size:256 Owner:0x14b6 ++++ -Seg:6cd9 Size:256 Owner:0x15ec +Seg:6b9f Size:256 Owner:0x14b8 ++++ -Seg:6dd9 Size:256 Owner:0x15ee +Seg:6c9f Size:256 Owner:0x14ba ++++ -Seg:6ed9 Size:256 Owner:0x15f0 +Seg:6d9f Size:256 Owner:0x14bc ++++ -Seg:6fd9 Size:256 Owner:0x15f2 +Seg:6e9f Size:256 Owner:0x14be +++++ -Seg:70d9 Size:256 Owner:0x15f4 +Seg:6f9f Size:256 Owner:0x14c0 ++++ -Seg:71d9 Size:256 Owner:0x15f6 +Seg:709f Size:256 Owner:0x14c2 ++++ -Seg:72d9 Size:256 Owner:0x15f8 +Seg:719f Size:256 Owner:0x14c4 ++++ -Seg:73d9 Size:256 Owner:0x15fa +Seg:729f Size:256 Owner:0x14c6 ++++ -Seg:74d9 Size:256 Owner:0x15fc +Seg:739f Size:256 Owner:0x14c8 +++++ -Seg:75d9 Size:256 Owner:0x15fe +Seg:749f Size:256 Owner:0x14ca ++++ -Seg:76d9 Size:256 Owner:0x1600 +Seg:759f Size:256 Owner:0x14cc ++++ -Seg:77d9 Size:256 Owner:0x1602 +Seg:769f Size:256 Owner:0x14ce ++++ -Seg:78d9 Size:256 Owner:0x1604 +Seg:779f Size:256 Owner:0x14d0 ++++ -Seg:79d9 Size:256 Owner:0x1606 +Seg:789f Size:256 Owner:0x14d2 +++++ -Seg:7ad9 Size:256 Owner:0x1608 +Seg:799f Size:256 Owner:0x14d4 ++++ -Seg:7bd9 Size:256 Owner:0x160a +Seg:7a9f Size:256 Owner:0x14d6 ++++ -Seg:7cd9 Size:256 Owner:0x160c +Seg:7b9f Size:256 Owner:0x14d8 ++++ -Seg:7dd9 Size:256 Owner:0x160e +Seg:7c9f Size:256 Owner:0x14da ++++ -Seg:7ed9 Size:256 Owner:0x1610 +Seg:7d9f Size:256 Owner:0x14dc +++++ -Seg:7fd9 Size:256 Owner:0x1612 +Seg:7e9f Size:256 Owner:0x14de ++++ -Seg:80d9 Size:256 Owner:0x1614 +Seg:7f9f Size:256 Owner:0x14e0 ++++ -Seg:81d9 Size:256 Owner:0x1616 +Seg:809f Size:256 Owner:0x14e2 ++++ -Seg:82d9 Size:256 Owner:0x1618 +Seg:819f Size:256 Owner:0x14e4 ++++ -Seg:83d9 Size:256 Owner:0x161a +Seg:829f Size:256 Owner:0x14e6 +++++ -Seg:84d9 Size:256 Owner:0x161c +Seg:839f Size:256 Owner:0x14e8 ++++ -Seg:85d9 Size:256 Owner:0x161e +Seg:849f Size:256 Owner:0x14ea ++++ -Seg:86d9 Size:256 Owner:0x1620 +Seg:859f Size:256 Owner:0x14ec ++++ -Seg:87d9 Size:256 Owner:0x1622 +Seg:869f Size:256 Owner:0x14ee ++++ -Seg:88d9 Size:256 Owner:0x1624 +Seg:879f Size:256 Owner:0x14f0 +++++ -Seg:89d9 Size:256 Owner:0x1626 +Seg:889f Size:256 Owner:0x14f2 ++++ -Seg:8ad9 Size:256 Owner:0x1628 +Seg:899f Size:256 Owner:0x14f4 ++++ -Seg:8bd9 Size:256 Owner:0x162a +Seg:8a9f Size:256 Owner:0x14f6 ++++ -Seg:8cd9 Size:256 Owner:0x162c +Seg:8b9f Size:256 Owner:0x14f8 ++++ -Seg:8dd9 Size:256 Owner:0x162e +Seg:8c9f Size:256 Owner:0x14fa +++++ -Seg:8ed9 Size:256 Owner:0x1630 +Seg:8d9f Size:256 Owner:0x14fc ++++ -Seg:8fd9 Size:256 Owner:0x1632 +Seg:8e9f Size:256 Owner:0x14fe ++++ -Seg:90d9 Size:256 Owner:0x1634 +Seg:8f9f Size:256 Owner:0x1500 ++++ -Seg:91d9 Size:256 Owner:0x1636 +Seg:909f Size:256 Owner:0x1502 ++++ -Seg:92d9 Size:256 Owner:0x1638 +Seg:919f Size:256 Owner:0x1504 +++++ -Seg:93d9 Size:401 Owner:0xf25a +Seg:929f Size:256 Owner:0x1506 +++++ +Seg:939f Size:256 Owner:0x1508 +++++ +Seg:949f Size:401 Owner:0xebf6 ++++++ -Seg:bed9 Size:16678 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file +Seg:bf9f Size:16480 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index 0526b320..30ba90e5 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,71 +1,71 @@ == default == - FREE block at 2ed70016 of size 18 - USED block at 2ed70028 of size 50 - USED block at 2ed7005a of size 50 - USED block at 2ed7008c of size 50 - USED block at 2ed700be of size 50 - USED block at 2ed700f0 of size 50 - USED block at 2ed70122 of size 50 - USED block at 2ed70154 of size 50 - USED block at 2ed70186 of size 50 - USED block at 2ed701b8 of size 50 - USED block at 2ed701ea of size 50 - USED block at 2ed7021c of size 50 - USED block at 2ed7024e of size 50 - USED block at 2ed70280 of size 50 - FREE block at 2ed702b2 of size 14 - USED block at 2ed702c0 of size 20 - USED block at 2ed702d4 of size 136 - FREE block at 2ed7035c of size 7328 + FREE block at 2f9d0016 of size 18 + USED block at 2f9d0028 of size 50 + USED block at 2f9d005a of size 50 + USED block at 2f9d008c of size 50 + USED block at 2f9d00be of size 50 + USED block at 2f9d00f0 of size 50 + USED block at 2f9d0122 of size 50 + USED block at 2f9d0154 of size 50 + USED block at 2f9d0186 of size 50 + USED block at 2f9d01b8 of size 50 + USED block at 2f9d01ea of size 50 + USED block at 2f9d021c of size 50 + USED block at 2f9d024e of size 50 + USED block at 2f9d0280 of size 50 + FREE block at 2f9d02b2 of size 14 + USED block at 2f9d02c0 of size 20 + USED block at 2f9d02d4 of size 136 + FREE block at 2f9d035c of size 7328 OK - end of heap == near == - USED block at 1ed6f2a6 of size 12 - USED block at 1ed6f2b2 of size 528 - USED block at 1ed6f4c2 of size 72 - USED block at 1ed6f50a of size 20 - USED block at 1ed6f51e of size 20 - USED block at 1ed6f532 of size 20 - USED block at 1ed6f546 of size 20 - USED block at 1ed6f55a of size 20 - USED block at 1ed6f56e of size 2702 + USED block at 1f9cec46 of size 12 + USED block at 1f9cec52 of size 528 + USED block at 1f9cee62 of size 72 + USED block at 1f9ceeaa of size 20 + USED block at 1f9ceebe of size 20 + USED block at 1f9ceed2 of size 20 + USED block at 1f9ceee6 of size 20 + USED block at 1f9ceefa of size 20 + USED block at 1f9cef0e of size 4334 OK - end of heap == far == - USED block at 2ed70016 of size 18 - USED block at 2ed70028 of size 50 - USED block at 2ed7005a of size 50 - USED block at 2ed7008c of size 50 - USED block at 2ed700be of size 50 - USED block at 2ed700f0 of size 50 - USED block at 2ed70122 of size 50 - USED block at 2ed70154 of size 50 - USED block at 2ed70186 of size 50 - USED block at 2ed701b8 of size 50 - USED block at 2ed701ea of size 50 - USED block at 2ed7021c of size 50 - USED block at 2ed7024e of size 50 - USED block at 2ed70280 of size 50 - USED block at 2ed702b2 of size 14 - USED block at 2ed702c0 of size 20 - USED block at 2ed702d4 of size 136 - USED block at 2ed7035c of size 7328 + USED block at 2f9d0016 of size 18 + USED block at 2f9d0028 of size 50 + USED block at 2f9d005a of size 50 + USED block at 2f9d008c of size 50 + USED block at 2f9d00be of size 50 + USED block at 2f9d00f0 of size 50 + USED block at 2f9d0122 of size 50 + USED block at 2f9d0154 of size 50 + USED block at 2f9d0186 of size 50 + USED block at 2f9d01b8 of size 50 + USED block at 2f9d01ea of size 50 + USED block at 2f9d021c of size 50 + USED block at 2f9d024e of size 50 + USED block at 2f9d0280 of size 50 + USED block at 2f9d02b2 of size 14 + USED block at 2f9d02c0 of size 20 + USED block at 2f9d02d4 of size 136 + USED block at 2f9d035c of size 7328 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 806 7360 -Near 3414 712 2702 +Near 5046 712 4334 Far 8166 806 7360 ---------------- -------- -------- -------- -coreleft = 2700 -farcoreleft = 1694 +coreleft = 4332 +farcoreleft = 3326 GetFreeSize = 64548 -GetNearFreeSize = 2702 +GetNearFreeSize = 4334 GetFarFreeSize = 64548 -memavl = 2700 -stackavail = 31519 +memavl = 4332 +stackavail = 31515 diff --git a/MMDUMP.16W b/MMDUMP.16W index 89ef9446..8e17e88f 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/data/g.pal b/data/g.pal index 6b992816..0f417c49 100755 Binary files a/data/g.pal and b/data/g.pal differ diff --git a/makefile b/makefile index 3a190a4f..9f53f52a 100755 --- a/makefile +++ b/makefile @@ -4,21 +4,21 @@ # # Possible optimizations for 8088 class processors # -# -oaRelax alias checking -# -obTry to generate straight line code +# -oa Relax alias checking +# -ob Try to generate straight line code # -oe - expand user functions inline (-oe=20 is default, adds lots of code) -# -ohEnable repeated optimizations -# -oigenerate certain lib funcs inline -# -oi+Set max inline depth (C++ only, use -oi for C) -# -okFlowing of register save into function flow graph -# -olloop optimizations -# -ol+loop optimizations plus unrolling -# -orReorder for pipelined (486+ procs); not sure if good to use -# -osFavor space over time -# -otFavor time over space -# -eiAllocate an "int" for all enum types -# -zp2Allow compiler to add padding to structs -# -zpwUse with above; make sure you are warning free! +# -oh Enable repeated optimizations +# -oi generate certain lib funcs inline +# -oi +Set max inline depth (C++ only, use -oi for C) +# -ok Flowing of register save into function flow graph +# -ol loop optimizations +# -ol+ loop optimizations plus unrolling +# -or Reorder for pipelined (486+ procs); not sure if good to use +# -os Favor space over time +# -ot Favor time over space +# -ei Allocate an "int" for all enum types +# -zp2 Allow compiler to add padding to structs +# -zpw Use with above; make sure you are warning free! # -0 8088/8086 class code generation # -s disable stack overflow checking @@ -106,9 +106,10 @@ LIBFLAGS=$(WLIBQ) -b -n # objects # VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ) -GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) -OLDLIBOBJS=bitmap.$(OBJ) mapread.$(OBJ) -16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ) 16_map.$(OBJ) jsmn.$(OBJ) +OLDLIBOBJS=bitmap.$(OBJ) mapread.$(OBJ) 16render.$(OBJ) +GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS) +16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) +####++++ 16_map.$(OBJ) #16planar.$(OBJ) planar.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) !ifeq DEBUGSERIAL 1 @@ -157,11 +158,11 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib TESTEXEC = & tesuto.exe & 0.exe & + scroll.exe & zcroll.exe & exmmtest.exe & vrstest.exe TESTEXEC2 = & - scroll.exe & vgmtest.exe & inputest.exe & maptest.exe & @@ -193,7 +194,7 @@ bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) # # Test Executables! # -scroll.exe: scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) $(OLDLIBOBJS) +scroll.exe: scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) scroll.$(OBJ): $(SRC)/scroll.c zcroll.exe: zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) zcroll.$(OBJ): $(SRC)/zcroll.c @@ -209,12 +210,12 @@ fonttest.exe: fonttest.$(OBJ) gfx.lib fontgfx.exe: fontgfx.$(OBJ) gfx.lib $(DOSLIBLIBS) inputest.exe: inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS) #sountest.exe: sountest.$(OBJ) $(16LIB) -pcxtest.exe: pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS) $(OLDLIBOBJS) +pcxtest.exe: pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS) vrstest.exe: vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) #vgacamm.exe: vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) palettec.exe: palettec.$(OBJ) gfx.lib $(DOSLIBLIBS) palettel.exe: palettel.$(OBJ) gfx.lib $(DOSLIBLIBS) -pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS) $(OLDLIBOBJS) +pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS) #planrpcx.exe: planrpcx.$(OBJ) gfx.lib maptest.exe: maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS) fmemtest.exe: fmemtest.$(OBJ) diff --git a/scroll.exe b/scroll.exe deleted file mode 100755 index f715e3a9..00000000 Binary files a/scroll.exe and /dev/null differ diff --git a/src/lib/16_map.h b/src/lib/16_map.h index bf87c875..90eb789b 100755 --- a/src/lib/16_map.h +++ b/src/lib/16_map.h @@ -23,11 +23,11 @@ #ifndef _16_MAP__H_ #define _16_MAP__H_ +#include "src/lib/16_head.h" #include "src/lib/jsmn/jsmn.h" //#include "stdio.h" included in 16_head.h //#include "stdlib.h" included in 16_head.h #include "src/lib/16_vl.h" -#include "src/lib/16_head.h" #include "src/lib/16_ca.h" #include "src/lib/16_mm.h" diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index 7cd0e941..a7c4d4b3 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -29,6 +29,7 @@ #include "src/lib/16_in.h" #include "src/lib/bitmap.h" #include "src/lib/mapread.h" //map is loaded here www +#include "src/lib/16render.h" //#include "src/lib/16_map.h" //new map stuff #include "src/lib/16_timer.h" #include "src/lib/wcpu/wcpu.h" diff --git a/src/scroll.c b/src/scroll.c index 86d2ff04..b512f832 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -48,7 +48,7 @@ boolean panswitch=0; //map_view_db_t pgid[4]; word pg; //#ifdef FADE - static word paloffset=0; + //static word paloffset=0; byte *dpal; //#endif byte *gpal;