diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-04-14 18:55:35 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-04-14 18:55:35 +0200 |
| commit | 0d961d31bc1bc20c599574764611e2d9124a2829 (patch) | |
| tree | 6fabb493b074133c2243b9540baca28d20afed81 | |
| parent | 9509b5850b4c2a6faead9db20445071011a6432e (diff) | |
| parent | 83e3b1ce1a3b5e89cdd76893ed24668543aeb688 (diff) | |
| download | plan9front-0d961d31bc1bc20c599574764611e2d9124a2829.tar.xz | |
merge
| -rw-r--r-- | sys/src/games/gb/audio.c | 1 | ||||
| -rw-r--r-- | sys/src/games/gb/state.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/src/games/gb/audio.c b/sys/src/games/gb/audio.c index 92356b045..09806cbed 100644 --- 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 diff --git a/sys/src/games/gb/state.c b/sys/src/games/gb/state.c index 2b2f57391..fcf22a509 100644 --- 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(); |