X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=49752222de381b0f9ec6f1f10c8ced6226562451;hb=535f618e80aa6546e61907026b2451e123655a5b;hp=f1893ca69332bbe7cb740e4faf9640ce4f37bb36;hpb=e10c363a3823520d71a8279f618f04d45c2615df;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index f1893ca6..49752222 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
  *
  * This file is part of Project 16.
  *
@@ -28,18 +28,18 @@
 //#include "src/lib/doslib/adlib.h"
 #include "src/lib/16_in.h"
 
-void OPL2_Write(byte reg, byte data);
-byte OPL2_ReadStatus(void);
+void OPL2_Write(UINT8 reg, UINT8 data);
+UINT8 OPL2_ReadStatus(void);
 
-void OPL2_Write(byte reg, byte data)
+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;
 }
 
-byte OPL2_ReadStatus(void)
+UINT8 OPL2_ReadStatus(void)
 {
 	return(inp(ADLIB_FM_ADDRESS));
 	//return ym3812_r(0, 0);
@@ -55,21 +55,20 @@ main(int argc, char *argv[])
 
 	bakapee = malloc(64);
 	if(argv[1]) bakapee = argv[1];
-	else bakapee = "data/0.vgm";
+	else bakapee = "data/adlib.vgm";
 	printf("%x\n", OpenVGMFile(bakapee, &pee[0]));
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
 	InitEngine();
 	PlayMusic(&pee[0]);
 	while(!IN_KeyDown(sc_Escape))
-	//while(!getch())
+	//while(!kbhit())
 	{
 		IN_ReadControl(0,&player);
 		UpdateSoundEngine();
 	}
 	StopMusic();
 	FreeVGMFile(&pee[0]);
-	//IN_Shutdown();
-	DeinitEngine();
 	IN_Shutdown();
+	DeinitEngine();
 }