summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio/dragrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/audio/dragrace.c')
-rw-r--r--src/mame/audio/dragrace.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/mame/audio/dragrace.c b/src/mame/audio/dragrace.c
index d46b6f2902f..b1109c1586a 100644
--- a/src/mame/audio/dragrace.c
+++ b/src/mame/audio/dragrace.c
@@ -91,21 +91,21 @@ DISCRETE_SOUND_START(dragrace)
/* 0k = 214Hz. 250k = 4416Hz */
/* NOTE: freqs are ripped from Sprint for now. */
/************************************************/
- DISCRETE_RCFILTER(NODE_20, 1, DRAGRACE_MOTOR1_DATA, 119898, 2.2e-6)
+ DISCRETE_RCFILTER(NODE_20, DRAGRACE_MOTOR1_DATA, 119898, 2.2e-6)
DISCRETE_ADJUSTMENT_TAG(NODE_21, (214.0-27.0)/12/31, (4416.0-27.0)/12/31, DISC_LOGADJ, "MOTOR1")
DISCRETE_MULTIPLY(NODE_22, NODE_20, NODE_21)
DISCRETE_MULTADD(NODE_23, NODE_22, 2, 27.0/6) /* F1 = /12*2 = /6 */
DISCRETE_SQUAREWAVE(NODE_24, 1, NODE_23, (581.6/3), 50.0, 0, 0)
- DISCRETE_RCFILTER(NODE_25, 1, NODE_24, 10000, 1e-7)
+ DISCRETE_RCFILTER(NODE_25, NODE_24, 10000, 1e-7)
DISCRETE_MULTADD(NODE_26, NODE_22, 3, 27.0/4) /* F2 = /12*3 = /4 */
DISCRETE_SQUAREWAVE(NODE_27, 1, NODE_26, (581.6/3), 50.0, 0, 0)
- DISCRETE_RCFILTER(NODE_28, 1, NODE_27, 10000, 1e-7)
+ DISCRETE_RCFILTER(NODE_28, NODE_27, 10000, 1e-7)
DISCRETE_MULTADD(NODE_29, NODE_22, 4, 27.0/3) /* F3 = /12*4 = /3 */
DISCRETE_SQUAREWAVE(NODE_30, 1, NODE_29, (581.6/3), 100.0/3, 0, 360.0/3)
- DISCRETE_RCFILTER(NODE_31, 1, NODE_30, 10000, 1e-7)
+ DISCRETE_RCFILTER(NODE_31, NODE_30, 10000, 1e-7)
DISCRETE_ADDER3(DRAGRACE_MOTOR1_SND, DRAGRACE_MOTOR1_EN, NODE_25, NODE_28, NODE_31)
@@ -114,21 +114,21 @@ DISCRETE_SOUND_START(dragrace)
/* Car1. But I shifted the frequencies up for */
/* it to sound different from car1. */
/************************************************/
- DISCRETE_RCFILTER(NODE_40, 1, DRAGRACE_MOTOR2_DATA, 119898, 2.2e-6)
+ DISCRETE_RCFILTER(NODE_40, DRAGRACE_MOTOR2_DATA, 119898, 2.2e-6)
DISCRETE_ADJUSTMENT_TAG(NODE_41, (214.0-27.0)/12/31, (4416.0-27.0)/12/31, DISC_LOGADJ, "MOTOR2")
DISCRETE_MULTIPLY(NODE_42, NODE_40, NODE_41)
DISCRETE_MULTADD(NODE_43, NODE_42, 2, 27.0/6) /* F1 = /12*2 = /6 */
DISCRETE_SQUAREWAVE(NODE_44, 1, NODE_43, (581.6/3), 50.0, 0, 0)
- DISCRETE_RCFILTER(NODE_45, 1, NODE_44, 10000, 1e-7)
+ DISCRETE_RCFILTER(NODE_45, NODE_44, 10000, 1e-7)
DISCRETE_MULTADD(NODE_46, NODE_42, 3, 27.0/4) /* F2 = /12*3 = /4 */
DISCRETE_SQUAREWAVE(NODE_47, 1, NODE_46, (581.6/3), 50.0, 0, 0)
- DISCRETE_RCFILTER(NODE_48, 1, NODE_47, 10000, 1e-7)
+ DISCRETE_RCFILTER(NODE_48, NODE_47, 10000, 1e-7)
DISCRETE_MULTADD(NODE_49, NODE_42, 4, 27.0/3) /* F3 = /12*4 = /3 */
DISCRETE_SQUAREWAVE(NODE_50, 1, NODE_49, (581.6/3), 100.0/3, 0, 360.0/3)
- DISCRETE_RCFILTER(NODE_51, 1, NODE_50, 10000, 1e-7)
+ DISCRETE_RCFILTER(NODE_51, NODE_50, 10000, 1e-7)
DISCRETE_ADDER3(DRAGRACE_MOTOR2_SND, DRAGRACE_MOTOR2_EN, NODE_45, NODE_48, NODE_51)
@@ -144,11 +144,13 @@ DISCRETE_SOUND_START(dragrace)
DISCRETE_RAMP(NODE_61, DRAGRACE_EXPLODE1_EN, DRAGRACE_EXPLODE1_EN, (1000.0-0.0)/1, 1000.0, 0.0, 1000.0)
DISCRETE_MULTIPLY(NODE_62, DRAGRACE_NOISE, NODE_61)
- DISCRETE_RCFILTER(DRAGRACE_EXPLODE1_SND, DRAGRACE_KLEXPL1_EN, NODE_62, 1500, 2.2e-7)
-
+ DISCRETE_RCFILTER(NODE_63, NODE_62, 1500, 2.2e-7)
+ DISCRETE_MULTIPLY(DRAGRACE_EXPLODE1_SND, NODE_63, DRAGRACE_KLEXPL1_EN)
+
DISCRETE_RAMP(NODE_66, DRAGRACE_EXPLODE2_EN, DRAGRACE_EXPLODE2_EN, (1000.0-0.0)/1, 1000.0, 0.0, 1000.0)
DISCRETE_MULTIPLY(NODE_67, DRAGRACE_NOISE, NODE_66)
- DISCRETE_RCFILTER(DRAGRACE_EXPLODE2_SND, DRAGRACE_KLEXPL2_EN, NODE_67, 1500, 2.2e-7)
+ DISCRETE_RCFILTER(NODE_68, NODE_67, 1500, 2.2e-7)
+ DISCRETE_MULTIPLY(DRAGRACE_EXPLODE2_SND, NODE_68, DRAGRACE_KLEXPL2_EN)
/************************************************/
/* Skid circuits takes the noise output from */
@@ -165,7 +167,7 @@ DISCRETE_SOUND_START(dragrace)
/************************************************/
DISCRETE_INVERT(NODE_70, DRAGRACE_NOISE)
DISCRETE_MULTADD(NODE_71, NODE_70, 940.0-630.0, ((940.0-630.0)/2)+630.0)
- DISCRETE_RCFILTER(NODE_72, 1, NODE_71, 1000, 1e-5)
+ DISCRETE_RCFILTER(NODE_72, NODE_71, 1000, 1e-5)
DISCRETE_SQUAREWAVE(NODE_73, 1, NODE_72, 407.8, 31.5, 0, 0.0)
DISCRETE_ONOFF(DRAGRACE_SCREECH1_SND, DRAGRACE_SCREECH1_EN, NODE_73)
DISCRETE_ONOFF(DRAGRACE_SCREECH2_SND, DRAGRACE_SCREECH2_EN, NODE_73)