- sound_on = sound_simple_on = SETUP_SOUND_ON(local_player->setup);
- sound_loops_on = SETUP_SOUND_LOOPS_ON(local_player->setup);
- sound_music_on = SETUP_SOUND_MUSIC_ON(local_player->setup);
- toons_on = SETUP_TOONS_ON(local_player->setup);
- direct_draw_on = SETUP_DIRECT_DRAW_ON(local_player->setup);
- fading_on = SETUP_FADING_ON(local_player->setup);
- autorecord_on = SETUP_AUTO_RECORD_ON(local_player->setup);
- joystick_nr = SETUP_2ND_JOYSTICK_ON(local_player->setup);
- quick_doors = SETUP_QUICK_DOORS_ON(local_player->setup);
- scroll_delay_on = SETUP_SCROLL_DELAY_ON(local_player->setup);
- soft_scrolling_on = SETUP_SOFT_SCROLL_ON(local_player->setup);
+ setup.sound_simple_on = setup.sound_on;
+
+
+#if 0
+ setup.sound_on = setup.sound_simple_on = SETUP_SOUND_ON(local_player->setup);
+ setup.sound_loops_on = SETUP_SOUND_LOOPS_ON(local_player->setup);
+ setup.sound_music_on = SETUP_SOUND_MUSIC_ON(local_player->setup);
+ setup.toons_on = SETUP_TOONS_ON(local_player->setup);
+ setup.direct_draw_on = SETUP_DIRECT_DRAW_ON(local_player->setup);
+ setup.fading_on = SETUP_FADING_ON(local_player->setup);
+ setup.autorecord_on = SETUP_AUTO_RECORD_ON(local_player->setup);
+
+#if 0
+ setup.joystick_nr = SETUP_2ND_JOYSTICK_ON(local_player->setup);
+#endif
+
+ setup.input[0].joystick_nr = SETUP_2ND_JOYSTICK_ON(local_player->setup);
+
+ setup.quick_doors = SETUP_QUICK_DOORS_ON(local_player->setup);
+ setup.scroll_delay_on = SETUP_SCROLL_DELAY_ON(local_player->setup);
+ setup.soft_scrolling_on = SETUP_SOFT_SCROLL_ON(local_player->setup);