--- np2/sound/psggeng.c	2003/10/16 17:58:05	1.1.1.1
+++ np2/sound/psggeng.c	2003/10/22 14:13:25	1.3
@@ -19,7 +19,14 @@ void SOUNDCALL psggen_getpcm(PSGGEN psg,
 	UINT	i;
 	UINT	noise;
 
-	while(count--) {
+	if ((psg->mixer & 0x3f) == 0) {
+		count = min(count, psg->puchicount);
+		psg->puchicount -= count;
+	}
+	if (count == 0) {
+		return;
+	}
+	do {
 		noisevol = 0;
 		if (psg->envcnt) {
 			psg->envcnt--;
@@ -51,7 +58,7 @@ void SOUNDCALL psggen_getpcm(PSGGEN psg,
 				countbak = psg->noise.count;
 				psg->noise.count -= psg->noise.freq;
 				if (psg->noise.count > countbak) {
-					psg->noise.base = rand() & (1 << (1 << PSGADDEDBIT));
+					psg->noise.base = GETRAND() & (1 << (1 << PSGADDEDBIT));
 				}
 				noisetbl += psg->noise.base;
 				noisetbl >>= 1;
@@ -68,7 +75,7 @@ void SOUNDCALL psggen_getpcm(PSGGEN psg,
 					case 0:							// no mix
 						if (tone->puchi) {
 							tone->puchi--;
-							samp += vol;
+							samp += vol << PSGADDEDBIT;
 						}
 						break;
 
@@ -107,6 +114,6 @@ void SOUNDCALL psggen_getpcm(PSGGEN psg,
 		pcm[0] += samp;
 		pcm[1] += samp;
 		pcm += 2;
-	}
+	} while(--count);
 }