wtf?!?!

	new file:   DEBUG.16W
	new file:   HEAP.16W
	new file:   MMDUMP.16W
	new file:   PROFILE.16W
	modified:   makefile
	modified:   src/vgmtest.c
	modified:   vgmtest.exe

diff --git a/DEBUG.16W b/DEBUG.16W
new file mode 100755 (executable)
index 0000000..2981998
--- /dev/null
+++ b/DEBUG.16W
@@ -0,0 +1,17 @@
+\e[0mSeg:0      Size:5153       Owner:0xec\r
+\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m0\r
+\e[0m\e[0mSeg:1421       Size:256        Owner:0x451c\r
+\e[44;34m++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m\r
+\e[0m\e[0mSeg:1521       Size:273        Owner:0x858c\r
+\e[44;34m+++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m\r
+\e[0m\e[0mSeg:1b88       Size:40 Owner:0x0\r
+\e[41;31m+\e[0m\e[47;37m_\e[0m\r
+\e[42;32m00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0m\e[0mSeg:abb0       Size:13392      Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m\r
+\e[0m\e[0mSeg:e000       Size:8191       Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
new file mode 100755 (executable)
index 0000000..6c8a34a
--- /dev/null
+++ b/HEAP.16W
@@ -0,0 +1,45 @@
+\r
+       == default ==\r
+\r
+  USED block at 1baa0016 of size 66\r
+  FREE block at 1baa0058 of size 18\r
+  USED block at 1baa006a of size 136\r
+  USED block at 1baa00f2 of size 20\r
+  FREE block at 1baa0106 of size 7926\r
+OK - end of heap\r
+\r
+       == near ==\r
+\r
+  USED block at ba985b6 of size 12\r
+  USED block at ba985c2 of size 294\r
+  USED block at ba986e8 of size 42\r
+  USED block at ba98712 of size 20\r
+  USED block at ba98726 of size 20\r
+  USED block at ba9873a of size 20\r
+  USED block at ba9874e of size 20\r
+  USED block at ba98762 of size 20\r
+  USED block at ba98776 of size 30854\r
+OK - end of heap\r
+\r
+       == far ==\r
+\r
+  USED block at 1baa0016 of size 66\r
+  USED block at 1baa0058 of size 18\r
+  USED block at 1baa006a of size 136\r
+  USED block at 1baa00f2 of size 20\r
+  USED block at 1baa0106 of size 7926\r
+OK - end of heap\r
+\r
+Memory Type         Total      Used       Free\r
+----------------  --------   --------   --------\r
+Default                   8166         222       7944\r
+Near              31302        448       30854\r
+Far               8166         222       7944\r
+----------------  --------   --------   --------\r
+coreleft = 30852\r
+farcoreleft = 46792\r
+GetFreeSize = 15960\r
+GetNearFreeSize = 30854\r
+GetFarFreeSize = 15960\r
+memavl = 30852\r
+stackavail = 15126\r

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

diff --git a/PROFILE.16W b/PROFILE.16W
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/makefile b/makefile
index 7590c364e920a1e440005b5db7a50797ac77d131..ff593e97192a54bc61613104e26d8ce4e1c710e2 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -129,8 +129,8 @@ fmemtest.exe: fmemtest.$(OBJ) 16.lib
 exmmtest.exe: exmmtest.$(OBJ) 16.lib
        wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map
 
-vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib
-       wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map
+vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib 16.lib
+       wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map 16.lib
        #====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map
 
 

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 1f5deeaffcf5c4008c133ebd30bca7a118a450e2..a4e5f7270496ba96597c2ff085cd30fb07a532a8 100755 (executable)
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -26,7 +26,7 @@
 #include "src/lib/vgmsnd/vgmSnd.h"\r
 #include "src/lib/16_snd.h"\r
 //#include "src/lib/doslib/adlib.h"\r
-//#include "src/lib/16_in.h"\r
+#include "src/lib/16_in.h"\r
 \r
 void OPL2_Write(UINT8 reg, UINT8 data);\r
 UINT8 OPL2_ReadStatus(void);\r
@@ -48,27 +48,27 @@ UINT8 OPL2_ReadStatus(void)
 void\r
 main(int argc, char *argv[])\r
 {\r
-       //global_game_variables_t gvar;\r
+       global_game_variables_t gvar;\r
        VGM_FILE pee[9];\r
-       //player_t player[MaxPlayers];\r
+       player_t player[MaxPlayers];\r
        char *bakapee;\r
 \r
        bakapee = malloc(64);\r
        if(argv[1]) bakapee = argv[1];\r
        else bakapee = "data/0.vgm";\r
        printf("%x\n", OpenVGMFile(bakapee, &pee[0]));\r
-       //IN_Startup();\r
-       //IN_Default(0,&player,ctrl_Joystick);\r
+       IN_Startup();\r
+       IN_Default(0,&player,ctrl_Joystick);\r
        InitEngine();\r
        PlayMusic(&pee[0]);\r
-       //while(!IN_KeyDown(sc_Escape))\r
-       while(!kbhit())\r
+       while(!IN_KeyDown(sc_Escape))\r
+       //while(!kbhit())\r
        {\r
-               //IN_ReadControl(0,&player);\r
+               IN_ReadControl(0,&player);\r
                UpdateSoundEngine();\r
        }\r
        StopMusic();\r
        FreeVGMFile(&pee[0]);\r
-       //IN_Shutdown();\r
+       IN_Shutdown();\r
        DeinitEngine();\r
 }\r

diff --git a/vgmtest.exe b/vgmtest.exe
index 5a8ecc5ac133333c3fb336dd9ceb2c2fcdcec8f4..72836e541e9e69a591c3a2d26c4440dfb9630469 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ