X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=78b950c28033f86c51620e6341ab11c62863561b;hb=20e58eb6573a45a41c25958e17e8d9c20f738edc;hp=b510a0e56c72e434be4d71e74c6784d5e25acd3e;hpb=87f550d868b16979b79b0fd8ac81a0215516977a;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index b510a0e5..78b950c2 100644 --- a/src/game.c +++ b/src/game.c @@ -87,19 +87,6 @@ #define DOUBLE_PLAYER_SPEED(p) (HALVE_MOVE_DELAY((p)->move_delay_value)) #define HALVE_PLAYER_SPEED(p) (DOUBLE_MOVE_DELAY((p)->move_delay_value)) -/* score for elements */ -#define SC_EDELSTEIN 0 -#define SC_DIAMANT 1 -#define SC_KAEFER 2 -#define SC_FLIEGER 3 -#define SC_MAMPFER 4 -#define SC_ROBOT 5 -#define SC_PACMAN 6 -#define SC_KOKOSNUSS 7 -#define SC_DYNAMIT 8 -#define SC_SCHLUESSEL 9 -#define SC_ZEITBONUS 10 - /* game button identifiers */ #define GAME_CTRL_ID_STOP 0 #define GAME_CTRL_ID_PAUSE 1 @@ -362,7 +349,7 @@ void InitGame() player->programmed_action = 0; player->score = 0; - player->gems_still_needed = level.edelsteine; + player->gems_still_needed = level.gems_needed; player->sokobanfields_still_needed = 0; player->lights_still_needed = 0; player->friends_still_needed = 0; @@ -397,8 +384,6 @@ void InitGame() player->snapped = FALSE; - player->gone = FALSE; - player->last_jx = player->last_jy = 0; player->jx = player->jy = 0; @@ -419,7 +404,7 @@ void InitGame() ZX = ZY = -1; - MampferNr = 0; + game.yam_content_nr = 0; FrameCounter = 0; TimeFrames = 0; TimePlayed = 0; @@ -432,8 +417,8 @@ void InitGame() ScrollStepSize = 0; /* will be correctly initialized by ScrollScreen() */ AllPlayersGone = FALSE; - SiebAktiv = FALSE; - SiebCount = 0; + game.magic_wall_active = FALSE; + game.magic_wall_time_left = 0; for (i=0; igems_still_needed,3), FS_SMALL, FC_YELLOW); - DrawTextExt(pix[PIX_DB_DOOR], gc, - DOOR_GFX_PAGEX1 + XX_DYNAMITE, DOOR_GFX_PAGEY1 + YY_DYNAMITE, - int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW); - DrawTextExt(pix[PIX_DB_DOOR], gc, - DOOR_GFX_PAGEX1 + XX_SCORE, DOOR_GFX_PAGEY1 + YY_SCORE, - int2str(local_player->score, 5), FS_SMALL, FC_YELLOW); - DrawTextExt(pix[PIX_DB_DOOR], gc, - DOOR_GFX_PAGEX1 + XX_TIME, DOOR_GFX_PAGEY1 + YY_TIME, - int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW); + +#if 1 + + if (setup.soft_scrolling) + XCopyArea(display, fieldbuffer, backbuffer, gc, + FX, FY, SXSIZE, SYSIZE, SX, SY); + + redraw_mask |= REDRAW_FROM_BACKBUFFER; + +#endif + + + /* copy default game door content to main double buffer */ + XCopyArea(display, pix[PIX_DOOR], drawto, gc, + DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); + + if (level_nr < 100) + DrawText(DX + XX_LEVEL, DY + YY_LEVEL, + int2str(level_nr, 2), FS_SMALL, FC_YELLOW); + else + DrawText(DX + XX_LEVEL - 1, DY + YY_LEVEL + 1, + int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3); + + DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS, + int2str(local_player->gems_still_needed,3), FS_SMALL, FC_YELLOW); + DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE, + int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW); + DrawText(DX + XX_SCORE, DY + YY_SCORE, + int2str(local_player->score, 5), FS_SMALL, FC_YELLOW); + DrawText(DX + XX_TIME, DY + YY_TIME, + int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW); UnmapGameButtons(); game_gadget[SOUND_CTRL_ID_MUSIC]->checked = setup.sound_music; @@ -632,12 +627,9 @@ void InitGame() MapGameButtons(); MapTapeButtons(); - /* copy actual game buttons to door double buffer for OpenDoor() */ + /* copy actual game door content to door double buffer for OpenDoor() */ XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc, - DX + GAME_CONTROL_XPOS, DY + GAME_CONTROL_YPOS, - GAME_CONTROL_XSIZE, 2 * GAME_CONTROL_YSIZE, - DOOR_GFX_PAGEX1 + GAME_CONTROL_XPOS, - DOOR_GFX_PAGEY1 + GAME_CONTROL_YPOS); + DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); OpenDoor(DOOR_OPEN_ALL); @@ -1073,7 +1065,7 @@ void DrawDynamite(int x, int y) phase = 7 - phase; } - if (game_emulation == EMU_SUPAPLEX) + if (game.emulation == EMU_SUPAPLEX) DrawGraphic(sx, sy, GFX_SP_DISK_RED); else if (Store[x][y]) DrawGraphicThruMask(sx, sy, graphic + phase); @@ -1161,7 +1153,7 @@ void Explode(int ex, int ey, int phase, int mode) break; } - if (game_emulation == EMU_SUPAPLEX) + if (game.emulation == EMU_SUPAPLEX) Store[x][y] = EL_LEERRAUM; } else if (center_element == EL_MAULWURF) @@ -1175,9 +1167,9 @@ void Explode(int ex, int ey, int phase, int mode) else if (center_element == EL_SP_ELECTRON) Store[x][y] = EL_SP_INFOTRON; else if (center_element == EL_MAMPFER) - Store[x][y] = level.mampfer_inhalt[MampferNr][x-ex+1][y-ey+1]; + Store[x][y] = level.yam_content[game.yam_content_nr][x-ex+1][y-ey+1]; else if (center_element == EL_AMOEBA2DIAM) - Store[x][y] = level.amoebe_inhalt; + Store[x][y] = level.amoeba_content; else if (element == EL_ERZ_EDEL) Store[x][y] = EL_EDELSTEIN; else if (element == EL_ERZ_DIAM) @@ -1214,7 +1206,7 @@ void Explode(int ex, int ey, int phase, int mode) } if (center_element == EL_MAMPFER) - MampferNr = (MampferNr + 1) % MampferMax; + game.yam_content_nr = (game.yam_content_nr + 1) % level.num_yam_contents; return; } @@ -1270,7 +1262,7 @@ void Explode(int ex, int ey, int phase, int mode) { int graphic = GFX_EXPLOSION; - if (game_emulation == EMU_SUPAPLEX) + if (game.emulation == EMU_SUPAPLEX) graphic = (Store[x][y] == EL_SP_INFOTRON ? GFX_SP_EXPLODE_INFOTRON : GFX_SP_EXPLODE_EMPTY); @@ -1327,7 +1319,7 @@ void Bang(int x, int y) { int element = Feld[x][y]; - if (game_emulation == EMU_SUPAPLEX) + if (game.emulation == EMU_SUPAPLEX) PlaySoundLevel(x, y, SND_SP_BOOOM); else PlaySoundLevel(x, y, SND_ROAAAR); @@ -1470,8 +1462,8 @@ void Impact(int x, int y) if (Feld[x][y] == smashed) Feld[x][y] = activated_magic_wall; - SiebCount = level.dauer_sieb * FRAMES_PER_SECOND; - SiebAktiv = TRUE; + game.magic_wall_time_left = level.time_magic_wall * FRAMES_PER_SECOND; + game.magic_wall_active = TRUE; } if (IS_PLAYER(x, y+1)) @@ -1854,7 +1846,7 @@ void TurnRound(int x, int y) struct PlayerInfo *player = &stored_player[i]; int jx = player->jx, jy = player->jy; - if (!player->active || player->gone) + if (!player->active) continue; if (attr_x == -1 || ABS(jx-x)+ABS(jy-y) < ABS(attr_x-x)+ABS(attr_y-y)) @@ -1969,8 +1961,7 @@ static boolean JustBeingPushed(int x, int y) { struct PlayerInfo *player = &stored_player[i]; - if (player->active && !player->gone && - player->Pushing && player->MovPos) + if (player->active && player->Pushing && player->MovPos) { int next_jx = player->jx + (player->jx - player->last_jx); int next_jy = player->jy + (player->jy - player->last_jy); @@ -2113,7 +2104,7 @@ void StartMoving(int x, int y) if (left || right) { - if (left && right && game_emulation != EMU_BOULDERDASH) + if (left && right && game.emulation != EMU_BOULDERDASH) left = !(right = RND(2)); InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT); @@ -2445,22 +2436,24 @@ void ContinueMoving(int x, int y) else if (Store[x][y] == EL_SIEB_VOLL) { Store[x][y] = 0; - element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB_VOLL : EL_SIEB_TOT); + element = Feld[newx][newy] = + (game.magic_wall_active ? EL_SIEB_VOLL : EL_SIEB_TOT); } else if (Store[x][y] == EL_SIEB_LEER) { Store[x][y] = Store2[x][y] = 0; - Feld[x][y] = (SiebAktiv ? EL_SIEB_LEER : EL_SIEB_TOT); + Feld[x][y] = (game.magic_wall_active ? EL_SIEB_LEER : EL_SIEB_TOT); } else if (Store[x][y] == EL_SIEB2_VOLL) { Store[x][y] = 0; - element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB2_VOLL : EL_SIEB2_TOT); + element = Feld[newx][newy] = + (game.magic_wall_active ? EL_SIEB2_VOLL : EL_SIEB2_TOT); } else if (Store[x][y] == EL_SIEB2_LEER) { Store[x][y] = Store2[x][y] = 0; - Feld[x][y] = (SiebAktiv ? EL_SIEB2_LEER : EL_SIEB2_TOT); + Feld[x][y] = (game.magic_wall_active ? EL_SIEB2_LEER : EL_SIEB2_TOT); } else if (Store[x][y] == EL_SALZSAEURE) { @@ -2717,7 +2710,7 @@ void AmoebeAbleger(int ax, int ay) { 0, +1 } }; - if (!level.tempo_amoebe) + if (!level.amoeba_speed) { Feld[ax][ay] = EL_AMOEBE_TOT; DrawLevelField(ax, ay); @@ -2725,7 +2718,7 @@ void AmoebeAbleger(int ax, int ay) } if (!MovDelay[ax][ay]) /* start making new amoeba field */ - MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25 / (1 + level.tempo_amoebe)); + MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25 / (1 + level.amoeba_speed)); if (MovDelay[ax][ay]) /* wait some time before making new amoeba */ { @@ -2780,7 +2773,7 @@ void AmoebeAbleger(int ax, int ay) if (newax == ax && neway == ay) /* amoeba cannot grow */ { - if (i == 4 && (!waiting_for_player || game_emulation == EMU_BOULDERDASH)) + if (i == 4 && (!waiting_for_player || game.emulation == EMU_BOULDERDASH)) { Feld[ax][ay] = EL_AMOEBE_TOT; DrawLevelField(ax, ay); @@ -2791,7 +2784,7 @@ void AmoebeAbleger(int ax, int ay) if (element == EL_AMOEBE_VOLL) AmoebeUmwandeln(ax, ay); else if (element == EL_AMOEBE_BD) - AmoebeUmwandelnBD(ax, ay, level.amoebe_inhalt); + AmoebeUmwandelnBD(ax, ay, level.amoeba_content); } } return; @@ -2915,7 +2908,7 @@ void Life(int ax, int ay) void Ablenk(int x, int y) { if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = level.dauer_ablenk * FRAMES_PER_SECOND; + MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; if (MovDelay[x][y]) /* wait some time before next frame */ { @@ -3358,7 +3351,7 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action) stored_player_action[player->index_nr] = 0; num_stored_actions++; - if (!player->active || player->gone || tape.pausing) + if (!player->active || tape.pausing) return; if (player_action) @@ -3525,7 +3518,7 @@ void GameActions() #ifdef DEBUG #if 0 - if (TimeFrames == 0 && !local_player->gone) + if (TimeFrames == 0 && local_player->active) { extern unsigned int last_RND(); @@ -3626,7 +3619,7 @@ void GameActions() else if (element == EL_SP_TERMINAL_ACTIVE) DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL_ACTIVE, 7, 4, ANIM_NORMAL); - if (SiebAktiv) + if (game.magic_wall_active) { boolean sieb = FALSE; int jx = local_player->jx, jy = local_player->jy; @@ -3653,15 +3646,15 @@ void GameActions() } } - if (SiebAktiv) + if (game.magic_wall_active) { - if (!(SiebCount % 4)) + if (!(game.magic_wall_time_left % 4)) PlaySoundLevel(sieb_x, sieb_y, SND_MIEP); - if (SiebCount > 0) + if (game.magic_wall_time_left > 0) { - SiebCount--; - if (!SiebCount) + game.magic_wall_time_left--; + if (!game.magic_wall_time_left) { for (y=0; ygone || (!dx && !dy)) + if (!player->active || (!dx && !dy)) return MF_NO_ACTION; player->MovDir = (dx < 0 ? MV_LEFT : @@ -3876,7 +3868,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) int old_jx = jx, old_jy = jy; int moved = MF_NO_ACTION; - if (player->gone || (!dx && !dy)) + if (!player->active || (!dx && !dy)) return FALSE; if (!FrameReached(&player->move_delay, player->move_delay_value) && @@ -4020,7 +4012,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) TestIfHeroHitsBadThing(jx, jy); - if (player->gone) + if (!player->active) RemoveHero(player); return moved; @@ -4032,7 +4024,7 @@ void ScrollFigure(struct PlayerInfo *player, int mode) int last_jx = player->last_jx, last_jy = player->last_jy; int move_stepsize = TILEX / player->move_delay_value; - if (!player->active || player->gone || !player->MovPos) + if (!player->active || !player->MovPos) return; if (mode == SCROLL_INIT) @@ -4279,7 +4271,7 @@ void KillHero(struct PlayerInfo *player) { int jx = player->jx, jy = player->jy; - if (player->gone) + if (!player->active) return; if (IS_PFORTE(Feld[jx][jy])) @@ -4293,7 +4285,7 @@ void BuryHero(struct PlayerInfo *player) { int jx = player->jx, jy = player->jy; - if (player->gone) + if (!player->active) return; PlaySoundLevel(jx, jy, SND_AUTSCH); @@ -4308,11 +4300,13 @@ void RemoveHero(struct PlayerInfo *player) int jx = player->jx, jy = player->jy; int i, found = FALSE; - player->gone = TRUE; + player->present = FALSE; + player->active = FALSE; + StorePlayer[jx][jy] = 0; for (i=0; isokobanfields_still_needed == 0 && - game_emulation == EMU_SOKOBAN) + game.emulation == EMU_SOKOBAN) { player->LevelSolved = player->GameOver = TRUE; PlaySoundLevel(x, y, SND_BUING); @@ -4759,7 +4753,7 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy) int jx = player->jx, jy = player->jy; int x = jx + dx, y = jy + dy; - if (player->gone || !IN_LEV_FIELD(x, y)) + if (!player->active || !IN_LEV_FIELD(x, y)) return FALSE; if (dx && dy) @@ -4794,7 +4788,7 @@ boolean PlaceBomb(struct PlayerInfo *player) int jx = player->jx, jy = player->jy; int element; - if (player->gone || player->MovPos) + if (!player->active || player->MovPos) return FALSE; element = Feld[jx][jy]; @@ -4816,7 +4810,7 @@ boolean PlaceBomb(struct PlayerInfo *player) FS_SMALL, FC_YELLOW); if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy))) { - if (game_emulation == EMU_SUPAPLEX) + if (game.emulation == EMU_SUPAPLEX) DrawGraphic(SCREENX(jx), SCREENY(jy), GFX_SP_DISK_RED); else DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT);