{
int i;
+
+#if 0
+
/* initialize local setup */
setup.sound_on = TRUE;
setup.sound_loops_on = FALSE;
setup.quick_doors = FALSE;
for (i=0; i<MAX_PLAYERS; i++)
{
- setup.joy_input[i].use_joystick = FALSE;
- setup.joy_input[i].joystick_nr = i;
- setup.joy_input[i].button_snap = JOY_BUTTON_1;
- setup.joy_input[i].button_bomb = JOY_BUTTON_2;
- setup.key_input[i].left = DEFAULT_KEY_LEFT;
- setup.key_input[i].right = DEFAULT_KEY_RIGHT;
- setup.key_input[i].up = DEFAULT_KEY_UP;
- setup.key_input[i].down = DEFAULT_KEY_DOWN;
- setup.key_input[i].snap = DEFAULT_KEY_SNAP;
- setup.key_input[i].bomb = DEFAULT_KEY_BOMB;
+ setup.input[i].use_joystick = FALSE;
+ setup.input[i].joystick_nr = 0;
+ setup.input[i].joy.snap = (i == 0 ? JOY_BUTTON_1 : 0);
+ setup.input[i].joy.bomb = (i == 0 ? JOY_BUTTON_2 : 0);
+ setup.input[i].key.left = (i == 0 ? DEFAULT_KEY_LEFT : KEY_UNDEFINDED);
+ setup.input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED);
+ setup.input[i].key.up = (i == 0 ? DEFAULT_KEY_UP : KEY_UNDEFINDED);
+ setup.input[i].key.down = (i == 0 ? DEFAULT_KEY_DOWN : KEY_UNDEFINDED);
+ setup.input[i].key.snap = (i == 0 ? DEFAULT_KEY_SNAP : KEY_UNDEFINDED);
+ setup.input[i].key.bomb = (i == 0 ? DEFAULT_KEY_BOMB : KEY_UNDEFINDED);
}
+#endif
+
+
+
/* choose default local player */
local_player = &stored_player[0];
if (!LoadLevelInfo()) /* global level info */
Error(ERR_EXIT, NULL);
+
+ LoadSetup(); /* global setup info */
+ LoadLevelSetup(); /* info about last played level */
+
+
+#if 0
LoadPlayerInfo(PLAYER_SETUP); /* global setup info */
LoadPlayerInfo(PLAYER_LEVEL); /* level specific info */
+#endif
+
+#if 0
/* after LoadPlayerInfo(), because it overwrites 'local_player' */
+#endif
for (i=0; i<MAX_PLAYERS; i++)
{
stored_player[i].connected = FALSE;
#ifndef MSDOS
if (access(sound_device_name,W_OK)<0)
{
- Error(ERR_RETURN, "cannot access sound device - no sounds");
+ Error(ERR_WARN, "cannot access sound device - no sounds");
sound_status = SOUND_OFF;
return;
}
if ((sound_device = open(sound_device_name,O_WRONLY))<0)
{
- Error(ERR_RETURN, "cannot open sound device - no sounds");
+ Error(ERR_WARN, "cannot open sound device - no sounds");
sound_status = SOUND_OFF;
return;
}
#ifdef VOXWARE
sound_loops_allowed = TRUE;
+
+ /*
setup.sound_loops_on = TRUE;
+ */
+
#endif
#else
sound_loops_allowed = TRUE;
+
+ /*
setup.sound_loops_on = TRUE;
+ */
+
#endif
for(i=0; i<NUM_SOUNDS; i++)
#ifndef MSDOS
if (pipe(sound_pipe)<0)
{
- Error(ERR_RETURN, "cannot create pipe - no sounds");
+ Error(ERR_WARN, "cannot create pipe - no sounds");
sound_status = SOUND_OFF;
return;
}
if ((sound_process_id = fork()) < 0)
{
- Error(ERR_RETURN, "cannot create sound server process - no sounds");
+ Error(ERR_WARN, "cannot create sound server process - no sounds");
sound_status = SOUND_OFF;
return;
}
void InitJoystick()
{
- int joystick_nr = setup.joy_input[0].joystick_nr;
+ int joystick_nr = setup.input[0].joystick_nr;
if (global_joystick_status == JOYSTICK_OFF)
return;
#ifndef MSDOS
if (access(joystick_device_name[joystick_nr], R_OK) < 0)
{
- Error(ERR_RETURN, "cannot access joystick device '%s'",
+ Error(ERR_WARN, "cannot access joystick device '%s'",
joystick_device_name[joystick_nr]);
joystick_status = JOYSTICK_OFF;
return;
if ((joystick_device =
open(joystick_device_name[joystick_nr], O_RDONLY)) < 0)
{
- Error(ERR_RETURN, "cannot open joystick device '%s'",
+ Error(ERR_WARN, "cannot open joystick device '%s'",
joystick_device_name[joystick_nr]);
joystick_status = JOYSTICK_OFF;
return;