void GetPlayerConfig()
{
- int old_joystick_nr = setup.joy_input[0].joystick_nr;
+ int old_joystick_nr = setup.input[0].joystick_nr;
+
+ if (sound_status == SOUND_OFF)
+ setup.sound_on = FALSE;
- if (sound_status==SOUND_OFF)
- local_player->setup &= ~SETUP_SOUND;
if (!sound_loops_allowed)
{
- local_player->setup &= ~SETUP_SOUND_LOOPS;
- local_player->setup &= ~SETUP_SOUND_MUSIC;
+ setup.sound_loops_on = FALSE;
+ setup.sound_music_on = FALSE;
}
- 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.joy_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);
+ setup.sound_simple_on = setup.sound_on;
#ifndef MSDOS
- if (setup.joy_input[0].joystick_nr != old_joystick_nr)
+ if (setup.input[0].joystick_nr != old_joystick_nr)
{
if (joystick_device)
close(joystick_device);
player->present = FALSE;
player->active = FALSE;
- /*
- player->local = FALSE;
- */
+ player->action = 0;
player->score = 0;
player->gems_still_needed = level.edelsteine;
DigField(player, 0,0,0,0,DF_NO_PUSH);
SnapField(player, 0,0);
-
- /* TEST TEST TEST */
-
- /*
- stored_player[i].active = TRUE;
- */
-
- /* TEST TEST TEST */
-
player->LevelSolved = FALSE;
player->GameOver = FALSE;
}
- /*
- local_player->active = TRUE;
- local_player->local = TRUE;
- */
-
network_player_action_received = FALSE;
/* initial null action */
struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_SPIELER1];
int jx = player->jx, jy = player->jy;
- /*
- player->active = TRUE;
- */
-
player->present = TRUE;
- if (player->connected)
+ if (!network_playing || player->connected)
{
player->active = TRUE;
local_player->active ? "active" : "not active");
}
-#if 0
- /* remove potentially duplicate players */
- if (StorePlayer[jx][jy] == Feld[x][y])
- StorePlayer[jx][jy] = 0;
-
- StorePlayer[x][y] = Feld[x][y];
-#endif
-
Feld[x][y] = EL_LEERRAUM;
player->jx = player->last_jx = x;
player->jy = player->last_jy = y;
}
}
+
for(i=0; i<MAX_PLAYERS; i++)
{
struct PlayerInfo *player = &stored_player[i];
SaveLevelTape(tape.level_nr); /* Ask to save tape */
}
- if (level_nr == local_player->handicap &&
- level_nr < leveldir[leveldir_nr].levels-1)
- {
- local_player->handicap++;
- bumplevel = TRUE;
- SavePlayerInfo(PLAYER_LEVEL);
- }
-
if ((hi_pos=NewHiScore()) >= 0)
{
game_status = HALLOFFAME;
stored_player_action[player->index_nr] = 0;
num_stored_actions++;
- if (!player->active || player->gone)
+ if (!player->active || player->gone || tape.pausing)
return;
if (player_action)
}
}
-void GameActions(byte player_action)
+void GameActions()
{
static long action_delay = 0;
long action_delay_value;
recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
if (network_playing)
- SendToServer_MovePlayer(player_action);
+ SendToServer_MovePlayer(local_player->action);
for(i=0; i<MAX_PLAYERS; i++)
{
- int actual_player_action =
- (network_playing ? network_player_action[i] : player_action);
-
-
- /* TEST TEST TEST */
-
- /*
- if (i != TestPlayer && !stored_player[i].MovPos)
- actual_player_action = 0;
- */
-
- if (!options.network && i != TestPlayer)
- actual_player_action = 0;
-
- /* TEST TEST TEST */
-
+ int actual_player_action = stored_player[i].action;
if (recorded_player_action)
actual_player_action = recorded_player_action[i];
PlayerActions(&stored_player[i], actual_player_action);
ScrollFigure(&stored_player[i], SCROLL_GO_ON);
-
- network_player_action[i] = 0;
}
network_player_action_received = FALSE;
FrameCounter++;
TimeFrames++;
-
- /*
- printf("FrameCounter == %d, RND(100) == %d\n", FrameCounter, RND(100));
- */
-
-
for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
{
Stop[x][y] = FALSE;
{
if (jx != old_jx) /* player has moved horizontally */
{
+ /*
if ((scroll_x < jx-MIDPOSX-offset || scroll_x > jx-MIDPOSX+offset) &&
jx >= MIDPOSX-1-offset && jx <= lev_fieldx-(MIDPOSX-offset))
- scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : offset);
+ scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
+ */
+
+ if ((player->MovDir == MV_LEFT && scroll_x > jx-MIDPOSX+offset) ||
+ (player->MovDir == MV_RIGHT && scroll_x < jx-MIDPOSX-offset))
+ scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
+
+ /* don't scroll over playfield boundaries */
+ if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 2)
+ scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 2);
/* don't scroll more than one field at a time */
scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
}
else /* player has moved vertically */
{
+ /*
if ((scroll_y < jy-MIDPOSY-offset || scroll_y > jy-MIDPOSY+offset) &&
jy >= MIDPOSY-1-offset && jy <= lev_fieldy-(MIDPOSY-offset))
- scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : offset);
+ scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
+ */
+
+ if ((player->MovDir == MV_UP && scroll_y > jy-MIDPOSY+offset) ||
+ (player->MovDir == MV_DOWN && scroll_y < jy-MIDPOSY-offset))
+ scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
+
+ /* don't scroll over playfield boundaries */
+ if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 2)
+ scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 2);
/* don't scroll more than one field at a time */
scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);
projects / rocksndiamonds.git / blobdiff