X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=61b1df728c51e44263ee2f48b83fc45d0e5e9a0e;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=ef8d242d743a8d57acc747286da42f38a2dd28d1;hpb=5b7cb93f7c6a5a008302efff5f68023005a4daaf;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index ef8d242d..61b1df72 100755
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -24,9 +24,8 @@
  */
 
 #include "src/lib/vgmsnd/vgmSnd.h"
-#include "src/lib/16_sd.h"
+#include "src/lib/16_snd.h"
 //#include "src/lib/doslib/adlib.h"
-#include "src/lib/16_in.h"
 #include "src/lib/16_tail.h"
 #include "src/lib/16_pm.h"
 #include "src/lib/16_ca.h"
@@ -56,28 +55,26 @@ main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
 	VGM_FILE pee[9];
-	char bakapee[64] = "data/adlib.vgm";
+	char bakapee[64] = "data/02.vgm";
 
 	if(argv[1]) strcpy(bakapee, argv[1]);
 
-	MM_Startup(&gvar);
-//	PM_Startup(&gvar); PM_CheckMainMem(&gvar); PM_UnlockMainMem(&gvar);
+//	MM_Startup(&gvar);
+//	PM_Startup(&gvar); PM_UnlockMainMem(&gvar);
 //	CA_Startup(&gvar);
+	StartupCAMMPM(&gvar);
 	printf("%x\n", OpenVGMFile(bakapee, &pee[0], &gvar));
-//	IN_Startup(); IN_Default(0,&gvar.player[0],ctrl_Keyboard1);
 	InitEngine();
 	PlayMusic(&pee[0]);
-//	while(!IN_KeyDown(sc_Escape))
 	while(!kbhit())
 	{
-//		IN_ReadControl(0,&gvar.player);
 		UpdateSoundEngine();
 	}
 	StopMusic();
-	FreeVGMFile(&pee[0], &gvar);
+	FreeVGMFile(&pee[0], &gvar); printf("ok\n");
 	DeinitEngine();
-	//IN_Shutdown();
 //	PM_Shutdown(&gvar);
 //	CA_Shutdown(&gvar);
-	MM_Shutdown(&gvar);
+//	MM_Shutdown(&gvar);
+	ShutdownCAMMPM(&gvar);
 }