X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=b86eaa7bffb9ef495b4387e33c5a48739539ee1f;hb=7c35eb648613504ac47e5605d79f93112f569134;hp=18374d332278542c339ff279fa62dd757904f5ba;hpb=f009ec12d9457ca66da97edce8389bda4319d1db;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 18374d33..b86eaa7b 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-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -35,37 +35,33 @@ void OPL2_Write(UINT8 reg, UINT8 data)
 {
 	//ym3812_w(0, 0, reg);
 	//ym3812_w(0, 1, data);
-	opl2out(reg, data);
-	//adlib_write((word) reg,(byte)data);
+	opl2out((word)reg, (word)data);
 	return;
 }
 
 UINT8 OPL2_ReadStatus(void)
 {
 	return(inp(ADLIB_FM_ADDRESS));
-	//return (UINT8)adlib_read(0);
 	//return ym3812_r(0, 0);
 }
 
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
+	//++++global_game_variables_t gvar;
 	VGM_FILE pee[9];
 	player_t player[MaxPlayers];
+	char *bakapee;
 
-	//opl2out(0x105, 0x00);
-	/*if(!init_adlib())
-	{
-		printf("Cannot init library\n");
-		exit(-5);
-	}*/
-	printf("%x\n", OpenVGMFile("data/0.vgm", &pee[0]));
-	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
+	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();
 	PlayMusic(&pee[0]);
-	while(!IN_KeyDown(sc_Escape))
+	//while(!IN_KeyDown(sc_Escape))
+	while(!kbhit())
 	{
 		IN_ReadControl(0,&player);
 		UpdateSoundEngine();
@@ -73,6 +69,5 @@ main(int argc, char *argv[])
 	StopMusic();
 	FreeVGMFile(&pee[0]);
 	DeinitEngine();
-	//shutdown_adlib();
-	IN_Shutdown();
+	//IN_Shutdown();
 }