updated the copyleft wwww i am not deAD! i just been 2 busy last 6 monthes

[16.git] / src / vgmtest.c

diff --git a/src/vgmtest.c b/src/vgmtest.c
index f20327ebda00bcfc67a4de8cc7ba92f28290e97d..61b1df728c51e44263ee2f48b83fc45d0e5e9a0e 100755 (executable)
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -26,7 +26,12 @@
 #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_tail.h"\r
+#include "src/lib/16_pm.h"\r
+#include "src/lib/16_ca.h"\r
+#include "src/lib/16_mm.h"\r
+#include "src/lib/16_hc.h"\r
+#include "src/lib/16_dbg.h"\r
 \r
 void OPL2_Write(UINT8 reg, UINT8 data);\r
 UINT8 OPL2_ReadStatus(void);\r
@@ -48,25 +53,28 @@ UINT8 OPL2_ReadStatus(void)
 void\r
 main(int argc, char *argv[])\r
 {\r
-//     static global_game_variables_t gvar;\r
+       static global_game_variables_t gvar;\r
        VGM_FILE pee[9];\r
-       char *bakapee;\r
+       char bakapee[64] = "data/02.vgm";\r
 \r
-       bakapee = malloc(64);\r
-       if(argv[1]) bakapee = argv[1];\r
-       else bakapee = "data/adlib.vgm";\r
-       printf("%x\n", OpenVGMFile(bakapee, &pee[0]));\r
-//     IN_Startup(); IN_Default(0,&gvar.player,ctrl_Keyboard1);\r
+       if(argv[1]) strcpy(bakapee, argv[1]);\r
+\r
+//     MM_Startup(&gvar);\r
+//     PM_Startup(&gvar); PM_UnlockMainMem(&gvar);\r
+//     CA_Startup(&gvar);\r
+       StartupCAMMPM(&gvar);\r
+       printf("%x\n", OpenVGMFile(bakapee, &pee[0], &gvar));\r
        InitEngine();\r
        PlayMusic(&pee[0]);\r
-//     while(!IN_KeyDown(sc_Escape))\r
        while(!kbhit())\r
        {\r
-//             IN_ReadControl(0,&gvar.player);\r
                UpdateSoundEngine();\r
        }\r
        StopMusic();\r
-       FreeVGMFile(&pee[0]);\r
+       FreeVGMFile(&pee[0], &gvar); printf("ok\n");\r
        DeinitEngine();\r
-       //IN_Shutdown();\r
+//     PM_Shutdown(&gvar);\r
+//     CA_Shutdown(&gvar);\r
+//     MM_Shutdown(&gvar);\r
+       ShutdownCAMMPM(&gvar);\r
 }\r