merge

2012-04-14 18:55:35 +02:00 · 2012-04-14 18:55:35 +02:00 · 0d961d31bc
parent 9509b5850b 83e3b1ce1a
commit 0d961d31bc
2 changed files with 2 additions and 0 deletions
--- a/sys/src/games/gb/audio.c
+++ b/sys/src/games/gb/audio.c
@ -170,6 +170,7 @@ dosample(short *smp)
 		ch4sr |= k;
 		ch4c = 0;
 	}
+	ch4c++;
 	if(ch4sr & 1)
 		ch4s = -1;
 	else
--- a/sys/src/games/gb/state.c
+++ b/sys/src/games/gb/state.c
@ -81,6 +81,7 @@ loadstate(char *file)
 	clock = get32();
 	ppuclock = get32();
 	divclock = get32();
+	timerclock = get32();
 	timerfreq = get32();
 	timer = get32();
 	rombank = get32();