From: sparky4 <sparky4@cock.li>
Date: Thu, 15 Dec 2016 17:45:45 +0000 (-0600)
Subject: going to look at walk today
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=22d35fc2e4df4a61e1d000c7cd59b8b253652a54;p=16.git

going to look at walk today
---

diff --git a/DEBUG.16W b/DEBUG.16W
index d4910d8a..6ba99e99 100755
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,210 +1,210 @@
-Seg:0	Size:10289	Owner:0x0
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0
-Seg:2831	Size:256	Owner:0x1630
-++++
-Seg:29f2	Size:44	Owner:0x0
+Seg:0	Size:11926	Owner:0x0
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0000
+Seg:2f8f	Size:36	Owner:0x0
 +
-Seg:2a1e	Size:256	Owner:0x1422
-++++
-Seg:2b1e	Size:256	Owner:0x1424
+Seg:2fb3	Size:256	Owner:0x1650
+++++
+Seg:30b3	Size:256	Owner:0x1442
 +++++
-Seg:2c1e	Size:256	Owner:0x1426
+Seg:31b3	Size:256	Owner:0x1444
 ++++
-Seg:2d1e	Size:256	Owner:0x1428
+Seg:32b3	Size:256	Owner:0x1446
 ++++
-Seg:2e1e	Size:256	Owner:0x142a
+Seg:33b3	Size:256	Owner:0x1448
 ++++
-Seg:2f1e	Size:256	Owner:0x142c
+Seg:34b3	Size:256	Owner:0x144a
 ++++
-Seg:301e	Size:256	Owner:0x142e
+Seg:35b3	Size:256	Owner:0x144c
 +++++
-Seg:311e	Size:256	Owner:0x1430
+Seg:36b3	Size:256	Owner:0x144e
 ++++
-Seg:321e	Size:256	Owner:0x1432
+Seg:37b3	Size:256	Owner:0x1450
 ++++
-Seg:331e	Size:256	Owner:0x1434
+Seg:38b3	Size:256	Owner:0x1452
 ++++
-Seg:341e	Size:256	Owner:0x1436
+Seg:39b3	Size:256	Owner:0x1454
 ++++
-Seg:351e	Size:256	Owner:0x1438
+Seg:3ab3	Size:256	Owner:0x1456
 +++++
-Seg:361e	Size:256	Owner:0x143a
+Seg:3bb3	Size:256	Owner:0x1458
 ++++
-Seg:371e	Size:256	Owner:0x143c
+Seg:3cb3	Size:256	Owner:0x145a
 ++++
-Seg:381e	Size:256	Owner:0x143e
+Seg:3db3	Size:256	Owner:0x145c
 ++++
-Seg:391e	Size:256	Owner:0x1440
+Seg:3eb3	Size:256	Owner:0x145e
 ++++
-Seg:3a1e	Size:256	Owner:0x1442
+Seg:3fb3	Size:256	Owner:0x1460
 +++++
-Seg:3b1e	Size:256	Owner:0x1444
+Seg:40b3	Size:256	Owner:0x1462
 ++++
-Seg:3c1e	Size:256	Owner:0x1446
+Seg:41b3	Size:256	Owner:0x1464
 ++++
-Seg:3d1e	Size:256	Owner:0x1448
+Seg:42b3	Size:256	Owner:0x1466
 ++++
-Seg:3e1e	Size:256	Owner:0x144a
+Seg:43b3	Size:256	Owner:0x1468
 ++++
-Seg:3f1e	Size:256	Owner:0x144c
+Seg:44b3	Size:256	Owner:0x146a
 +++++
-Seg:401e	Size:256	Owner:0x144e
+Seg:45b3	Size:256	Owner:0x146c
 ++++
-Seg:411e	Size:256	Owner:0x1450
+Seg:46b3	Size:256	Owner:0x146e
 ++++
-Seg:421e	Size:256	Owner:0x1452
+Seg:47b3	Size:256	Owner:0x1470
 ++++
-Seg:431e	Size:256	Owner:0x1454
+Seg:48b3	Size:256	Owner:0x1472
 ++++
-Seg:441e	Size:256	Owner:0x1456
+Seg:49b3	Size:256	Owner:0x1474
 +++++
-Seg:451e	Size:256	Owner:0x1458
+Seg:4ab3	Size:256	Owner:0x1476
 ++++
-Seg:461e	Size:256	Owner:0x145a
+Seg:4bb3	Size:256	Owner:0x1478
 ++++
-Seg:471e	Size:256	Owner:0x145c
+Seg:4cb3	Size:256	Owner:0x147a
 ++++
-Seg:481e	Size:256	Owner:0x145e
+Seg:4db3	Size:256	Owner:0x147c
 ++++
-Seg:491e	Size:256	Owner:0x1460
+Seg:4eb3	Size:256	Owner:0x147e
 +++++
-Seg:4a1e	Size:256	Owner:0x1462
+Seg:4fb3	Size:256	Owner:0x1480
 ++++
-Seg:4b1e	Size:256	Owner:0x1464
+Seg:50b3	Size:256	Owner:0x1482
 ++++
-Seg:4c1e	Size:256	Owner:0x1466
+Seg:51b3	Size:256	Owner:0x1484
 ++++
-Seg:4d1e	Size:256	Owner:0x1468
+Seg:52b3	Size:256	Owner:0x1486
 ++++
-Seg:4e1e	Size:256	Owner:0x146a
+Seg:53b3	Size:256	Owner:0x1488
 +++++
-Seg:4f1e	Size:256	Owner:0x146c
+Seg:54b3	Size:256	Owner:0x148a
 ++++
-Seg:501e	Size:256	Owner:0x146e
+Seg:55b3	Size:256	Owner:0x148c
 ++++
-Seg:511e	Size:256	Owner:0x1470
+Seg:56b3	Size:256	Owner:0x148e
 ++++
-Seg:521e	Size:256	Owner:0x1472
+Seg:57b3	Size:256	Owner:0x1490
 ++++
-Seg:531e	Size:256	Owner:0x1474
+Seg:58b3	Size:256	Owner:0x1492
 +++++
-Seg:541e	Size:256	Owner:0x1476
+Seg:59b3	Size:256	Owner:0x1494
 ++++
-Seg:551e	Size:256	Owner:0x1478
+Seg:5ab3	Size:256	Owner:0x1496
 ++++
-Seg:561e	Size:256	Owner:0x147a
+Seg:5bb3	Size:256	Owner:0x1498
 ++++
-Seg:571e	Size:256	Owner:0x147c
+Seg:5cb3	Size:256	Owner:0x149a
 ++++
-Seg:581e	Size:256	Owner:0x147e
+Seg:5db3	Size:256	Owner:0x149c
 +++++
-Seg:591e	Size:256	Owner:0x1480
+Seg:5eb3	Size:256	Owner:0x149e
 ++++
-Seg:5a1e	Size:256	Owner:0x1482
+Seg:5fb3	Size:256	Owner:0x14a0
 ++++
-Seg:5b1e	Size:256	Owner:0x1484
+Seg:60b3	Size:256	Owner:0x14a2
 ++++
-Seg:5c1e	Size:256	Owner:0x1486
+Seg:61b3	Size:256	Owner:0x14a4
 ++++
-Seg:5d1e	Size:256	Owner:0x1488
+Seg:62b3	Size:256	Owner:0x14a6
 +++++
-Seg:5e1e	Size:256	Owner:0x148a
+Seg:63b3	Size:256	Owner:0x14a8
 ++++
-Seg:5f1e	Size:256	Owner:0x148c
+Seg:64b3	Size:256	Owner:0x14aa
 ++++
-Seg:601e	Size:256	Owner:0x148e
+Seg:65b3	Size:256	Owner:0x14ac
 ++++
-Seg:611e	Size:256	Owner:0x1490
+Seg:66b3	Size:256	Owner:0x14ae
 ++++
-Seg:621e	Size:256	Owner:0x1492
+Seg:67b3	Size:256	Owner:0x14b0
 +++++
-Seg:631e	Size:256	Owner:0x1494
+Seg:68b3	Size:256	Owner:0x14b2
 ++++
-Seg:641e	Size:256	Owner:0x1496
+Seg:69b3	Size:256	Owner:0x14b4
 ++++
-Seg:651e	Size:256	Owner:0x1498
+Seg:6ab3	Size:256	Owner:0x14b6
 ++++
-Seg:661e	Size:256	Owner:0x149a
+Seg:6bb3	Size:256	Owner:0x14b8
 ++++
-Seg:671e	Size:256	Owner:0x149c
+Seg:6cb3	Size:256	Owner:0x14ba
 +++++
-Seg:681e	Size:256	Owner:0x149e
+Seg:6db3	Size:256	Owner:0x14bc
 ++++
-Seg:691e	Size:256	Owner:0x14a0
+Seg:6eb3	Size:256	Owner:0x14be
 ++++
-Seg:6a1e	Size:256	Owner:0x14a2
+Seg:6fb3	Size:256	Owner:0x14c0
 ++++
-Seg:6b1e	Size:256	Owner:0x14a4
+Seg:70b3	Size:256	Owner:0x14c2
 ++++
-Seg:6c1e	Size:256	Owner:0x14a6
+Seg:71b3	Size:256	Owner:0x14c4
 +++++
-Seg:6d1e	Size:256	Owner:0x14a8
+Seg:72b3	Size:256	Owner:0x14c6
 ++++
-Seg:6e1e	Size:256	Owner:0x14aa
+Seg:73b3	Size:256	Owner:0x14c8
 ++++
-Seg:6f1e	Size:256	Owner:0x14ac
+Seg:74b3	Size:256	Owner:0x14ca
 ++++
-Seg:701e	Size:256	Owner:0x14ae
+Seg:75b3	Size:256	Owner:0x14cc
 ++++
-Seg:711e	Size:256	Owner:0x14b0
+Seg:76b3	Size:256	Owner:0x14ce
 +++++
-Seg:721e	Size:256	Owner:0x14b2
+Seg:77b3	Size:256	Owner:0x14d0
 ++++
-Seg:731e	Size:256	Owner:0x14b4
+Seg:78b3	Size:256	Owner:0x14d2
 ++++
-Seg:741e	Size:256	Owner:0x14b6
+Seg:79b3	Size:256	Owner:0x14d4
 ++++
-Seg:751e	Size:256	Owner:0x14b8
+Seg:7ab3	Size:256	Owner:0x14d6
 ++++
-Seg:761e	Size:256	Owner:0x14ba
+Seg:7bb3	Size:256	Owner:0x14d8
 +++++
-Seg:771e	Size:256	Owner:0x14bc
+Seg:7cb3	Size:256	Owner:0x14da
 ++++
-Seg:781e	Size:256	Owner:0x14be
+Seg:7db3	Size:256	Owner:0x14dc
 ++++
-Seg:791e	Size:256	Owner:0x14c0
+Seg:7eb3	Size:256	Owner:0x14de
 ++++
-Seg:7a1e	Size:256	Owner:0x14c2
+Seg:7fb3	Size:256	Owner:0x14e0
 ++++
-Seg:7b1e	Size:256	Owner:0x14c4
+Seg:80b3	Size:256	Owner:0x14e2
 +++++
-Seg:7c1e	Size:256	Owner:0x14c6
+Seg:81b3	Size:256	Owner:0x14e4
 ++++
-Seg:7d1e	Size:256	Owner:0x14c8
+Seg:82b3	Size:256	Owner:0x14e6
 ++++
-Seg:7e1e	Size:256	Owner:0x14ca
+Seg:83b3	Size:256	Owner:0x14e8
 ++++
-Seg:7f1e	Size:256	Owner:0x14cc
+Seg:84b3	Size:256	Owner:0x14ea
 ++++
-Seg:801e	Size:256	Owner:0x14ce
+Seg:85b3	Size:256	Owner:0x14ec
 +++++
-Seg:811e	Size:256	Owner:0x14d0
+Seg:86b3	Size:256	Owner:0x14ee
 ++++
-Seg:821e	Size:256	Owner:0x14d2
+Seg:87b3	Size:256	Owner:0x14f0
 ++++
-Seg:831e	Size:256	Owner:0x14d4
+Seg:88b3	Size:256	Owner:0x14f2
 ++++
-Seg:841e	Size:256	Owner:0x14d6
+Seg:89b3	Size:256	Owner:0x14f4
 ++++
-Seg:851e	Size:256	Owner:0x14d8
+Seg:8ab3	Size:256	Owner:0x14f6
 +++++
-Seg:861e	Size:256	Owner:0x14da
+Seg:8bb3	Size:256	Owner:0x14f8
 ++++
-Seg:871e	Size:256	Owner:0x14dc
+Seg:8cb3	Size:256	Owner:0x14fa
 ++++
-Seg:881e	Size:256	Owner:0x14de
+Seg:8db3	Size:256	Owner:0x14fc
 ++++
-Seg:891e	Size:256	Owner:0x14e0
+Seg:8eb3	Size:256	Owner:0x14fe
 ++++
-Seg:8a1e	Size:256	Owner:0x14e2
+Seg:8fb3	Size:256	Owner:0x1500
 +++++
-Seg:8b1e	Size:256	Owner:0x14e4
+Seg:90b3	Size:256	Owner:0x1502
+++++
+Seg:91b3	Size:256	Owner:0x1504
 ++++
-Seg:8c1e	Size:256	Owner:0x14e6
+Seg:92b3	Size:256	Owner:0x1506
 ++++
-Seg:8d1e	Size:256	Owner:0x14e8
+Seg:93b3	Size:256	Owner:0x1508
 ++++
-Seg:8e1e	Size:273	Owner:0xded0
-+++++
-Seg:ba1e	Size:17889	Owner:0x0
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
+Seg:94b3	Size:401	Owner:0xec14
+++++++
+Seg:bfb3	Size:16460	Owner:0x0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
diff --git a/HEAP.16W b/HEAP.16W
index 8d23bba9..5017b7e6 100755
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,47 +1,71 @@
 
 	== default ==
 
-  USED block at 2a140016 of size 66
-  USED block at 2a140058 of size 66
-  FREE block at 2a14009a of size 18
-  USED block at 2a1400ac of size 136
-  USED block at 2a140134 of size 20
-  FREE block at 2a140148 of size 7860
+  FREE block at 2fb10016 of size 18
+  USED block at 2fb10028 of size 50
+  USED block at 2fb1005a of size 50
+  USED block at 2fb1008c of size 50
+  USED block at 2fb100be of size 50
+  USED block at 2fb100f0 of size 50
+  USED block at 2fb10122 of size 50
+  USED block at 2fb10154 of size 50
+  USED block at 2fb10186 of size 50
+  USED block at 2fb101b8 of size 50
+  USED block at 2fb101ea of size 50
+  USED block at 2fb1021c of size 50
+  USED block at 2fb1024e of size 50
+  USED block at 2fb10280 of size 50
+  FREE block at 2fb102b2 of size 14
+  USED block at 2fb102c0 of size 20
+  USED block at 2fb102d4 of size 136
+  FREE block at 2fb1035c of size 7328
 OK - end of heap
 
 	== near ==
 
-  USED block at 1a13df06 of size 12
-  USED block at 1a13df12 of size 530
-  USED block at 1a13e124 of size 72
-  USED block at 1a13e16c of size 20
-  USED block at 1a13e180 of size 20
-  USED block at 1a13e194 of size 20
-  USED block at 1a13e1a8 of size 20
-  USED block at 1a13e1bc of size 20
-  USED block at 1a13e1d0 of size 7724
+  USED block at 1fb0ec66 of size 12
+  USED block at 1fb0ec72 of size 330
+  USED block at 1fb0edbc of size 52
+  USED block at 1fb0edf0 of size 20
+  USED block at 1fb0ee04 of size 20
+  USED block at 1fb0ee18 of size 20
+  USED block at 1fb0ee2c of size 20
+  USED block at 1fb0ee40 of size 20
+  USED block at 1fb0ee54 of size 4520
 OK - end of heap
 
 	== far ==
 
-  USED block at 2a140016 of size 66
-  USED block at 2a140058 of size 66
-  USED block at 2a14009a of size 18
-  USED block at 2a1400ac of size 136
-  USED block at 2a140134 of size 20
-  USED block at 2a140148 of size 7860
+  USED block at 2fb10016 of size 18
+  USED block at 2fb10028 of size 50
+  USED block at 2fb1005a of size 50
+  USED block at 2fb1008c of size 50
+  USED block at 2fb100be of size 50
+  USED block at 2fb100f0 of size 50
+  USED block at 2fb10122 of size 50
+  USED block at 2fb10154 of size 50
+  USED block at 2fb10186 of size 50
+  USED block at 2fb101b8 of size 50
+  USED block at 2fb101ea of size 50
+  USED block at 2fb1021c of size 50
+  USED block at 2fb1024e of size 50
+  USED block at 2fb10280 of size 50
+  USED block at 2fb102b2 of size 14
+  USED block at 2fb102c0 of size 20
+  USED block at 2fb102d4 of size 136
+  USED block at 2fb1035c of size 7328
 OK - end of heap
 
 Memory Type         Total      Used       Free
 ----------------  --------   --------   --------
-Default		   8166		288	  7878
-Near		   8438		714	  7724
-Far		   8166		288	  7878
+Default		   8166		806	  7360
+Near		   5014		494	  4520
+Far		   8166		806	  7360
 ----------------  --------   --------   --------
-coreleft = 7722
-farcoreleft = 23624
-GetFreeSize = 15920
-GetNearFreeSize = 7724
-GetFarFreeSize = 15920
-memavl = 7722
-stackavail = 31588
+coreleft = 4518
+farcoreleft = 3512
+GetFreeSize = 64548
+GetNearFreeSize = 4520
+GetFarFreeSize = 64548
+memavl = 4518
+stackavail = 31515
diff --git a/MMDUMP.16W b/MMDUMP.16W
index 7cff2845..26fdaba1 100755
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ
diff --git a/makefile b/makefile
index 7e80e902..bef5b676 100755
--- a/makefile
+++ b/makefile
@@ -107,7 +107,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
-GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) 16_scr.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
+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) mapread.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
@@ -291,7 +291,7 @@ bakapee.$(OBJ):$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
 16_sprit.$(OBJ):$(SRCLIB)/16_sprit.c $(SRCLIB)/16_sprit.h
 bitmap.$(OBJ):	$(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h
 planar.$(OBJ):	$(SRCLIB)/planar.c $(SRCLIB)/planar.h
-16_scr.$(OBJ):$(SRCLIB)/16_scr.c $(SRCLIB)/16_scr.h
+scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
 16text.$(OBJ):	$(SRCLIB)/16text.c
 mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
diff --git a/src/16.h b/src/16.h
index e8dcbf74..24f180ac 100755
--- a/src/16.h
+++ b/src/16.h
@@ -27,7 +27,7 @@
 #include "src/lib/16_tail.h"
 #include "src/lib/16_vl.h"
 #include "src/lib/wcpu/wcpu.h"
-#include "src/lib/16_scr.h"
+#include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/16_dbg.h"
 
diff --git a/src/lib/16_scr.c b/src/lib/scroll16.c
similarity index 97%
rename from src/lib/16_scr.c
rename to src/lib/scroll16.c
index 61e997af..b0c9d3c7 100755
--- a/src/lib/16_scr.c
+++ b/src/lib/scroll16.c
@@ -22,14 +22,10 @@
 /*
 	scroll16 library~
 */
-#include "src/lib/16_scr.h"
+#include "src/lib/scroll16.h"
 
 void walk(map_view_t *pip, player_t *player, word pn)
 {
-//			modexLeave();
-//			IN_Shutdown();
-//			exit(-5);
-
 	#define INC_PER_FRAME if(player[pn].q&1) player[pn].persist_aniframe++; if(player[pn].persist_aniframe>4) player[pn].persist_aniframe = 1;
 	//printf("player[%d].d=%d\n", pn, player[pn].d);
 	switch(player[pn].d)
diff --git a/src/lib/16_scr.h b/src/lib/scroll16.h
similarity index 100%
rename from src/lib/16_scr.h
rename to src/lib/scroll16.h
diff --git a/src/scroll.c b/src/scroll.c
index 41251258..776c3a16 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "src/lib/16_scr.h"
+#include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 #include "src/lib/16_dbg.h"
diff --git a/src/test.c b/src/test.c
index fe7b401f..363047f2 100755
--- a/src/test.c
+++ b/src/test.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "src/lib/16_vl.h"
 #include "src/lib/16_in.h"
-#include "src/lib/16_scr.h"
+#include "src/lib/scroll16.h"
 #include "src/lib/bakapee.h"
 
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
diff --git a/src/zcroll.c b/src/zcroll.c
index 65300e91..32342529 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "src/lib/16_scr.h"
+#include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 #include "src/lib/16render.h"
@@ -154,8 +154,8 @@ void main(int argc, char *argv[])
 		//player movement
 		IN_ReadControl(0, &player);
 		if(!panswitch){
-			ZC_walk(player[0].ent, mv);
-			//walk(mv, &player, 0);
+			//ZC_walk(player[0].ent, mv);
+			walk(mv, &player, 0);
 		}
 
 		//the scripting stuff....