void GetPlayerConfig()
{
- int old_joystick_nr = setup.input[0].joystick_nr;
-
if (sound_status == SOUND_OFF)
- setup.sound_on = FALSE;
+ setup.sound = FALSE;
if (!sound_loops_allowed)
{
- setup.sound_loops_on = FALSE;
- setup.sound_music_on = FALSE;
+ setup.sound_loops = FALSE;
+ setup.sound_music = FALSE;
}
- setup.sound_simple_on = setup.sound_on;
+ setup.sound_simple = setup.sound;
-#ifndef MSDOS
- if (setup.input[0].joystick_nr != old_joystick_nr)
- {
- if (joystick_device)
- close(joystick_device);
- InitJoystick();
- }
-#endif
+ InitJoysticks();
}
void InitGame()
player->active = FALSE;
player->action = 0;
- player->potential_action = 0;
+ player->effective_action = 0;
player->score = 0;
player->gems_still_needed = level.edelsteine;
int jx = player->jx, jy = player->jy;
player->present = TRUE;
+
+ /*
if (!network_playing || player->connected)
+ */
+
+ if (!options.network || player->connected)
{
player->active = TRUE;
if (player->connected && !player->present)
{
- printf("Oops!\n");
-
-
for(j=0; j<MAX_PLAYERS; j++)
{
struct PlayerInfo *some_player = &stored_player[j];
}
}
+ /* when in single player mode, eliminate all but the first active player */
+ if (!options.network && !setup.team_mode)
+ {
+ for(i=0; i<MAX_PLAYERS; i++)
+ {
+ if (stored_player[i].active)
+ {
+ for(j=i+1; j<MAX_PLAYERS; j++)
+ {
+ struct PlayerInfo *player = &stored_player[j];
+ int jx = player->jx, jy = player->jy;
+
+ if (player->active)
+ {
+ player->active = FALSE;
+ StorePlayer[jx][jy] = 0;
+ Feld[jx][jy] = EL_LEERRAUM;
+ }
+ }
+ }
+ }
+ }
for(i=0; i<MAX_PLAYERS; i++)
{
DrawGameButton(BUTTON_GAME_STOP);
DrawGameButton(BUTTON_GAME_PAUSE);
DrawGameButton(BUTTON_GAME_PLAY);
- DrawSoundDisplay(BUTTON_SOUND_MUSIC | (BUTTON_ON * setup.sound_music_on));
- DrawSoundDisplay(BUTTON_SOUND_LOOPS | (BUTTON_ON * setup.sound_loops_on));
- DrawSoundDisplay(BUTTON_SOUND_SIMPLE | (BUTTON_ON * setup.sound_simple_on));
+ DrawSoundDisplay(BUTTON_SOUND_MUSIC | (BUTTON_ON * setup.sound_music));
+ DrawSoundDisplay(BUTTON_SOUND_LOOPS | (BUTTON_ON * setup.sound_loops));
+ DrawSoundDisplay(BUTTON_SOUND_SIMPLE | (BUTTON_ON * setup.sound_simple));
XCopyArea(display,drawto,pix[PIX_DB_DOOR],gc,
DX+GAME_CONTROL_XPOS,DY+GAME_CONTROL_YPOS,
GAME_CONTROL_XSIZE,2*GAME_CONTROL_YSIZE,
OpenDoor(DOOR_OPEN_1);
- if (setup.sound_music_on)
+ if (setup.sound_music)
PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
XAutoRepeatOff(display);
int hi_pos;
int bumplevel = FALSE;
+ if (local_player->MovPos)
+ return;
+
local_player->LevelSolved = FALSE;
if (TimeLeft)
{
- if (setup.sound_loops_on)
+ if (setup.sound_loops)
PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
while(TimeLeft > 0)
{
- if (!setup.sound_loops_on)
+ if (!setup.sound_loops)
PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
if (TimeLeft && !(TimeLeft % 10))
RaiseScore(level.score[SC_ZEITBONUS]);
Delay(10);
}
- if (setup.sound_loops_on)
+ if (setup.sound_loops)
StopSound(SND_SIRR);
}
if (tape.recording)
{
TapeStop();
- SaveLevelTape(tape.level_nr); /* Ask to save tape */
+ SaveTape(tape.level_nr); /* Ask to save tape */
}
if ((hi_pos=NewHiScore()) >= 0)
LoadScore(level_nr);
- if (!strcmp(local_player->alias_name,EMPTY_ALIAS) ||
+ if (!strcmp(setup.alias_name,EMPTY_ALIAS) ||
local_player->score < highscore[MAX_SCORE_ENTRIES-1].Score)
return(-1);
#ifdef ONE_PER_NAME
for(l=k;l<MAX_SCORE_ENTRIES;l++)
- if (!strcmp(local_player->alias_name,highscore[l].Name))
+ if (!strcmp(setup.alias_name,highscore[l].Name))
m = l;
if (m==k) /* Spieler überschreibt seine alte Position */
goto put_into_list;
#ifdef ONE_PER_NAME
put_into_list:
#endif
- sprintf(highscore[k].Name,local_player->alias_name);
+ sprintf(highscore[k].Name,setup.alias_name);
highscore[k].Score = local_player->score;
position = k;
break;
}
#ifdef ONE_PER_NAME
- else if (!strcmp(local_player->alias_name,highscore[k].Name))
+ else if (!strcmp(setup.alias_name,highscore[k].Name))
break; /* Spieler schon mit besserer Punktzahl in der Liste */
#endif
{
MovDelay[x][y]--;
- if (setup.direct_draw_on && MovDelay[x][y])
+ if (setup.direct_draw && MovDelay[x][y])
SetDrawtoField(DRAW_BUFFERED);
DrawGraphic(SCREENX(x),SCREENY(y), el2gfx(Feld[x][y]));
DrawGraphicThruMask(SCREENX(x),SCREENY(y), GFX_FUNKELN_WEISS + phase);
- if (setup.direct_draw_on)
+ if (setup.direct_draw)
{
int dest_x,dest_y;
}
}
-void PlayerActions(struct PlayerInfo *player, byte player_action)
+static void PlayerActions(struct PlayerInfo *player, byte player_action)
{
static byte stored_player_action[MAX_PLAYERS];
static int num_stored_actions = 0;
+ static boolean save_tape_entry = FALSE;
boolean moved = FALSE, snapped = FALSE, bombed = FALSE;
int jx = player->jx, jy = player->jy;
int left = player_action & JOY_LEFT;
if (player_action)
{
+ save_tape_entry = TRUE;
player->frame_reset_delay = 0;
if (button1)
stored_player_action[player->index_nr] = player_action;
+#if 0
/* this allows cycled sequences of PlayerActions() */
if (num_stored_actions >= MAX_PLAYERS)
{
TapeRecordAction(stored_player_action);
num_stored_actions = 0;
}
+#endif
+
}
else if (tape.playing && snapped)
SnapField(player, 0,0); /* stop snapping */
player->Frame = 0;
}
+ if (tape.recording && num_stored_actions >= MAX_PLAYERS && save_tape_entry)
+ {
+ TapeRecordAction(stored_player_action);
+ num_stored_actions = 0;
+ save_tape_entry = FALSE;
+ }
+
if (tape.playing && !tape.pausing && !player_action &&
tape.counter < tape.length)
{
int next_joy =
tape.pos[tape.counter].action[player->index_nr] & (JOY_LEFT|JOY_RIGHT);
- if (next_joy == JOY_LEFT || next_joy == JOY_RIGHT)
+ if ((next_joy == JOY_LEFT || next_joy == JOY_RIGHT) &&
+ (player->MovDir != JOY_UP && player->MovDir != JOY_DOWN))
{
int dx = (next_joy == JOY_LEFT ? -1 : +1);
int sieb_x = 0, sieb_y = 0;
int i, x,y, element;
byte *recorded_player_action;
+ byte summarized_player_action = 0;
if (game_status != PLAYING)
return;
}
+ /*
if (tape.pausing || (tape.playing && !TapePlayDelay()))
return;
else if (tape.recording)
TapeRecordDelay();
+ */
+
+ if (tape.pausing)
+ return;
+
+ if (tape.playing)
+ TapePlayDelay();
+ else if (tape.recording)
+ TapeRecordDelay();
recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
+ for(i=0; i<MAX_PLAYERS; i++)
+ {
+ summarized_player_action |= stored_player[i].action;
+
+ if (!network_playing)
+ stored_player[i].effective_action = stored_player[i].action;
+ }
+
if (network_playing)
- SendToServer_MovePlayer(local_player->potential_action);
+ SendToServer_MovePlayer(summarized_player_action);
+
+ if (!options.network && !setup.team_mode)
+ local_player->effective_action = summarized_player_action;
for(i=0; i<MAX_PLAYERS; i++)
{
- int actual_player_action = stored_player[i].action;
+ int actual_player_action = stored_player[i].effective_action;
if (recorded_player_action)
actual_player_action = recorded_player_action[i];
ScrollScreen(NULL, SCROLL_GO_ON);
+
+ /*
+ if (tape.pausing || (tape.playing && !TapePlayDelay()))
+ return;
+ else if (tape.recording)
+ TapeRecordDelay();
+ */
+
+
FrameCounter++;
TimeFrames++;
void ScrollLevel(int dx, int dy)
{
- int softscroll_offset = (setup.soft_scrolling_on ? TILEX : 0);
+ int softscroll_offset = (setup.soft_scrolling ? TILEX : 0);
int x,y;
- /*
- ScreenGfxPos = local_player->GfxPos;
- */
-
XCopyArea(display,drawto_field,drawto_field,gc,
FX + TILEX*(dx==-1) - softscroll_offset,
FY + TILEY*(dy==-1) - softscroll_offset,
if (!FrameReached(&player->move_delay,MoveSpeed) && !tape.playing)
return(FALSE);
+ if (player->MovPos)
+ {
+ /* should only happen if pre-1.0 tape recordings are played */
+ /* this is only for backward compatibility */
+
+#if DEBUG
+ printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.0 LEVEL TAPES.\n");
+#endif
+
+ while (player->MovPos)
+ {
+ ScrollFigure(player, SCROLL_GO_ON);
+ ScrollScreen(NULL, SCROLL_GO_ON);
+ FrameCounter++;
+ DrawAllPlayers();
+ BackToFront();
+ }
+ }
+
if (player->last_move_dir & (MV_LEFT | MV_RIGHT))
{
if (!(moved |= MoveFigureOneStep(player, 0,dy, dx,dy)))
jx = player->jx;
jy = player->jy;
-
-
- /*
- if (moved & MF_MOVING && player == local_player)
- */
-
if (moved & MF_MOVING && !ScreenMovPos &&
(player == local_player || !options.network))
{
int old_scroll_x = scroll_x, old_scroll_y = scroll_y;
- int offset = (setup.scroll_delay_on ? 3 : 0);
-
- /*
- if (player == local_player)
- {
- printf("MOVING LOCAL PLAYER && SCROLLING\n");
- }
- */
+ int offset = (setup.scroll_delay ? 3 : 0);
if (!IN_VIS_FIELD(SCREENX(jx),SCREENY(jy)))
{
{
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);
- */
-
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);
+ if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 1)
+ scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 1);
/* 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);
- */
-
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);
+ if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 1)
+ scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 1);
/* don't scroll more than one field at a time */
scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);
}
}
-#if 0
- if (player == local_player)
- {
- 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);
- 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);
-
- /* don't scroll more than one field at a time */
- scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
- scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);
- }
-#endif
-
if (scroll_x != old_scroll_x || scroll_y != old_scroll_y)
{
if (!options.network && !AllPlayersInVisibleScreen())
void TestIfBadThingHitsHero(int x, int y)
{
- /*
- TestIfGoodThingHitsBadThing(JX,JY);
- */
-
TestIfBadThingHitsGoodThing(x,y);
}
int volume, stereo;
int silence_distance = 8;
- if ((!setup.sound_simple_on && !IS_LOOP_SOUND(sound_nr)) ||
- (!setup.sound_loops_on && IS_LOOP_SOUND(sound_nr)))
+ if ((!setup.sound_simple && !IS_LOOP_SOUND(sound_nr)) ||
+ (!setup.sound_loops && IS_LOOP_SOUND(sound_nr)))
return;
if (!IN_LEV_FIELD(x,y) ||
return;
volume = PSND_MAX_VOLUME;
+
#ifndef MSDOS
stereo = (sx-SCR_FIELDX/2)*12;
#else
projects / rocksndiamonds.git / blobdiff