Merge pull request #591 from paulscottrobson/sfx

Simple SFX improvements

basic/test.bsc

@@ -1,4 +1,4 @@
-noise 1,210,100
+sfx 0,7
 end
 
 proc snd(ch,fq,ms,sl,ty,v)

firmware/common/scripts/sfx.py

@@ -24,18 +24,12 @@ def __init__(self):
 	def translate(self,sfx):							
 		if sfx[0].startswith("EXPL"):
 			tSample = 1
-			xlat = []
-			for i in range(0,int(sfx[0][4:]) // (tSample+1)):
-				xlat.append(random.randint(0,500)+200)
-				xlat.append(tSample)
+			xlat = [ 0xFFFE,int(sfx[0][4:]) ]
 
 		elif sfx[0].startswith("LAS"):
 			tSample = 1
-			xlat = []
-			length = int(sfx[0][3:]) // (tSample+1)
-			for i in range(0,length):
-				xlat.append(600-400*i // length)
-				xlat.append(tSample)
+			xlat = [ 0xFFFD, int(sfx[0][3:])]
+
 		else:
 			sfx = sfx[1:]
 			xlat = []

firmware/common/sources/interface/sfxmanager.cpp

@@ -27,8 +27,19 @@ uint8_t SFXPlay(int channelID,int effect) {
 	const uint16_t *notes = sfxData[effect];  									// List to queue
 	while (*notes != 0xFFFF) {   												// Queue them
 		SOUND_UPDATE u;
-		u.frequency = notes[0];u.timeCS = notes[1];u.slide = 0;
-		SNDPlay(channelID,&u);
+		u.timeCS = notes[1];u.slide = 0;u.volume = 100;u.type = 0;
+		switch(notes[0]) {
+			case 0xFFFE:
+				u.frequency = 100;u.type = 1;
+				break;
+			case 0xFFFD:
+				u.frequency = 200;u.type = 1;u.slide = 40;	
+				break;
+			default:
+				u.frequency = notes[0];
+				break;
+		}
+		SNDPlay(channelID,&u);		
 		notes += 2;
 	}
 	return 0;