X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=3aa5cd0ceaef7d22111195874eb1b2e9775241d3;hb=da91d7bf4f1cb7511a382d30023afdb8b8e620ab;hp=50d123de6b94c564ade9db4f3681bd2fb47d485e;hpb=f434fa2fbec3919b0ceaab9e66fbe7ee1973a505;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 50d123de..3aa5cd0c 100755
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -25,6 +25,7 @@
 
 #include "src/lib/vgmsnd/vgmSnd.h"
 #include "src/lib/16_snd.h"
+//#include "src/lib/doslib/adlib.h"
 #include "src/lib/16_in.h"
 
 void OPL2_Write(UINT8 reg, UINT8 data);
@@ -34,7 +35,7 @@ void OPL2_Write(UINT8 reg, UINT8 data)
 {
 	//ym3812_w(0, 0, reg);
 	//ym3812_w(0, 1, data);
-	opl2out(reg, data);
+	opl2out((word)reg, (word)data);
 	return;
 }
 
@@ -47,22 +48,26 @@ UINT8 OPL2_ReadStatus(void)
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
-	VGM_FILE pee;
+	//++++global_game_variables_t gvar;
+	VGM_FILE pee[9];
 	player_t player[MaxPlayers];
+	char *bakapee;
 
+	bakapee = malloc(64);
+	if(argv[1]) bakapee = argv[1];
+	else bakapee = "data/adlib.vgm";
+	printf("%x\n", OpenVGMFile(bakapee, &pee[0]));
+	//IN_Startup(); IN_Default(0,&player,ctrl_Keyboard1);
 	InitEngine();
-	OpenVGMFile("data/0.vgm", &pee);
-	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
-	while(!IN_KeyDown(sc_Escape))
+	PlayMusic(&pee[0]);
+	//while(!IN_KeyDown(sc_Escape))
+	while(!kbhit())
 	{
-		PlayMusic(&pee);
 		IN_ReadControl(0,&player);
-		//UpdateSoundEngine();
+		UpdateSoundEngine();
 	}
 	StopMusic();
-	FreeVGMFile(&pee);
+	FreeVGMFile(&pee[0]);
 	DeinitEngine();
-	IN_Shutdown();
+	//IN_Shutdown();
 }