X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=26cc84cc2a8a61d0e95a9cd347f74368a549ebff;hp=b785616403af98b17add1109e1b1cf49ac448726;hb=0918c3eb2f6219a8cc72aa85bd9c4889788dd474;hpb=7b31a77eec53ed2b96d5924a743b0706c9e4b11c diff --git a/src/game.c b/src/game.c index b7856164..26cc84cc 100644 --- a/src/game.c +++ b/src/game.c @@ -1,13 +1,12 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* ©1995 Artsoft Development * -* Holger Schemel * -* 33659 Bielefeld-Senne * -* Telefon: (0521) 493245 * -* eMail: aeglos@valinor.owl.de * -* aeglos@uni-paderborn.de * -* q99492@pbhrzx.uni-paderborn.de * +* (c) 1995-98 Artsoft Entertainment * +* Holger Schemel * +* Oststrasse 11a * +* 33604 Bielefeld * +* phone: ++49 +521 290471 * +* email: aeglos@valinor.owl.de * *----------------------------------------------------------* * game.c * ***********************************************************/ @@ -22,54 +21,121 @@ #include "files.h" #include "tape.h" #include "joystick.h" +#include "network.h" + +/* for DigField() */ +#define DF_NO_PUSH 0 +#define DF_DIG 1 +#define DF_SNAP 2 + +/* for MoveFigure() */ +#define MF_NO_ACTION 0 +#define MF_MOVING 1 +#define MF_ACTION 2 + +/* for ScrollFigure() */ +#define SCROLL_INIT 0 +#define SCROLL_GO_ON 1 + +/* for Explode() */ +#define EX_PHASE_START 0 +#define EX_NORMAL 0 +#define EX_CENTER 1 +#define EX_BORDER 2 + +/* special positions in the game control window (relative to control window) */ +#define XX_LEVEL 37 +#define YY_LEVEL 20 +#define XX_EMERALDS 29 +#define YY_EMERALDS 54 +#define XX_DYNAMITE 29 +#define YY_DYNAMITE 89 +#define XX_KEYS 18 +#define YY_KEYS 123 +#define XX_SCORE 15 +#define YY_SCORE 159 +#define XX_TIME 29 +#define YY_TIME 194 + +/* special positions in the game control window (relative to main window) */ +#define DX_LEVEL (DX + XX_LEVEL) +#define DY_LEVEL (DY + YY_LEVEL) +#define DX_EMERALDS (DX + XX_EMERALDS) +#define DY_EMERALDS (DY + YY_EMERALDS) +#define DX_DYNAMITE (DX + XX_DYNAMITE) +#define DY_DYNAMITE (DY + YY_DYNAMITE) +#define DX_KEYS (DX + XX_KEYS) +#define DY_KEYS (DY + YY_KEYS) +#define DX_SCORE (DX + XX_SCORE) +#define DY_SCORE (DY + YY_SCORE) +#define DX_TIME (DX + XX_TIME) +#define DY_TIME (DY + YY_TIME) + +#define IS_LOOP_SOUND(s) ((s)==SND_KLAPPER || (s)==SND_ROEHR || \ + (s)==SND_NJAM || (s)==SND_MIEP) +#define IS_MUSIC_SOUND(s) ((s)==SND_ALCHEMY || (s)==SND_CHASE || \ + (s)==SND_NETWORK || (s)==SND_CZARDASZ || \ + (s)==SND_TYGER || (s)==SND_VOYAGER || \ + (s)==SND_TWILIGHT) + +/* 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 + +/* values for game_emulation */ +#define EMU_NONE 0 +#define EMU_BOULDERDASH 1 +#define EMU_SOKOBAN 2 + +/* to control special behaviour of certain game elements */ +int game_emulation = EMU_NONE; void GetPlayerConfig() { - int old_joystick_nr = joystick_nr; + if (sound_status == SOUND_OFF) + setup.sound = 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 = FALSE; + setup.sound_music = FALSE; } - 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 = setup.sound; -#ifndef MSDOS - if (joystick_nr != old_joystick_nr) - { - if (joystick_device) - close(joystick_device); - InitJoystick(); - } -#endif + InitJoysticks(); } void InitGame() { - int i,j, x,y; - BOOL emulate_bd = TRUE; /* unless non-BOULDERDASH elements found */ - BOOL emulate_sb = TRUE; /* unless non-SOKOBAN elements found */ + int i, j, x, y; + boolean emulate_bd = TRUE; /* unless non-BOULDERDASH elements found */ + boolean emulate_sb = TRUE; /* unless non-SOKOBAN elements found */ + + /* don't play tapes over network */ + network_playing = (options.network && !tape.playing); - for(i=0; inr = i; + player->index_nr = i; + player->element_nr = EL_SPIELER1 + i; + + player->present = FALSE; player->active = FALSE; - player->local = FALSE; + + player->action = 0; + player->effective_action = 0; player->score = 0; player->gems_still_needed = level.edelsteine; @@ -77,7 +143,7 @@ void InitGame() player->lights_still_needed = 0; player->friends_still_needed = 0; - for(j=0; j<4; j++) + for (j=0; j<4; j++) player->key[j] = FALSE; player->dynamite = 0; @@ -109,20 +175,20 @@ void InitGame() player->last_jx = player->last_jy = 0; player->jx = player->jy = 0; - DigField(player, 0,0,0,0,DF_NO_PUSH); - SnapField(player, 0,0); - - - /* TEST TEST TEST */ - stored_player[i].active = TRUE; - /* TEST TEST TEST */ + DigField(player, 0, 0, 0, 0, DF_NO_PUSH); + SnapField(player, 0, 0); player->LevelSolved = FALSE; player->GameOver = FALSE; } - local_player->active = TRUE; - local_player->local = TRUE; + network_player_action_received = FALSE; + +#ifndef MSDOS + /* initial null action */ + if (network_playing) + SendToServer_MovePlayer(MV_NO_MOVING); +#endif ZX = ZY = -1; @@ -137,24 +203,31 @@ void InitGame() AllPlayersGone = SiebAktiv = FALSE; - for(i=0;ijx, jy = player->jy; - /* remove duplicate players */ - if (StorePlayer[jx][jy] == Feld[x][y]) - StorePlayer[jx][jy] = 0; + player->present = TRUE; + + /* + if (!network_playing || player->connected) + */ + + if (!options.network || player->connected) + { + player->active = TRUE; + + /* remove potentially duplicate players */ + if (StorePlayer[jx][jy] == Feld[x][y]) + StorePlayer[jx][jy] = 0; + + StorePlayer[x][y] = Feld[x][y]; + + if (options.verbose) + { + printf("Player %d activated.\n", player->element_nr); + printf("[Local player is %d and currently %s.]\n", + local_player->element_nr, + local_player->active ? "active" : "not active"); + } + } - StorePlayer[x][y] = Feld[x][y]; Feld[x][y] = EL_LEERRAUM; player->jx = player->last_jx = x; player->jy = player->last_jy = y; + break; } case EL_BADEWANNE: - if (x0 && Feld[x-1][y]==EL_SALZSAEURE) + else if (x > 0 && Feld[x-1][y] == EL_SALZSAEURE) Feld[x][y] = EL_BADEWANNE2; - else if (y>0 && Feld[x][y-1]==EL_BADEWANNE1) + else if (y > 0 && Feld[x][y-1] == EL_BADEWANNE1) Feld[x][y] = EL_BADEWANNE3; - else if (y>0 && Feld[x][y-1]==EL_SALZSAEURE) + else if (y > 0 && Feld[x][y-1] == EL_SALZSAEURE) Feld[x][y] = EL_BADEWANNE4; - else if (y>0 && Feld[x][y-1]==EL_BADEWANNE2) + else if (y > 0 && Feld[x][y-1] == EL_BADEWANNE2) Feld[x][y] = EL_BADEWANNE5; break; case EL_KAEFER_R: @@ -217,14 +311,14 @@ void InitGame() case EL_MAMPFER2: case EL_ROBOT: case EL_PACMAN: - InitMovDir(x,y); + InitMovDir(x, y); break; case EL_AMOEBE_VOLL: case EL_AMOEBE_BD: - InitAmoebaNr(x,y); + InitAmoebaNr(x, y); break; case EL_TROPFEN: - if (y==lev_fieldy-1) + if (y == lev_fieldy - 1) { Feld[x][y] = EL_AMOEBING; Store[x][y] = EL_AMOEBE_NASS; @@ -245,13 +339,107 @@ void InitGame() break; case EL_SCHWEIN: case EL_DRACHE: - MovDir[x][y] = 1<connected && !player->present) + { + for (j=0; jjx, jy = some_player->jy; + + /* assign first free player found that is present in the playfield */ + if (some_player->present && !some_player->connected) + { + player->present = TRUE; + player->active = TRUE; + some_player->present = FALSE; + + StorePlayer[jx][jy] = player->element_nr; + player->jx = player->last_jx = jx; + player->jy = player->last_jy = jy; + + break; + } + } + } + } + + if (tape.playing) + { + /* when playing a tape, eliminate all players who do not participate */ + + for (i=0; ijx, jy = player->jy; + + player->active = FALSE; + StorePlayer[jx][jy] = 0; + Feld[jx][jy] = EL_LEERRAUM; + } + } + } + else if (!options.network && !setup.team_mode) /* && !tape.playing */ + { + /* when in single player mode, eliminate all but the first active player */ + + for (i=0; ijx, jy = player->jy; + + player->active = FALSE; + StorePlayer[jx][jy] = 0; + Feld[jx][jy] = EL_LEERRAUM; + } + } + } + } + } + + /* when recording the game, store which players take part in the game */ + if (tape.recording) + { + for (i=0; ipresent, + player->connected, + player->active); + if (local_player == player) + printf("Player %d is local player.\n", i+1); + } + } + game_emulation = (emulate_bd ? EMU_BOULDERDASH : emulate_sb ? EMU_SOKOBAN : EMU_NONE); @@ -271,43 +459,50 @@ void InitGame() DrawAllPlayers(); FadeToFront(); - XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX5,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE, - DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1); - DrawTextExt(pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX1+XX_LEVEL,DOOR_GFX_PAGEY1+YY_LEVEL, - int2str(level_nr,2),FS_SMALL,FC_YELLOW); - DrawTextExt(pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX1+XX_EMERALDS,DOOR_GFX_PAGEY1+YY_EMERALDS, - int2str(local_player->gems_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); + XCopyArea(display, pix[PIX_DOOR], pix[PIX_DB_DOOR], gc, + DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + DrawTextExt(pix[PIX_DB_DOOR], gc, + DOOR_GFX_PAGEX1 + XX_LEVEL, DOOR_GFX_PAGEY1 + YY_LEVEL, + int2str(level_nr, 2), FS_SMALL, FC_YELLOW); + DrawTextExt(pix[PIX_DB_DOOR], gc, + DOOR_GFX_PAGEX1 + XX_EMERALDS, DOOR_GFX_PAGEY1 + YY_EMERALDS, + int2str(local_player->gems_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); DrawGameButton(BUTTON_GAME_STOP); DrawGameButton(BUTTON_GAME_PAUSE); DrawGameButton(BUTTON_GAME_PLAY); - DrawSoundDisplay(BUTTON_SOUND_MUSIC | (BUTTON_ON * sound_music_on)); - DrawSoundDisplay(BUTTON_SOUND_LOOPS | (BUTTON_ON * sound_loops_on)); - DrawSoundDisplay(BUTTON_SOUND_SIMPLE | (BUTTON_ON * sound_simple_on)); - 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); + DrawSoundDisplay(BUTTON_SOUND_MUSIC | (setup.sound_music ? BUTTON_ON : 0)); + DrawSoundDisplay(BUTTON_SOUND_LOOPS | (setup.sound_loops ? BUTTON_ON : 0)); + DrawSoundDisplay(BUTTON_SOUND_SIMPLE | (setup.sound_simple ? BUTTON_ON : 0)); + 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); OpenDoor(DOOR_OPEN_1); - if (sound_music_on) + if (setup.sound_music) PlaySoundLoop(background_loop[level_nr % num_bg_loops]); XAutoRepeatOff(display); + + if (options.verbose) + { + for (i=0; i<4; i++) + printf("Spieler %d %saktiv.\n", + i+1, (stored_player[i].active ? "" : "nicht ")); + } } void InitMovDir(int x, int y) @@ -315,10 +510,10 @@ void InitMovDir(int x, int y) int i, element = Feld[x][y]; static int xy[4][2] = { - { 0,+1 }, - { +1,0 }, - { 0,-1 }, - { -1,0 } + { 0, +1 }, + { +1, 0 }, + { 0, -1 }, + { -1, 0 } }; static int direction[2][4] = { @@ -333,59 +528,57 @@ void InitMovDir(int x, int y) case EL_KAEFER_L: case EL_KAEFER_U: Feld[x][y] = EL_KAEFER; - MovDir[x][y] = direction[0][element-EL_KAEFER_R]; + MovDir[x][y] = direction[0][element - EL_KAEFER_R]; break; case EL_FLIEGER_R: case EL_FLIEGER_O: case EL_FLIEGER_L: case EL_FLIEGER_U: Feld[x][y] = EL_FLIEGER; - MovDir[x][y] = direction[0][element-EL_FLIEGER_R]; + MovDir[x][y] = direction[0][element - EL_FLIEGER_R]; break; case EL_BUTTERFLY_R: case EL_BUTTERFLY_O: case EL_BUTTERFLY_L: case EL_BUTTERFLY_U: Feld[x][y] = EL_BUTTERFLY; - MovDir[x][y] = direction[0][element-EL_BUTTERFLY_R]; + MovDir[x][y] = direction[0][element - EL_BUTTERFLY_R]; break; case EL_FIREFLY_R: case EL_FIREFLY_O: case EL_FIREFLY_L: case EL_FIREFLY_U: Feld[x][y] = EL_FIREFLY; - MovDir[x][y] = direction[0][element-EL_FIREFLY_R]; + MovDir[x][y] = direction[0][element - EL_FIREFLY_R]; break; case EL_PACMAN_R: case EL_PACMAN_O: case EL_PACMAN_L: case EL_PACMAN_U: Feld[x][y] = EL_PACMAN; - MovDir[x][y] = direction[0][element-EL_PACMAN_R]; + MovDir[x][y] = direction[0][element - EL_PACMAN_R]; break; default: - MovDir[x][y] = 1<MovPos) + return; + local_player->LevelSolved = FALSE; if (TimeLeft) { - if (sound_loops_on) + if (setup.sound_loops) PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP); while(TimeLeft > 0) { - if (!sound_loops_on) + if (!setup.sound_loops) PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT); if (TimeLeft && !(TimeLeft % 10)) RaiseScore(level.score[SC_ZEITBONUS]); @@ -440,12 +636,12 @@ void GameWon() TimeLeft -= 10; else TimeLeft--; - DrawText(DX_TIME, DY_TIME, int2str(TimeLeft,3), FS_SMALL, FC_YELLOW); + DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW); BackToFront(); Delay(10); } - if (sound_loops_on) + if (setup.sound_loops) StopSound(SND_SIRR); } @@ -463,18 +659,10 @@ void GameWon() if (tape.recording) { TapeStop(); - SaveLevelTape(tape.level_nr); /* Ask to save tape */ + SaveTape(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) + if ((hi_pos = NewHiScore()) >= 0) { game_status = HALLOFFAME; DrawHallOfFame(hi_pos); @@ -492,68 +680,69 @@ void GameWon() BackToFront(); } -BOOL NewHiScore() +boolean NewHiScore() { - int k,l; + int k, l; int position = -1; LoadScore(level_nr); - if (!strcmp(local_player->alias_name,EMPTY_ALIAS) || - local_player->score < highscore[MAX_SCORE_ENTRIES-1].Score) - return(-1); + if (strcmp(setup.player_name, EMPTY_PLAYER_NAME) == 0 || + local_player->score < highscore[MAX_SCORE_ENTRIES - 1].Score) + return -1; - for(k=0;kscore > highscore[k].Score) { - /* Spieler kommt in Highscore-Liste */ + /* player has made it to the hall of fame */ - if (kalias_name,highscore[l].Name)) + for (l=k; lk;l--) + for (l=m; l>k; l--) { - strcpy(highscore[l].Name,highscore[l-1].Name); - highscore[l].Score = highscore[l-1].Score; + strcpy(highscore[l].Name, highscore[l - 1].Name); + highscore[l].Score = highscore[l - 1].Score; } } #ifdef ONE_PER_NAME put_into_list: #endif - sprintf(highscore[k].Name,local_player->alias_name); + strncpy(highscore[k].Name, setup.player_name, MAX_NAMELEN - 1); + highscore[k].Name[MAX_NAMELEN - 1] = '\0'; highscore[k].Score = local_player->score; position = k; break; } #ifdef ONE_PER_NAME - else if (!strcmp(local_player->alias_name,highscore[k].Name)) - break; /* Spieler schon mit besserer Punktzahl in der Liste */ + else if (!strncmp(setup.player_name, highscore[k].Name, MAX_NAMELEN - 1)) + break; /* player already there with a higher score */ #endif } - if (position>=0) + if (position >= 0) SaveScore(level_nr); - return(position); + return position; } void InitMovingField(int x, int y, int direction) { - int newx = x + (direction==MV_LEFT ? -1 : direction==MV_RIGHT ? +1 : 0); - int newy = y + (direction==MV_UP ? -1 : direction==MV_DOWN ? +1 : 0); + int newx = x + (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); + int newy = y + (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); MovDir[x][y] = direction; MovDir[newx][newy] = direction; @@ -564,8 +753,8 @@ void InitMovingField(int x, int y, int direction) void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y) { int direction = MovDir[x][y]; - int newx = x + (direction==MV_LEFT ? -1 : direction==MV_RIGHT ? +1 : 0); - int newy = y + (direction==MV_UP ? -1 : direction==MV_DOWN ? +1 : 0); + int newx = x + (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); + int newy = y + (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); *goes_to_x = newx; *goes_to_y = newy; @@ -576,13 +765,13 @@ void Blocked2Moving(int x, int y, int *comes_from_x, int *comes_from_y) int oldx = x, oldy = y; int direction = MovDir[x][y]; - if (direction==MV_LEFT) + if (direction == MV_LEFT) oldx++; - else if (direction==MV_RIGHT) + else if (direction == MV_RIGHT) oldx--; - else if (direction==MV_UP) + else if (direction == MV_UP) oldy++; - else if (direction==MV_DOWN) + else if (direction == MV_DOWN) oldy--; *comes_from_x = oldx; @@ -593,15 +782,15 @@ int MovingOrBlocked2Element(int x, int y) { int element = Feld[x][y]; - if (element==EL_BLOCKED) + if (element == EL_BLOCKED) { - int oldx,oldy; + int oldx, oldy; - Blocked2Moving(x,y,&oldx,&oldy); - return(Feld[oldx][oldy]); + Blocked2Moving(x, y, &oldx, &oldy); + return Feld[oldx][oldy]; } else - return(element); + return element; } static void RemoveField(int x, int y) @@ -614,29 +803,29 @@ static void RemoveField(int x, int y) void RemoveMovingField(int x, int y) { - int oldx = x,oldy = y, newx = x,newy = y; + int oldx = x, oldy = y, newx = x, newy = y; - if (Feld[x][y] != EL_BLOCKED && !IS_MOVING(x,y)) + if (Feld[x][y] != EL_BLOCKED && !IS_MOVING(x, y)) return; - if (IS_MOVING(x,y)) + if (IS_MOVING(x, y)) { - Moving2Blocked(x,y,&newx,&newy); + Moving2Blocked(x, y, &newx, &newy); if (Feld[newx][newy] != EL_BLOCKED) return; } - else if (Feld[x][y]==EL_BLOCKED) + else if (Feld[x][y] == EL_BLOCKED) { - Blocked2Moving(x,y,&oldx,&oldy); - if (!IS_MOVING(oldx,oldy)) + Blocked2Moving(x, y, &oldx, &oldy); + if (!IS_MOVING(oldx, oldy)) return; } - if (Feld[x][y]==EL_BLOCKED && - (Store[oldx][oldy]==EL_MORAST_LEER || - Store[oldx][oldy]==EL_SIEB_LEER || - Store[oldx][oldy]==EL_SIEB2_LEER || - Store[oldx][oldy]==EL_AMOEBE_NASS)) + if (Feld[x][y] == EL_BLOCKED && + (Store[oldx][oldy] == EL_MORAST_LEER || + Store[oldx][oldy] == EL_SIEB_LEER || + Store[oldx][oldy] == EL_SIEB2_LEER || + Store[oldx][oldy] == EL_AMOEBE_NASS)) { Feld[oldx][oldy] = Store[oldx][oldy]; Store[oldx][oldy] = Store2[oldx][oldy] = 0; @@ -648,8 +837,8 @@ void RemoveMovingField(int x, int y) MovPos[oldx][oldy] = MovDir[oldx][oldy] = MovDelay[oldx][oldy] = 0; MovPos[newx][newy] = MovDir[newx][newy] = MovDelay[newx][newy] = 0; - DrawLevelField(oldx,oldy); - DrawLevelField(newx,newy); + DrawLevelField(oldx, oldy); + DrawLevelField(newx, newy); } void DrawDynamite(int x, int y) @@ -658,90 +847,90 @@ void DrawDynamite(int x, int y) int graphic = el2gfx(Feld[x][y]); int phase; - if (!IN_SCR_FIELD(sx,sy) || IS_PLAYER(x,y)) + if (!IN_SCR_FIELD(sx, sy) || IS_PLAYER(x, y)) return; if (Store[x][y]) - DrawGraphic(sx,sy, el2gfx(Store[x][y])); + DrawGraphic(sx, sy, el2gfx(Store[x][y])); - if (Feld[x][y]==EL_DYNAMIT) + if (Feld[x][y] == EL_DYNAMIT) { - if ((phase = (96-MovDelay[x][y])/12) > 6) + if ((phase = (96 - MovDelay[x][y]) / 12) > 6) phase = 6; } else { - if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3) - phase = 7-phase; + if ((phase = ((96 - MovDelay[x][y]) / 6) % 8) > 3) + phase = 7 - phase; } if (Store[x][y]) - DrawGraphicThruMask(sx,sy, graphic + phase); + DrawGraphicThruMask(sx, sy, graphic + phase); else - DrawGraphic(sx,sy, graphic + phase); + DrawGraphic(sx, sy, graphic + phase); } void CheckDynamite(int x, int y) { - if (MovDelay[x][y]) /* neues Dynamit / in Wartezustand */ + if (MovDelay[x][y]) /* dynamite is still waiting to explode */ { MovDelay[x][y]--; if (MovDelay[x][y]) { if (!(MovDelay[x][y] % 12)) - PlaySoundLevel(x,y,SND_ZISCH); + PlaySoundLevel(x, y, SND_ZISCH); - if (Feld[x][y]==EL_DYNAMIT && !(MovDelay[x][y] % 12)) - DrawDynamite(x,y); - else if (Feld[x][y]==EL_DYNABOMB && !(MovDelay[x][y] % 6)) - DrawDynamite(x,y); + if (Feld[x][y] == EL_DYNAMIT && !(MovDelay[x][y] % 12)) + DrawDynamite(x, y); + else if (Feld[x][y] == EL_DYNABOMB && !(MovDelay[x][y] % 6)) + DrawDynamite(x, y); return; } } StopSound(SND_ZISCH); - Bang(x,y); + Bang(x, y); } void Explode(int ex, int ey, int phase, int mode) { - int x,y; + int x, y; int num_phase = 9, delay = 2; - int last_phase = num_phase*delay; - int half_phase = (num_phase/2)*delay; + int last_phase = num_phase * delay; + int half_phase = (num_phase / 2) * delay; - if (phase==0) /* Feld 'Store' initialisieren */ + if (phase == EX_PHASE_START) /* initialize 'Store[][]' field */ { int center_element = Feld[ex][ey]; - if (IS_MOVING(ex,ey) || IS_BLOCKED(ex,ey)) + if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey)) { - center_element = MovingOrBlocked2Element(ex,ey); - RemoveMovingField(ex,ey); + center_element = MovingOrBlocked2Element(ex, ey); + RemoveMovingField(ex, ey); } - for(y=ey-1;ydynabomb_size; j++) + for (j=1; j<=player->dynabomb_size; j++) { int x = ex+j*xy[i%4][0]; int y = ey+j*xy[i%4][1]; int element; - if (!IN_LEV_FIELD(x,y) || IS_MASSIV(Feld[x][y])) + if (!IN_LEV_FIELD(x, y) || IS_MASSIV(Feld[x][y])) break; element = Feld[x][y]; - Explode(x,y,0,EX_BORDER); + Explode(x, y, EX_PHASE_START, EX_BORDER); if (element != EL_LEERRAUM && element != EL_ERDREICH && @@ -901,7 +1091,10 @@ void Bang(int x, int y) { int element = Feld[x][y]; - PlaySoundLevel(x,y,SND_ROAAAR); + PlaySoundLevel(x, y, SND_ROAAAR); + + if (IS_PLAYER(x, y)) /* remove objects that might cause smaller explosion */ + element = EL_LEERRAUM; switch(element) { @@ -914,20 +1107,22 @@ void Bang(int x, int y) case EL_ROBOT: case EL_PACMAN: RaiseScoreElement(element); - Explode(x,y,0,EX_NORMAL); + Explode(x, y, EX_PHASE_START, EX_NORMAL); break; case EL_DYNABOMB: case EL_DYNABOMB_NR: case EL_DYNABOMB_SZ: case EL_DYNABOMB_XL: - DynaExplode(x,y); + DynaExplode(x, y); break; + case EL_MAULWURF: + case EL_PINGUIN: case EL_BIRNE_AUS: case EL_BIRNE_EIN: - Explode(x,y,0,EX_CENTER); + Explode(x, y, EX_PHASE_START, EX_CENTER); break; default: - Explode(x,y,0,EX_NORMAL); + Explode(x, y, EX_PHASE_START, EX_NORMAL); break; } } @@ -936,39 +1131,39 @@ void Blurb(int x, int y) { int element = Feld[x][y]; - if (element!=EL_BLURB_LEFT && element!=EL_BLURB_RIGHT) /* Anfang */ + if (element != EL_BLURB_LEFT && element != EL_BLURB_RIGHT) /* start */ { - PlaySoundLevel(x,y,SND_BLURB); - if (IN_LEV_FIELD(x-1,y) && IS_FREE(x-1,y) && - (!IN_LEV_FIELD(x-1,y-1) || - !CAN_FALL(MovingOrBlocked2Element(x-1,y-1)))) + PlaySoundLevel(x, y, SND_BLURB); + if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) && + (!IN_LEV_FIELD(x-1, y-1) || + !CAN_FALL(MovingOrBlocked2Element(x-1, y-1)))) { Feld[x-1][y] = EL_BLURB_LEFT; } - if (IN_LEV_FIELD(x+1,y) && IS_FREE(x+1,y) && - (!IN_LEV_FIELD(x+1,y-1) || - !CAN_FALL(MovingOrBlocked2Element(x+1,y-1)))) + if (IN_LEV_FIELD(x+1, y) && IS_FREE(x+1, y) && + (!IN_LEV_FIELD(x+1, y-1) || + !CAN_FALL(MovingOrBlocked2Element(x+1, y-1)))) { Feld[x+1][y] = EL_BLURB_RIGHT; } } - else /* Blubbern */ + else /* go on */ { int graphic = (element==EL_BLURB_LEFT ? GFX_BLURB_LEFT : GFX_BLURB_RIGHT); - if (!MovDelay[x][y]) /* neue Phase / noch nicht gewartet */ + if (!MovDelay[x][y]) /* initialize animation counter */ MovDelay[x][y] = 9; - if (MovDelay[x][y]) /* neue Phase / in Wartezustand */ + if (MovDelay[x][y]) /* continue animation */ { MovDelay[x][y]--; - if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x),SCREENY(y))) - DrawGraphic(SCREENX(x),SCREENY(y),graphic+4-MovDelay[x][y]/2); + if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawGraphic(SCREENX(x), SCREENY(y), graphic+4-MovDelay[x][y]/2); if (!MovDelay[x][y]) { Feld[x][y] = EL_LEERRAUM; - DrawLevelField(x,y); + DrawLevelField(x, y); } } } @@ -976,42 +1171,41 @@ void Blurb(int x, int y) void Impact(int x, int y) { - BOOL lastline = (y==lev_fieldy-1); - BOOL object_hit = FALSE; + boolean lastline = (y == lev_fieldy-1); + boolean object_hit = FALSE; int element = Feld[x][y]; int smashed = 0; - /* Element darunter berührt? */ - if (!lastline) + if (!lastline) /* check if element below was hit */ { - object_hit = (!IS_FREE(x,y+1) && (!IS_MOVING(x,y+1) || + if (Feld[x][y+1] == EL_PLAYER_IS_LEAVING) + return; + + object_hit = (!IS_FREE(x, y+1) && (!IS_MOVING(x, y+1) || MovDir[x][y+1]!=MV_DOWN || MovPos[x][y+1]<=TILEY/2)); if (object_hit) - smashed = MovingOrBlocked2Element(x,y+1); + smashed = MovingOrBlocked2Element(x, y+1); } - /* Auftreffendes Element fällt in Salzsäure */ - if (!lastline && smashed==EL_SALZSAEURE) + if (!lastline && smashed == EL_SALZSAEURE) /* element falls into acid */ { - Blurb(x,y); + Blurb(x, y); return; } - /* Auftreffendes Element ist Bombe */ - if (element==EL_BOMBE && (lastline || object_hit)) + if (element == EL_BOMBE && (lastline || object_hit)) /* element is bomb */ { - Bang(x,y); + Bang(x, y); return; } - /* Auftreffendes Element ist Säuretropfen */ - if (element==EL_TROPFEN && (lastline || object_hit)) + if (element == EL_TROPFEN && (lastline || object_hit)) /* acid drop */ { - if (object_hit && IS_PLAYER(x,y+1)) - KillHero(PLAYERINFO(x,y+1)); - else if (object_hit && (smashed==EL_MAULWURF || smashed==EL_PINGUIN)) - Bang(x,y+1); + if (object_hit && IS_PLAYER(x, y+1)) + KillHero(PLAYERINFO(x, y+1)); + else if (object_hit && (smashed == EL_MAULWURF || smashed == EL_PINGUIN)) + Bang(x, y+1); else { Feld[x][y] = EL_AMOEBING; @@ -1020,71 +1214,71 @@ void Impact(int x, int y) return; } - /* Welches Element kriegt was auf die Rübe? */ - if (!lastline && object_hit) + if (!lastline && object_hit) /* check which object was hit */ { if (CAN_CHANGE(element) && - (smashed==EL_SIEB_LEER || smashed==EL_SIEB2_LEER) && !SiebAktiv) + (smashed == EL_SIEB_LEER || smashed == EL_SIEB2_LEER) && !SiebAktiv) SiebAktiv = level.dauer_sieb * FRAMES_PER_SECOND; - if (IS_PLAYER(x,y+1)) + if (IS_PLAYER(x, y+1)) { - KillHero(PLAYERINFO(x,y+1)); + KillHero(PLAYERINFO(x, y+1)); return; } - else if (smashed==EL_MAULWURF || smashed==EL_PINGUIN) + else if (smashed == EL_MAULWURF || smashed == EL_PINGUIN) { - Bang(x,y+1); + Bang(x, y+1); return; } - else if (element==EL_EDELSTEIN_BD) + else if (element == EL_EDELSTEIN_BD) { if (IS_ENEMY(smashed) && IS_BD_ELEMENT(smashed)) { - Bang(x,y+1); + Bang(x, y+1); return; } } - else if (element==EL_FELSBROCKEN) + else if (element == EL_FELSBROCKEN) { - if (IS_ENEMY(smashed) || smashed==EL_BOMBE || smashed==EL_SONDE || - smashed==EL_SCHWEIN || smashed==EL_DRACHE) + if (IS_ENEMY(smashed) || smashed == EL_BOMBE || smashed == EL_SONDE || + smashed == EL_SCHWEIN || smashed == EL_DRACHE) { - Bang(x,y+1); + Bang(x, y+1); return; } - else if (!IS_MOVING(x,y+1)) + else if (!IS_MOVING(x, y+1)) { - if (smashed==EL_BIRNE_AUS || smashed==EL_BIRNE_EIN) + if (smashed == EL_BIRNE_AUS || smashed == EL_BIRNE_EIN) { - Bang(x,y+1); + Bang(x, y+1); return; } - else if (smashed==EL_KOKOSNUSS) + else if (smashed == EL_KOKOSNUSS) { Feld[x][y+1] = EL_CRACKINGNUT; - PlaySoundLevel(x,y,SND_KNACK); + PlaySoundLevel(x, y, SND_KNACK); RaiseScoreElement(EL_KOKOSNUSS); return; } - else if (smashed==EL_DIAMANT) + else if (smashed == EL_DIAMANT) { Feld[x][y+1] = EL_LEERRAUM; - PlaySoundLevel(x,y,SND_QUIRK); + PlaySoundLevel(x, y, SND_QUIRK); return; } } } } - /* Geräusch beim Durchqueren des Siebes */ - if (!lastline && (Feld[x][y+1]==EL_SIEB_LEER || Feld[x][y+1]==EL_SIEB2_LEER)) + /* play sound of magic wall / mill */ + if (!lastline && + (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER)) { - PlaySoundLevel(x,y,SND_QUIRK); + PlaySoundLevel(x, y, SND_QUIRK); return; } - /* Geräusch beim Auftreffen */ + /* play sound of object that hits the ground */ if (lastline || object_hit) { int sound; @@ -1122,7 +1316,7 @@ void Impact(int x, int y) } if (sound>=0) - PlaySoundLevel(x,y,sound); + PlaySoundLevel(x, y, sound); } } @@ -1130,20 +1324,20 @@ void TurnRound(int x, int y) { static struct { - int x,y; + int x, y; } move_xy[] = { - { 0,0 }, - {-1,0 }, - {+1,0 }, - { 0,0 }, - { 0,-1 }, - { 0,0 }, { 0,0 }, { 0,0 }, - { 0,+1 } + { 0, 0 }, + {-1, 0 }, + {+1, 0 }, + { 0, 0 }, + { 0, -1 }, + { 0, 0 }, { 0, 0 }, { 0, 0 }, + { 0, +1 } }; static struct { - int left,right,back; + int left, right, back; } turn[] = { { 0, 0, 0 }, @@ -1170,48 +1364,48 @@ void TurnRound(int x, int y) int right_x = x+right_dx, right_y = y+right_dy; int move_x = x+move_dx, move_y = y+move_dy; - if (element==EL_KAEFER || element==EL_BUTTERFLY) + if (element == EL_KAEFER || element == EL_BUTTERFLY) { - TestIfBadThingHitsOtherBadThing(x,y); + TestIfBadThingHitsOtherBadThing(x, y); - if (IN_LEV_FIELD(right_x,right_y) && - IS_FREE_OR_PLAYER(right_x,right_y)) + if (IN_LEV_FIELD(right_x, right_y) && + IS_FREE_OR_PLAYER(right_x, right_y)) MovDir[x][y] = right_dir; - else if (!IN_LEV_FIELD(move_x,move_y) || - !IS_FREE_OR_PLAYER(move_x,move_y)) + else if (!IN_LEV_FIELD(move_x, move_y) || + !IS_FREE_OR_PLAYER(move_x, move_y)) MovDir[x][y] = left_dir; - if (element==EL_KAEFER && MovDir[x][y] != old_move_dir) + if (element == EL_KAEFER && MovDir[x][y] != old_move_dir) MovDelay[x][y] = 9; - else if (element==EL_BUTTERFLY) /* && MovDir[x][y]==left_dir) */ + else if (element == EL_BUTTERFLY) /* && MovDir[x][y] == left_dir) */ MovDelay[x][y] = 1; } - else if (element==EL_FLIEGER || element==EL_FIREFLY) + else if (element == EL_FLIEGER || element == EL_FIREFLY) { - TestIfBadThingHitsOtherBadThing(x,y); + TestIfBadThingHitsOtherBadThing(x, y); - if (IN_LEV_FIELD(left_x,left_y) && - IS_FREE_OR_PLAYER(left_x,left_y)) + if (IN_LEV_FIELD(left_x, left_y) && + IS_FREE_OR_PLAYER(left_x, left_y)) MovDir[x][y] = left_dir; - else if (!IN_LEV_FIELD(move_x,move_y) || - !IS_FREE_OR_PLAYER(move_x,move_y)) + else if (!IN_LEV_FIELD(move_x, move_y) || + !IS_FREE_OR_PLAYER(move_x, move_y)) MovDir[x][y] = right_dir; - if (element==EL_FLIEGER && MovDir[x][y] != old_move_dir) + if (element == EL_FLIEGER && MovDir[x][y] != old_move_dir) MovDelay[x][y] = 9; - else if (element==EL_FIREFLY) /* && MovDir[x][y]==right_dir) */ + else if (element == EL_FIREFLY) /* && MovDir[x][y] == right_dir) */ MovDelay[x][y] = 1; } - else if (element==EL_MAMPFER) + else if (element == EL_MAMPFER) { - BOOL can_turn_left = FALSE, can_turn_right = FALSE; + boolean can_turn_left = FALSE, can_turn_right = FALSE; - if (IN_LEV_FIELD(left_x,left_y) && - (IS_FREE_OR_PLAYER(left_x,left_y) || + if (IN_LEV_FIELD(left_x, left_y) && + (IS_FREE_OR_PLAYER(left_x, left_y) || Feld[left_x][left_y] == EL_DIAMANT)) can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x,right_y) && - (IS_FREE_OR_PLAYER(right_x,right_y) || + if (IN_LEV_FIELD(right_x, right_y) && + (IS_FREE_OR_PLAYER(right_x, right_y) || Feld[right_x][right_y] == EL_DIAMANT)) can_turn_right = TRUE; @@ -1226,16 +1420,16 @@ void TurnRound(int x, int y) MovDelay[x][y] = 16+16*RND(3); } - else if (element==EL_MAMPFER2) + else if (element == EL_MAMPFER2) { - BOOL can_turn_left = FALSE, can_turn_right = FALSE; + boolean can_turn_left = FALSE, can_turn_right = FALSE; - if (IN_LEV_FIELD(left_x,left_y) && - (IS_FREE_OR_PLAYER(left_x,left_y) || + if (IN_LEV_FIELD(left_x, left_y) && + (IS_FREE_OR_PLAYER(left_x, left_y) || IS_MAMPF2(Feld[left_x][left_y]))) can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x,right_y) && - (IS_FREE_OR_PLAYER(right_x,right_y) || + if (IN_LEV_FIELD(right_x, right_y) && + (IS_FREE_OR_PLAYER(right_x, right_y) || IS_MAMPF2(Feld[right_x][right_y]))) can_turn_right = TRUE; @@ -1250,16 +1444,16 @@ void TurnRound(int x, int y) MovDelay[x][y] = 16+16*RND(3); } - else if (element==EL_PACMAN) + else if (element == EL_PACMAN) { - BOOL can_turn_left = FALSE, can_turn_right = FALSE; + boolean can_turn_left = FALSE, can_turn_right = FALSE; - if (IN_LEV_FIELD(left_x,left_y) && - (IS_FREE_OR_PLAYER(left_x,left_y) || + if (IN_LEV_FIELD(left_x, left_y) && + (IS_FREE_OR_PLAYER(left_x, left_y) || IS_AMOEBOID(Feld[left_x][left_y]))) can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x,right_y) && - (IS_FREE_OR_PLAYER(right_x,right_y) || + if (IN_LEV_FIELD(right_x, right_y) && + (IS_FREE_OR_PLAYER(right_x, right_y) || IS_AMOEBOID(Feld[right_x][right_y]))) can_turn_right = TRUE; @@ -1274,40 +1468,40 @@ void TurnRound(int x, int y) MovDelay[x][y] = 6+RND(40); } - else if (element==EL_SCHWEIN) + else if (element == EL_SCHWEIN) { - BOOL can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE; - BOOL should_turn_left = FALSE, should_turn_right = FALSE; - BOOL should_move_on = FALSE; + boolean can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE; + boolean should_turn_left = FALSE, should_turn_right = FALSE; + boolean should_move_on = FALSE; int rnd_value = 24; int rnd = RND(rnd_value); - if (IN_LEV_FIELD(left_x,left_y) && - (IS_FREE(left_x,left_y) || IS_GEM(Feld[left_x][left_y]))) + if (IN_LEV_FIELD(left_x, left_y) && + (IS_FREE(left_x, left_y) || IS_GEM(Feld[left_x][left_y]))) can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x,right_y) && - (IS_FREE(right_x,right_y) || IS_GEM(Feld[right_x][right_y]))) + if (IN_LEV_FIELD(right_x, right_y) && + (IS_FREE(right_x, right_y) || IS_GEM(Feld[right_x][right_y]))) can_turn_right = TRUE; - if (IN_LEV_FIELD(move_x,move_y) && - (IS_FREE(move_x,move_y) || IS_GEM(Feld[move_x][move_y]))) + if (IN_LEV_FIELD(move_x, move_y) && + (IS_FREE(move_x, move_y) || IS_GEM(Feld[move_x][move_y]))) can_move_on = TRUE; if (can_turn_left && (!can_move_on || - (IN_LEV_FIELD(x+back_dx+left_dx,y+back_dy+left_dy) && - !IS_FREE(x+back_dx+left_dx,y+back_dy+left_dy)))) + (IN_LEV_FIELD(x+back_dx+left_dx, y+back_dy+left_dy) && + !IS_FREE(x+back_dx+left_dx, y+back_dy+left_dy)))) should_turn_left = TRUE; if (can_turn_right && (!can_move_on || - (IN_LEV_FIELD(x+back_dx+right_dx,y+back_dy+right_dy) && - !IS_FREE(x+back_dx+right_dx,y+back_dy+right_dy)))) + (IN_LEV_FIELD(x+back_dx+right_dx, y+back_dy+right_dy) && + !IS_FREE(x+back_dx+right_dx, y+back_dy+right_dy)))) should_turn_right = TRUE; if (can_move_on && (!can_turn_left || !can_turn_right || - (IN_LEV_FIELD(x+move_dx+left_dx,y+move_dy+left_dy) && - !IS_FREE(x+move_dx+left_dx,y+move_dy+left_dy)) || - (IN_LEV_FIELD(x+move_dx+right_dx,y+move_dy+right_dy) && - !IS_FREE(x+move_dx+right_dx,y+move_dy+right_dy)))) + (IN_LEV_FIELD(x+move_dx+left_dx, y+move_dy+left_dy) && + !IS_FREE(x+move_dx+left_dx, y+move_dy+left_dy)) || + (IN_LEV_FIELD(x+move_dx+right_dx, y+move_dy+right_dy) && + !IS_FREE(x+move_dx+right_dx, y+move_dy+right_dy)))) should_move_on = TRUE; if (should_turn_left || should_turn_right || should_move_on) @@ -1340,23 +1534,23 @@ void TurnRound(int x, int y) else MovDir[x][y] = back_dir; - if (!IS_FREE(x+move_xy[MovDir[x][y]].x,y+move_xy[MovDir[x][y]].y) && + if (!IS_FREE(x+move_xy[MovDir[x][y]].x, y+move_xy[MovDir[x][y]].y) && !IS_GEM(Feld[x+move_xy[MovDir[x][y]].x][y+move_xy[MovDir[x][y]].y])) MovDir[x][y] = old_move_dir; MovDelay[x][y] = 0; } - else if (element==EL_DRACHE) + else if (element == EL_DRACHE) { - BOOL can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE; + boolean can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE; int rnd_value = 24; int rnd = RND(rnd_value); - if (IN_LEV_FIELD(left_x,left_y) && IS_FREE(left_x,left_y)) + if (IN_LEV_FIELD(left_x, left_y) && IS_FREE(left_x, left_y)) can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x,right_y) && IS_FREE(right_x,right_y)) + if (IN_LEV_FIELD(right_x, right_y) && IS_FREE(right_x, right_y)) can_turn_right = TRUE; - if (IN_LEV_FIELD(move_x,move_y) && IS_FREE(move_x,move_y)) + if (IN_LEV_FIELD(move_x, move_y) && IS_FREE(move_x, move_y)) can_move_on = TRUE; if (can_move_on && rnd > rnd_value/8) @@ -1370,13 +1564,13 @@ void TurnRound(int x, int y) else MovDir[x][y] = back_dir; - if (!IS_FREE(x+move_xy[MovDir[x][y]].x,y+move_xy[MovDir[x][y]].y)) + if (!IS_FREE(x+move_xy[MovDir[x][y]].x, y+move_xy[MovDir[x][y]].y)) MovDir[x][y] = old_move_dir; MovDelay[x][y] = 0; } - else if (element==EL_ROBOT || element==EL_SONDE || - element==EL_MAULWURF || element==EL_PINGUIN) + else if (element == EL_ROBOT || element == EL_SONDE || + element == EL_MAULWURF || element == EL_PINGUIN) { int attr_x = -1, attr_y = -1; @@ -1389,7 +1583,7 @@ void TurnRound(int x, int y) { int i; - for(i=0; ijx, jy = player->jy; @@ -1405,29 +1599,29 @@ void TurnRound(int x, int y) } } - if (element==EL_ROBOT && ZX>=0 && ZY>=0) + if (element == EL_ROBOT && ZX>=0 && ZY>=0) { attr_x = ZX; attr_y = ZY; } - if (element==EL_MAULWURF || element==EL_PINGUIN) + if (element == EL_MAULWURF || element == EL_PINGUIN) { int i; static int xy[4][2] = { - { 0,-1 }, - { -1,0 }, - { +1,0 }, - { 0,+1 } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; - for(i=0;i<4;i++) + for (i=0; i<4; i++) { int ex = x + xy[i%4][0]; int ey = y + xy[i%4][1]; - if (IN_LEV_FIELD(ex,ey) && Feld[ex][ey] == EL_AUSGANG_AUF) + if (IN_LEV_FIELD(ex, ey) && Feld[ex][ey] == EL_AUSGANG_AUF) { attr_x = ex; attr_y = ey; @@ -1446,15 +1640,15 @@ void TurnRound(int x, int y) else if (attr_y>y) MovDir[x][y] |= (AllPlayersGone ? MV_UP : MV_DOWN); - if (element==EL_ROBOT) + if (element == EL_ROBOT) { int newx, newy; if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN))) MovDir[x][y] &= (RND(2) ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN)); - Moving2Blocked(x,y,&newx,&newy); + Moving2Blocked(x, y, &newx, &newy); - if (IN_LEV_FIELD(newx,newy) && IS_FREE_OR_PLAYER(newx,newy)) + if (IN_LEV_FIELD(newx, newy) && IS_FREE_OR_PLAYER(newx, newy)) MovDelay[x][y] = 8+8*!RND(3); else MovDelay[x][y] = 16; @@ -1467,29 +1661,29 @@ void TurnRound(int x, int y) if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN))) { - BOOL first_horiz = RND(2); + boolean first_horiz = RND(2); int new_move_dir = MovDir[x][y]; MovDir[x][y] = new_move_dir & (first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN)); - Moving2Blocked(x,y,&newx,&newy); + Moving2Blocked(x, y, &newx, &newy); - if (IN_LEV_FIELD(newx,newy) && - (IS_FREE(newx,newy) || + if (IN_LEV_FIELD(newx, newy) && + (IS_FREE(newx, newy) || Feld[newx][newy] == EL_SALZSAEURE || - ((element == EL_MAULWURF || element==EL_PINGUIN) && + ((element == EL_MAULWURF || element == EL_PINGUIN) && (Feld[newx][newy] == EL_AUSGANG_AUF || IS_MAMPF3(Feld[newx][newy]))))) return; MovDir[x][y] = new_move_dir & (!first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN)); - Moving2Blocked(x,y,&newx,&newy); + Moving2Blocked(x, y, &newx, &newy); - if (IN_LEV_FIELD(newx,newy) && - (IS_FREE(newx,newy) || + if (IN_LEV_FIELD(newx, newy) && + (IS_FREE(newx, newy) || Feld[newx][newy] == EL_SALZSAEURE || - ((element == EL_MAULWURF || element==EL_PINGUIN) && + ((element == EL_MAULWURF || element == EL_PINGUIN) && (Feld[newx][newy] == EL_AUSGANG_AUF || IS_MAMPF3(Feld[newx][newy]))))) return; @@ -1501,11 +1695,11 @@ void TurnRound(int x, int y) } } -static BOOL JustBeingPushed(int x, int y) +static boolean JustBeingPushed(int x, int y) { int i; - for(i=0; ijy + (player->jy - player->last_jy); if (x == next_jx && y == next_jy) - return(TRUE); + return TRUE; } } - return(FALSE); + return FALSE; } void StartMoving(int x, int y) @@ -1532,19 +1726,19 @@ void StartMoving(int x, int y) if (CAN_FALL(element) && y0 && IS_PLAYER(x-1,y)) || (x0 && IS_PLAYER(x-1, y)) || (x0 && IS_FREE(x-1,y) && - (IS_FREE(x-1,y+1) || Feld[x-1][y+1]==EL_SALZSAEURE)); - BOOL right = (x0 && IS_FREE(x-1, y) && + (IS_FREE(x-1, y+1) || Feld[x-1][y+1] == EL_SALZSAEURE)); + boolean right = (x3) phase = 7-phase; - if (IN_SCR_FIELD(SCREENX(x),SCREENY(y))) - DrawGraphic(SCREENX(x),SCREENY(y), el2gfx(element)+phase); + if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawGraphic(SCREENX(x), SCREENY(y), el2gfx(element)+phase); - if ((element==EL_MAMPFER || element==EL_MAMPFER2) - && MovDelay[x][y]%4==3) - PlaySoundLevel(x,y,SND_NJAM); + if ((element == EL_MAMPFER || element == EL_MAMPFER2) + && MovDelay[x][y]%4 == 3) + PlaySoundLevel(x, y, SND_NJAM); } - else if (element==EL_DRACHE) + else if (element == EL_DRACHE) { int i; int dir = MovDir[x][y]; @@ -1711,33 +1905,33 @@ void StartMoving(int x, int y) dir == MV_DOWN ? GFX_FLAMMEN_DOWN : GFX_LEERRAUM); int phase = FrameCounter % 2; - for(i=1;i<=3;i++) + for (i=1; i<=3; i++) { int xx = x + i*dx, yy = y + i*dy; int sx = SCREENX(xx), sy = SCREENY(yy); - if (!IN_LEV_FIELD(xx,yy) || - IS_SOLID(Feld[xx][yy]) || Feld[xx][yy]==EL_EXPLODING) + if (!IN_LEV_FIELD(xx, yy) || + IS_SOLID(Feld[xx][yy]) || Feld[xx][yy] == EL_EXPLODING) break; if (MovDelay[x][y]) { - int flamed = MovingOrBlocked2Element(xx,yy); + int flamed = MovingOrBlocked2Element(xx, yy); if (IS_ENEMY(flamed) || IS_EXPLOSIVE(flamed)) - Bang(xx,yy); + Bang(xx, yy); else - RemoveMovingField(xx,yy); + RemoveMovingField(xx, yy); Feld[xx][yy] = EL_BURNING; - if (IN_SCR_FIELD(sx,sy)) - DrawGraphic(sx,sy, graphic + phase*3 + i-1); + if (IN_SCR_FIELD(sx, sy)) + DrawGraphic(sx, sy, graphic + phase*3 + i-1); } else { if (Feld[xx][yy] == EL_BURNING) Feld[xx][yy] = EL_LEERRAUM; - DrawLevelField(xx,yy); + DrawLevelField(xx, yy); } } } @@ -1746,45 +1940,45 @@ void StartMoving(int x, int y) return; } - if (element==EL_KAEFER || element==EL_BUTTERFLY) + if (element == EL_KAEFER || element == EL_BUTTERFLY) { - PlaySoundLevel(x,y,SND_KLAPPER); + PlaySoundLevel(x, y, SND_KLAPPER); } - else if (element==EL_FLIEGER || element==EL_FIREFLY) + else if (element == EL_FLIEGER || element == EL_FIREFLY) { - PlaySoundLevel(x,y,SND_ROEHR); + PlaySoundLevel(x, y, SND_ROEHR); } - /* neuer Schritt / Wartezustand beendet */ + /* now make next step */ - Moving2Blocked(x,y,&newx,&newy); /* wohin soll's gehen? */ + Moving2Blocked(x, y, &newx, &newy); /* get next screen position */ - if (IS_ENEMY(element) && IS_PLAYER(newx,newy)) + if (IS_ENEMY(element) && IS_PLAYER(newx, newy)) { - /* Spieler erwischt */ + /* enemy got the player */ MovDir[x][y] = 0; - KillHero(PLAYERINFO(newx,newy)); + KillHero(PLAYERINFO(newx, newy)); return; } else if ((element == EL_MAULWURF || element == EL_PINGUIN || - element==EL_ROBOT || element==EL_SONDE) && - IN_LEV_FIELD(newx,newy) && - MovDir[x][y]==MV_DOWN && Feld[newx][newy]==EL_SALZSAEURE) + element == EL_ROBOT || element == EL_SONDE) && + IN_LEV_FIELD(newx, newy) && + MovDir[x][y] == MV_DOWN && Feld[newx][newy] == EL_SALZSAEURE) { - Blurb(x,y); + Blurb(x, y); Store[x][y] = EL_SALZSAEURE; } else if ((element == EL_MAULWURF || element == EL_PINGUIN) && - IN_LEV_FIELD(newx,newy)) + IN_LEV_FIELD(newx, newy)) { if (Feld[newx][newy] == EL_AUSGANG_AUF) { Feld[x][y] = EL_LEERRAUM; - DrawLevelField(x,y); + DrawLevelField(x, y); - PlaySoundLevel(newx,newy,SND_BUING); - if (IN_SCR_FIELD(SCREENX(newx),SCREENY(newy))) - DrawGraphicThruMask(SCREENX(newx),SCREENY(newy),el2gfx(element)); + PlaySoundLevel(newx, newy, SND_BUING); + if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy))) + DrawGraphicThruMask(SCREENX(newx), SCREENY(newy), el2gfx(element)); local_player->friends_still_needed--; if (!local_player->friends_still_needed && @@ -1795,209 +1989,213 @@ void StartMoving(int x, int y) } else if (IS_MAMPF3(Feld[newx][newy])) { - if (DigField(local_player, newx,newy, 0,0, DF_DIG) == MF_MOVING) - DrawLevelField(newx,newy); + if (DigField(local_player, newx, newy, 0, 0, DF_DIG) == MF_MOVING) + DrawLevelField(newx, newy); else MovDir[x][y] = MV_NO_MOVING; } - else if (!IS_FREE(newx,newy)) + else if (!IS_FREE(newx, newy)) { - if (IS_PLAYER(x,y)) - DrawPlayerField(x,y); + if (IS_PLAYER(x, y)) + DrawPlayerField(x, y); else - DrawLevelField(x,y); + DrawLevelField(x, y); return; } } - else if (element == EL_SCHWEIN && IN_LEV_FIELD(newx,newy)) + else if (element == EL_SCHWEIN && IN_LEV_FIELD(newx, newy)) { if (IS_GEM(Feld[newx][newy])) { - if (IS_MOVING(newx,newy)) - RemoveMovingField(newx,newy); + if (IS_MOVING(newx, newy)) + RemoveMovingField(newx, newy); else { Feld[newx][newy] = EL_LEERRAUM; - DrawLevelField(newx,newy); + DrawLevelField(newx, newy); } } - else if (!IS_FREE(newx,newy)) + else if (!IS_FREE(newx, newy)) { - if (IS_PLAYER(x,y)) - DrawPlayerField(x,y); + if (IS_PLAYER(x, y)) + DrawPlayerField(x, y); else - DrawLevelField(x,y); + DrawLevelField(x, y); return; } } - else if (element==EL_DRACHE && IN_LEV_FIELD(newx,newy)) + else if (element == EL_DRACHE && IN_LEV_FIELD(newx, newy)) { - if (!IS_FREE(newx,newy)) + if (!IS_FREE(newx, newy)) { - if (IS_PLAYER(x,y)) - DrawPlayerField(x,y); + if (IS_PLAYER(x, y)) + DrawPlayerField(x, y); else - DrawLevelField(x,y); + DrawLevelField(x, y); return; } else { - BOOL wanna_flame = !RND(10); + boolean wanna_flame = !RND(10); int dx = newx - x, dy = newy - y; int newx1 = newx+1*dx, newy1 = newy+1*dy; int newx2 = newx+2*dx, newy2 = newy+2*dy; - int element1 = (IN_LEV_FIELD(newx1,newy1) ? - MovingOrBlocked2Element(newx1,newy1) : EL_BETON); - int element2 = (IN_LEV_FIELD(newx2,newy2) ? - MovingOrBlocked2Element(newx2,newy2) : EL_BETON); + int element1 = (IN_LEV_FIELD(newx1, newy1) ? + MovingOrBlocked2Element(newx1, newy1) : EL_BETON); + int element2 = (IN_LEV_FIELD(newx2, newy2) ? + MovingOrBlocked2Element(newx2, newy2) : EL_BETON); if ((wanna_flame || IS_ENEMY(element1) || IS_ENEMY(element2)) && element1 != EL_DRACHE && element2 != EL_DRACHE && element1 != EL_BURNING && element2 != EL_BURNING) { - if (IS_PLAYER(x,y)) - DrawPlayerField(x,y); + if (IS_PLAYER(x, y)) + DrawPlayerField(x, y); else - DrawLevelField(x,y); + DrawLevelField(x, y); MovDelay[x][y] = 50; Feld[newx][newy] = EL_BURNING; - if (IN_LEV_FIELD(newx1,newy1) && Feld[newx1][newy1] == EL_LEERRAUM) + if (IN_LEV_FIELD(newx1, newy1) && Feld[newx1][newy1] == EL_LEERRAUM) Feld[newx1][newy1] = EL_BURNING; - if (IN_LEV_FIELD(newx2,newy2) && Feld[newx2][newy2] == EL_LEERRAUM) + if (IN_LEV_FIELD(newx2, newy2) && Feld[newx2][newy2] == EL_LEERRAUM) Feld[newx2][newy2] = EL_BURNING; return; } } } - else if (element==EL_MAMPFER && IN_LEV_FIELD(newx,newy) && - Feld[newx][newy]==EL_DIAMANT) + else if (element == EL_MAMPFER && IN_LEV_FIELD(newx, newy) && + Feld[newx][newy] == EL_DIAMANT) { - if (IS_MOVING(newx,newy)) - RemoveMovingField(newx,newy); + if (IS_MOVING(newx, newy)) + RemoveMovingField(newx, newy); else { Feld[newx][newy] = EL_LEERRAUM; - DrawLevelField(newx,newy); + DrawLevelField(newx, newy); } } - else if (element==EL_MAMPFER2 && IN_LEV_FIELD(newx,newy) && + else if (element == EL_MAMPFER2 && IN_LEV_FIELD(newx, newy) && IS_MAMPF2(Feld[newx][newy])) { if (AmoebaNr[newx][newy]) { AmoebaCnt2[AmoebaNr[newx][newy]]--; - if (Feld[newx][newy]==EL_AMOEBE_VOLL || Feld[newx][newy]==EL_AMOEBE_BD) + if (Feld[newx][newy] == EL_AMOEBE_VOLL || + Feld[newx][newy] == EL_AMOEBE_BD) AmoebaCnt[AmoebaNr[newx][newy]]--; } - if (IS_MOVING(newx,newy)) - RemoveMovingField(newx,newy); + if (IS_MOVING(newx, newy)) + RemoveMovingField(newx, newy); else { Feld[newx][newy] = EL_LEERRAUM; - DrawLevelField(newx,newy); + DrawLevelField(newx, newy); } } - else if (element==EL_PACMAN && IN_LEV_FIELD(newx,newy) && + else if (element == EL_PACMAN && IN_LEV_FIELD(newx, newy) && IS_AMOEBOID(Feld[newx][newy])) { if (AmoebaNr[newx][newy]) { AmoebaCnt2[AmoebaNr[newx][newy]]--; - if (Feld[newx][newy]==EL_AMOEBE_VOLL || Feld[newx][newy]==EL_AMOEBE_BD) + if (Feld[newx][newy] == EL_AMOEBE_VOLL || + Feld[newx][newy] == EL_AMOEBE_BD) AmoebaCnt[AmoebaNr[newx][newy]]--; } Feld[newx][newy] = EL_LEERRAUM; - DrawLevelField(newx,newy); + DrawLevelField(newx, newy); } - else if (!IN_LEV_FIELD(newx,newy) || !IS_FREE(newx,newy)) - { /* gegen Wand gelaufen */ - TurnRound(x,y); + else if (!IN_LEV_FIELD(newx, newy) || !IS_FREE(newx, newy)) + { + /* object was running against a wall */ + + TurnRound(x, y); if (element == EL_KAEFER || element == EL_FLIEGER) - DrawLevelField(x,y); + DrawLevelField(x, y); else if (element == EL_BUTTERFLY || element == EL_FIREFLY) - DrawGraphicAnimation(x,y, el2gfx(element), 2, 4, ANIM_NORMAL); - else if (element==EL_SONDE) - DrawGraphicAnimation(x,y, GFX_SONDE_START, 8, 2, ANIM_NORMAL); + DrawGraphicAnimation(x, y, el2gfx(element), 2, 4, ANIM_NORMAL); + else if (element == EL_SONDE) + DrawGraphicAnimation(x, y, GFX_SONDE_START, 8, 2, ANIM_NORMAL); return; } - if (element==EL_ROBOT && IN_SCR_FIELD(x,y)) - PlaySoundLevel(x,y,SND_SCHLURF); + if (element == EL_ROBOT && IN_SCR_FIELD(x, y)) + PlaySoundLevel(x, y, SND_SCHLURF); - InitMovingField(x,y,MovDir[x][y]); + InitMovingField(x, y, MovDir[x][y]); } if (MovDir[x][y]) - ContinueMoving(x,y); + ContinueMoving(x, y); } void ContinueMoving(int x, int y) { int element = Feld[x][y]; int direction = MovDir[x][y]; - int dx = (direction==MV_LEFT ? -1 : direction==MV_RIGHT ? +1 : 0); - int dy = (direction==MV_UP ? -1 : direction==MV_DOWN ? +1 : 0); + int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); + int dy = (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); int horiz_move = (dx!=0); int newx = x + dx, newy = y + dy; int step = (horiz_move ? dx : dy) * TILEX/8; if (CAN_FALL(element) && horiz_move) step*=2; - else if (element==EL_TROPFEN) + else if (element == EL_TROPFEN) step/=2; - else if (Store[x][y]==EL_MORAST_VOLL || Store[x][y]==EL_MORAST_LEER) + else if (Store[x][y] == EL_MORAST_VOLL || Store[x][y] == EL_MORAST_LEER) step/=4; MovPos[x][y] += step; - if (ABS(MovPos[x][y])>=TILEX) /* Zielfeld erreicht */ + if (ABS(MovPos[x][y])>=TILEX) /* object reached its destination */ { Feld[x][y] = EL_LEERRAUM; Feld[newx][newy] = element; - if (Store[x][y]==EL_MORAST_VOLL) + if (Store[x][y] == EL_MORAST_VOLL) { Store[x][y] = 0; Feld[newx][newy] = EL_MORAST_VOLL; element = EL_MORAST_VOLL; } - else if (Store[x][y]==EL_MORAST_LEER) + else if (Store[x][y] == EL_MORAST_LEER) { Store[x][y] = 0; Feld[x][y] = EL_MORAST_LEER; } - else if (Store[x][y]==EL_SIEB_VOLL) + else if (Store[x][y] == EL_SIEB_VOLL) { Store[x][y] = 0; element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB_VOLL : EL_SIEB_TOT); } - else if (Store[x][y]==EL_SIEB_LEER) + 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); } - else if (Store[x][y]==EL_SIEB2_VOLL) + else if (Store[x][y] == EL_SIEB2_VOLL) { Store[x][y] = 0; element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB2_VOLL : EL_SIEB2_TOT); } - else if (Store[x][y]==EL_SIEB2_LEER) + 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); } - else if (Store[x][y]==EL_SALZSAEURE) + else if (Store[x][y] == EL_SALZSAEURE) { Store[x][y] = 0; Feld[newx][newy] = EL_SALZSAEURE; element = EL_SALZSAEURE; } - else if (Store[x][y]==EL_AMOEBE_NASS) + else if (Store[x][y] == EL_AMOEBE_NASS) { Store[x][y] = 0; Feld[x][y] = EL_AMOEBE_NASS; @@ -2009,27 +2207,27 @@ void ContinueMoving(int x, int y) if (!CAN_MOVE(element)) MovDir[newx][newy] = 0; - DrawLevelField(x,y); - DrawLevelField(newx,newy); + DrawLevelField(x, y); + DrawLevelField(newx, newy); Stop[newx][newy] = TRUE; JustHit[x][newy] = 3; - if (DONT_TOUCH(element)) /* Käfer oder Flieger */ + if (DONT_TOUCH(element)) /* object may be nasty to player or others */ { - TestIfBadThingHitsHero(newx,newy); - TestIfBadThingHitsFriend(newx,newy); - TestIfBadThingHitsOtherBadThing(newx,newy); + TestIfBadThingHitsHero(newx, newy); + TestIfBadThingHitsFriend(newx, newy); + TestIfBadThingHitsOtherBadThing(newx, newy); } else if (element == EL_PINGUIN) - TestIfFriendHitsBadThing(newx,newy); + TestIfFriendHitsBadThing(newx, newy); - if (CAN_SMASH(element) && direction==MV_DOWN && - (newy==lev_fieldy-1 || !IS_FREE(x,newy+1))) - Impact(x,newy); + if (CAN_SMASH(element) && direction == MV_DOWN && + (newy == lev_fieldy-1 || !IS_FREE(x, newy+1))) + Impact(x, newy); } - else /* noch in Bewegung */ - DrawLevelField(x,y); + else /* still moving on */ + DrawLevelField(x, y); } int AmoebeNachbarNr(int ax, int ay) @@ -2039,53 +2237,53 @@ int AmoebeNachbarNr(int ax, int ay) int group_nr = 0; static int xy[4][2] = { - { 0,-1 }, - { -1,0 }, - { +1,0 }, - { 0,+1 } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; - for(i=0;i<4;i++) + for (i=0; i<4; i++) { int x = ax+xy[i%4][0]; int y = ay+xy[i%4][1]; - if (!IN_LEV_FIELD(x,y)) + if (!IN_LEV_FIELD(x, y)) continue; - if (Feld[x][y]==element && AmoebaNr[x][y]>0) + if (Feld[x][y] == element && AmoebaNr[x][y]>0) group_nr = AmoebaNr[x][y]; } - return(group_nr); + return group_nr; } void AmoebenVereinigen(int ax, int ay) { - int i,x,y,xx,yy; + int i, x, y, xx, yy; int new_group_nr = AmoebaNr[ax][ay]; static int xy[4][2] = { - { 0,-1 }, - { -1,0 }, - { +1,0 }, - { 0,+1 } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; if (!new_group_nr) return; - for(i=0;i<4;i++) + for (i=0; i<4; i++) { x = ax+xy[i%4][0]; y = ay+xy[i%4][1]; - if (!IN_LEV_FIELD(x,y)) + if (!IN_LEV_FIELD(x, y)) continue; - if ((Feld[x][y]==EL_AMOEBE_VOLL || - Feld[x][y]==EL_AMOEBE_BD || - Feld[x][y]==EL_AMOEBE_TOT) && + if ((Feld[x][y] == EL_AMOEBE_VOLL || + Feld[x][y] == EL_AMOEBE_BD || + Feld[x][y] == EL_AMOEBE_TOT) && AmoebaNr[x][y] != new_group_nr) { int old_group_nr = AmoebaNr[x][y]; @@ -2095,8 +2293,8 @@ void AmoebenVereinigen(int ax, int ay) AmoebaCnt2[new_group_nr] += AmoebaCnt2[old_group_nr]; AmoebaCnt2[old_group_nr] = 0; - for(yy=0;yy= 200 && element==EL_AMOEBE_BD) + if (AmoebaCnt2[new_group_nr] >= 200 && element == EL_AMOEBE_BD) { - AmoebeUmwandeln2(newax,neway,EL_FELSBROCKEN); + AmoebeUmwandeln2(newax, neway, EL_FELSBROCKEN); return; } } } - if (element!=EL_AMOEBE_NASS || newaylife[1]) { Feld[xx][yy] = EL_LEERRAUM; if (!Stop[xx][yy]) - DrawLevelField(xx,yy); + DrawLevelField(xx, yy); Stop[xx][yy] = TRUE; } } - else if (IS_FREE(xx,yy) || Feld[xx][yy]==EL_ERDREICH) - { /* Randfeld ohne Amoebe */ + else if (IS_FREE(xx, yy) || Feld[xx][yy] == EL_ERDREICH) + { /* free border field */ if (nachbarn>=life[2] && nachbarn<=life[3]) { Feld[xx][yy] = element; - MovDelay[xx][yy] = (element==EL_LIFE ? 0 : life_time-1); + MovDelay[xx][yy] = (element == EL_LIFE ? 0 : life_time-1); if (!Stop[xx][yy]) - DrawLevelField(xx,yy); + DrawLevelField(xx, yy); Stop[xx][yy] = TRUE; } } @@ -2393,34 +2593,34 @@ void Life(int ax, int ay) void Ablenk(int x, int y) { - if (!MovDelay[x][y]) /* neue Phase / noch nicht gewartet */ + if (!MovDelay[x][y]) /* next animation frame */ MovDelay[x][y] = level.dauer_ablenk * FRAMES_PER_SECOND; - if (MovDelay[x][y]) /* neue Phase / in Wartezustand */ + if (MovDelay[x][y]) /* wait some time before next frame */ { MovDelay[x][y]--; if (MovDelay[x][y]) { - if (IN_SCR_FIELD(SCREENX(x),SCREENY(y))) - DrawGraphic(SCREENX(x),SCREENY(y),GFX_ABLENK+MovDelay[x][y]%4); + if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawGraphic(SCREENX(x), SCREENY(y), GFX_ABLENK+MovDelay[x][y]%4); if (!(MovDelay[x][y]%4)) - PlaySoundLevel(x,y,SND_MIEP); + PlaySoundLevel(x, y, SND_MIEP); return; } } Feld[x][y] = EL_ABLENK_AUS; - DrawLevelField(x,y); - if (ZX==x && ZY==y) + DrawLevelField(x, y); + if (ZX == x && ZY == y) ZX = ZY = -1; } void Birne(int x, int y) { - if (!MovDelay[x][y]) /* neue Phase / noch nicht gewartet */ + if (!MovDelay[x][y]) /* next animation frame */ MovDelay[x][y] = 800; - if (MovDelay[x][y]) /* neue Phase / in Wartezustand */ + if (MovDelay[x][y]) /* wait some time before next frame */ { MovDelay[x][y]--; if (MovDelay[x][y]) @@ -2431,7 +2631,7 @@ void Birne(int x, int y) Feld[x][y]=EL_ABLENK_EIN; else Feld[x][y]=EL_ABLENK_AUS; - DrawLevelField(x,y); + DrawLevelField(x, y); Feld[x][y]=EL_ABLENK_EIN; } return; @@ -2439,43 +2639,44 @@ void Birne(int x, int y) } Feld[x][y]=EL_ABLENK_AUS; - DrawLevelField(x,y); - if (ZX==x && ZY==y) + DrawLevelField(x, y); + if (ZX == x && ZY == y) ZX=ZY=-1; } void Blubber(int x, int y) { - if (y > 0 && IS_MOVING(x,y-1) && MovDir[x][y-1] == MV_DOWN) - DrawLevelField(x,y-1); + if (y > 0 && IS_MOVING(x, y-1) && MovDir[x][y-1] == MV_DOWN) + DrawLevelField(x, y-1); else - DrawGraphicAnimation(x,y, GFX_GEBLUBBER, 4, 10, ANIM_NORMAL); + DrawGraphicAnimation(x, y, GFX_GEBLUBBER, 4, 10, ANIM_NORMAL); } void NussKnacken(int x, int y) { - if (!MovDelay[x][y]) /* neue Phase / noch nicht gewartet */ + if (!MovDelay[x][y]) /* next animation frame */ MovDelay[x][y] = 7; - if (MovDelay[x][y]) /* neue Phase / in Wartezustand */ + if (MovDelay[x][y]) /* wait some time before next frame */ { MovDelay[x][y]--; - if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x),SCREENY(y))) - DrawGraphic(SCREENX(x),SCREENY(y),GFX_CRACKINGNUT+3-MovDelay[x][y]/2); + if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawGraphic(SCREENX(x), SCREENY(y), GFX_CRACKINGNUT+3-MovDelay[x][y]/2); if (!MovDelay[x][y]) { Feld[x][y] = EL_EDELSTEIN; - DrawLevelField(x,y); + DrawLevelField(x, y); } } } void SiebAktivieren(int x, int y, int typ) { - if (!(SiebAktiv % 4) && IN_SCR_FIELD(SCREENX(x),SCREENY(y))) - DrawGraphic(SCREENX(x),SCREENY(y), - (typ==1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL)+3-(SiebAktiv%16)/4); + if (!(SiebAktiv % 4) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawGraphic(SCREENX(x), SCREENY(y), + (typ == 1 ? GFX_SIEB_VOLL : + GFX_SIEB2_VOLL) + 3 - (SiebAktiv % 16) / 4); } void AusgangstuerPruefen(int x, int y) @@ -2498,51 +2699,51 @@ void AusgangstuerOeffnen(int x, int y) { int delay = 6; - if (!MovDelay[x][y]) /* neue Phase / noch nicht gewartet */ + if (!MovDelay[x][y]) /* next animation frame */ MovDelay[x][y] = 5*delay; - if (MovDelay[x][y]) /* neue Phase / in Wartezustand */ + if (MovDelay[x][y]) /* wait some time before next frame */ { int tuer; MovDelay[x][y]--; tuer = MovDelay[x][y]/delay; - if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCREENX(x),SCREENY(y))) - DrawGraphic(SCREENX(x),SCREENY(y),GFX_AUSGANG_AUF-tuer); + if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawGraphic(SCREENX(x), SCREENY(y), GFX_AUSGANG_AUF-tuer); if (!MovDelay[x][y]) { Feld[x][y] = EL_AUSGANG_AUF; - DrawLevelField(x,y); + DrawLevelField(x, y); } } } void AusgangstuerBlinken(int x, int y) { - DrawGraphicAnimation(x,y, GFX_AUSGANG_AUF, 4, 4, ANIM_OSCILLATE); + DrawGraphicAnimation(x, y, GFX_AUSGANG_AUF, 4, 4, ANIM_OSCILLATE); } void EdelsteinFunkeln(int x, int y) { - if (!IN_SCR_FIELD(SCREENX(x),SCREENY(y)) || IS_MOVING(x,y)) + if (!IN_SCR_FIELD(SCREENX(x), SCREENY(y)) || IS_MOVING(x, y)) return; if (Feld[x][y] == EL_EDELSTEIN_BD) - DrawGraphicAnimation(x,y, GFX_EDELSTEIN_BD, 4, 4, ANIM_REVERSE); + DrawGraphicAnimation(x, y, GFX_EDELSTEIN_BD, 4, 4, ANIM_REVERSE); else { - if (!MovDelay[x][y]) /* neue Phase / noch nicht gewartet */ + if (!MovDelay[x][y]) /* next animation frame */ MovDelay[x][y] = 11 * !SimpleRND(500); - if (MovDelay[x][y]) /* neue Phase / in Wartezustand */ + if (MovDelay[x][y]) /* wait some time before next frame */ { MovDelay[x][y]--; - if (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])); + DrawGraphic(SCREENX(x), SCREENY(y), el2gfx(Feld[x][y])); if (MovDelay[x][y]) { @@ -2551,17 +2752,17 @@ void EdelsteinFunkeln(int x, int y) if (phase > 2) phase = 4-phase; - DrawGraphicThruMask(SCREENX(x),SCREENY(y), GFX_FUNKELN_WEISS + phase); + DrawGraphicThruMask(SCREENX(x), SCREENY(y), GFX_FUNKELN_WEISS + phase); - if (direct_draw_on) + if (setup.direct_draw) { - int dest_x,dest_y; + int dest_x, dest_y; dest_x = FX + SCREENX(x)*TILEX; dest_y = FY + SCREENY(y)*TILEY; - XCopyArea(display,drawto_field,window,gc, - dest_x,dest_y, TILEX,TILEY, dest_x,dest_y); + XCopyArea(display, drawto_field, window, gc, + dest_x, dest_y, TILEX, TILEY, dest_x, dest_y); SetDrawtoField(DRAW_DIRECT); } } @@ -2573,105 +2774,159 @@ void MauerWaechst(int x, int y) { int delay = 6; - if (!MovDelay[x][y]) /* neue Phase / noch nicht gewartet */ + if (!MovDelay[x][y]) /* next animation frame */ MovDelay[x][y] = 3*delay; - if (MovDelay[x][y]) /* neue Phase / in Wartezustand */ + if (MovDelay[x][y]) /* wait some time before next frame */ { int phase; MovDelay[x][y]--; phase = 2-MovDelay[x][y]/delay; - if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCREENX(x),SCREENY(y))) - DrawGraphic(SCREENX(x),SCREENY(y), - (Store[x][y]==MV_LEFT ? GFX_MAUER_L1 : GFX_MAUER_R1)+phase); + if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawGraphic(SCREENX(x), SCREENY(y), + (MovDir[x][y] == MV_LEFT ? GFX_MAUER_LEFT : + MovDir[x][y] == MV_RIGHT ? GFX_MAUER_RIGHT : + MovDir[x][y] == MV_UP ? GFX_MAUER_UP : + GFX_MAUER_DOWN ) + phase); if (!MovDelay[x][y]) { - if (Store[x][y]==MV_LEFT) + if (MovDir[x][y] == MV_LEFT) { - if (IN_LEV_FIELD(x-1,y) && IS_MAUER(Feld[x-1][y])) - DrawLevelField(x-1,y); + if (IN_LEV_FIELD(x-1, y) && IS_MAUER(Feld[x-1][y])) + DrawLevelField(x-1, y); + } + else if (MovDir[x][y] == MV_RIGHT) + { + if (IN_LEV_FIELD(x+1, y) && IS_MAUER(Feld[x+1][y])) + DrawLevelField(x+1, y); + } + else if (MovDir[x][y] == MV_UP) + { + if (IN_LEV_FIELD(x, y-1) && IS_MAUER(Feld[x][y-1])) + DrawLevelField(x, y-1); } else { - if (IN_LEV_FIELD(x+1,y) && IS_MAUER(Feld[x+1][y])) - DrawLevelField(x+1,y); + if (IN_LEV_FIELD(x, y+1) && IS_MAUER(Feld[x][y+1])) + DrawLevelField(x, y+1); } - Feld[x][y] = EL_MAUER_LEBT; + Feld[x][y] = Store[x][y]; Store[x][y] = 0; - DrawLevelField(x,y); + MovDir[x][y] = MV_NO_MOVING; + DrawLevelField(x, y); } } } void MauerAbleger(int ax, int ay) { - BOOL links_frei = FALSE, rechts_frei = FALSE; - BOOL links_massiv = FALSE, rechts_massiv = FALSE; + int element = Feld[ax][ay]; + boolean oben_frei = FALSE, unten_frei = FALSE; + boolean links_frei = FALSE, rechts_frei = FALSE; + boolean oben_massiv = FALSE, unten_massiv = FALSE; + boolean links_massiv = FALSE, rechts_massiv = FALSE; - if (!MovDelay[ax][ay]) /* neue Mauer / noch nicht gewartet */ + if (!MovDelay[ax][ay]) /* start building new wall */ MovDelay[ax][ay] = 6; - if (MovDelay[ax][ay]) /* neue Mauer / in Wartezustand */ + if (MovDelay[ax][ay]) /* wait some time before building new wall */ { MovDelay[ax][ay]--; if (MovDelay[ax][ay]) return; } - if (IN_LEV_FIELD(ax-1,ay) && IS_FREE(ax-1,ay)) + if (IN_LEV_FIELD(ax, ay-1) && IS_FREE(ax, ay-1)) + oben_frei = TRUE; + if (IN_LEV_FIELD(ax, ay+1) && IS_FREE(ax, ay+1)) + unten_frei = TRUE; + if (IN_LEV_FIELD(ax-1, ay) && IS_FREE(ax-1, ay)) links_frei = TRUE; - if (IN_LEV_FIELD(ax+1,ay) && IS_FREE(ax+1,ay)) + if (IN_LEV_FIELD(ax+1, ay) && IS_FREE(ax+1, ay)) rechts_frei = TRUE; - if (links_frei) + if (element == EL_MAUER_Y || element == EL_MAUER_XY) { - Feld[ax-1][ay] = EL_MAUERND; - Store[ax-1][ay] = MV_LEFT; - if (IN_SCR_FIELD(SCREENX(ax-1),SCREENY(ay))) - DrawGraphic(SCREENX(ax-1),SCREENY(ay),GFX_MAUER_L1); + if (oben_frei) + { + Feld[ax][ay-1] = EL_MAUERND; + Store[ax][ay-1] = element; + MovDir[ax][ay-1] = MV_UP; + if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay-1))) + DrawGraphic(SCREENX(ax), SCREENY(ay-1), GFX_MAUER_UP); + } + if (unten_frei) + { + Feld[ax][ay+1] = EL_MAUERND; + Store[ax][ay+1] = element; + MovDir[ax][ay+1] = MV_DOWN; + if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay+1))) + DrawGraphic(SCREENX(ax), SCREENY(ay+1), GFX_MAUER_DOWN); + } } - if (rechts_frei) + + if (element == EL_MAUER_X || element == EL_MAUER_XY || + element == EL_MAUER_LEBT) { - Feld[ax+1][ay] = EL_MAUERND; - Store[ax+1][ay] = MV_RIGHT; - if (IN_SCR_FIELD(SCREENX(ax+1),SCREENY(ay))) - DrawGraphic(SCREENX(ax+1),SCREENY(ay),GFX_MAUER_R1); + if (links_frei) + { + Feld[ax-1][ay] = EL_MAUERND; + Store[ax-1][ay] = element; + MovDir[ax-1][ay] = MV_LEFT; + if (IN_SCR_FIELD(SCREENX(ax-1), SCREENY(ay))) + DrawGraphic(SCREENX(ax-1), SCREENY(ay), GFX_MAUER_LEFT); + } + if (rechts_frei) + { + Feld[ax+1][ay] = EL_MAUERND; + Store[ax+1][ay] = element; + MovDir[ax+1][ay] = MV_RIGHT; + if (IN_SCR_FIELD(SCREENX(ax+1), SCREENY(ay))) + DrawGraphic(SCREENX(ax+1), SCREENY(ay), GFX_MAUER_RIGHT); + } } - if (links_frei || rechts_frei) - DrawLevelField(ax,ay); + if (element == EL_MAUER_LEBT && (links_frei || rechts_frei)) + DrawLevelField(ax, ay); - if (!IN_LEV_FIELD(ax-1,ay) || IS_MAUER(Feld[ax-1][ay])) + if (!IN_LEV_FIELD(ax, ay-1) || IS_MAUER(Feld[ax][ay-1])) + oben_massiv = TRUE; + if (!IN_LEV_FIELD(ax, ay+1) || IS_MAUER(Feld[ax][ay+1])) + unten_massiv = TRUE; + if (!IN_LEV_FIELD(ax-1, ay) || IS_MAUER(Feld[ax-1][ay])) links_massiv = TRUE; - if (!IN_LEV_FIELD(ax+1,ay) || IS_MAUER(Feld[ax+1][ay])) + if (!IN_LEV_FIELD(ax+1, ay) || IS_MAUER(Feld[ax+1][ay])) rechts_massiv = TRUE; - if (links_massiv && rechts_massiv) + if (((oben_massiv && unten_massiv) || + element == EL_MAUER_X || element == EL_MAUER_LEBT) && + ((links_massiv && rechts_massiv) || + element == EL_MAUER_Y)) Feld[ax][ay] = EL_MAUERWERK; } void CheckForDragon(int x, int y) { - int i,j; - BOOL dragon_found = FALSE; + int i, j; + boolean dragon_found = FALSE; static int xy[4][2] = { - { 0,-1 }, - { -1,0 }, - { +1,0 }, - { 0,+1 } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; - for(i=0;i<4;i++) + for (i=0; i<4; i++) { - for(j=0;j<4;j++) + for (j=0; j<4; j++) { int xx = x + j*xy[i][0], yy = y + j*xy[i][1]; - if (IN_LEV_FIELD(xx,yy) && + if (IN_LEV_FIELD(xx, yy) && (Feld[xx][yy] == EL_BURNING || Feld[xx][yy] == EL_DRACHE)) { if (Feld[xx][yy] == EL_DRACHE) @@ -2684,16 +2939,16 @@ void CheckForDragon(int x, int y) if (!dragon_found) { - for(i=0;i<4;i++) + for (i=0; i<4; i++) { - for(j=0;j<3;j++) + for (j=0; j<3; j++) { int xx = x + j*xy[i][0], yy = y + j*xy[i][1]; - if (IN_LEV_FIELD(xx,yy) && Feld[xx][yy] == EL_BURNING) + if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == EL_BURNING) { Feld[xx][yy] = EL_LEERRAUM; - DrawLevelField(xx,yy); + DrawLevelField(xx, yy); } else break; @@ -2702,9 +2957,12 @@ void CheckForDragon(int x, int y) } } -void PlayerActions(struct PlayerInfo *player, int player_action) +static void PlayerActions(struct PlayerInfo *player, byte player_action) { - BOOL moved = FALSE, snapped = FALSE, bombed = FALSE; + 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; int right = player_action & JOY_RIGHT; @@ -2715,52 +2973,76 @@ void PlayerActions(struct PlayerInfo *player, int player_action) int dx = (left ? -1 : right ? 1 : 0); int dy = (up ? -1 : down ? 1 : 0); - if (!player->active || player->gone) + stored_player_action[player->index_nr] = 0; + num_stored_actions++; + + if (!player->active || player->gone || tape.pausing) return; if (player_action) { + save_tape_entry = TRUE; player->frame_reset_delay = 0; if (button1) - snapped = SnapField(player, dx,dy); + snapped = SnapField(player, dx, dy); else { if (button2) bombed = PlaceBomb(player); - moved = MoveFigure(player, dx,dy); + moved = MoveFigure(player, dx, dy); } if (tape.recording && (moved || snapped || bombed)) { if (bombed && !moved) player_action &= JOY_BUTTON; - TapeRecordAction(player_action); + + 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 */ + SnapField(player, 0, 0); /* stop snapping */ } else { - DigField(player, 0,0, 0,0, DF_NO_PUSH); - SnapField(player, 0,0); + DigField(player, 0, 0, 0, 0, DF_NO_PUSH); + SnapField(player, 0, 0); if (++player->frame_reset_delay > MoveSpeed) 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].joystickdata & (JOY_LEFT|JOY_RIGHT); + 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); - if (IN_LEV_FIELD(jx+dx,jy) && IS_PUSHABLE(Feld[jx+dx][jy])) + if (IN_LEV_FIELD(jx+dx, jy) && IS_PUSHABLE(Feld[jx+dx][jy])) { int el = Feld[jx+dx][jy]; - int push_delay = (IS_SB_ELEMENT(el) || el==EL_SONDE ? 2 : 10); + int push_delay = (IS_SB_ELEMENT(el) || el == EL_SONDE ? 2 : 10); if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay) { @@ -2773,133 +3055,260 @@ void PlayerActions(struct PlayerInfo *player, int player_action) } } -void GameActions(int player_action) +void GameActions() { - static long action_delay = 0; - long action_delay_value; + static unsigned long action_delay = 0; + unsigned long action_delay_value; int sieb_x = 0, sieb_y = 0; - int i, x,y, element; + int i, x, y, element; + byte *recorded_player_action; + byte summarized_player_action = 0; if (game_status != PLAYING) return; -#ifdef DEBUG action_delay_value = - (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GameFrameDelay); -#else - action_delay_value = - (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GAME_FRAME_DELAY); -#endif + (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay); + + /* + if (tape.playing && tape.fast_forward) + { + char buf[100]; + + sprintf(buf, "FFWD: %ld ms", action_delay_value); + print_debug(buf); + } + */ + /* main game synchronization point */ + + + + +#if 1 WaitUntilDelayReached(&action_delay, action_delay_value); +#else - for(i=0; ieffective_action = summarized_player_action; + + for (i=0; igone) + { + extern unsigned int last_RND(); + + printf("DEBUG: %03d last RND was %d \t [state checksum is %d]\n", + level.time - TimeLeft, + last_RND(), + getStateCheckSum(level.time - TimeLeft)); + } + */ +#endif + + + +#ifdef DEBUG + /* + if (GameFrameDelay >= 500) + printf("FrameCounter == %d\n", FrameCounter); + */ +#endif + + + + FrameCounter++; TimeFrames++; - for(y=0;y0) JustHit[x][y]--; #if DEBUG - if (IS_BLOCKED(x,y)) + if (IS_BLOCKED(x, y)) { - int oldx,oldy; + int oldx, oldy; - Blocked2Moving(x,y,&oldx,&oldy); - if (!IS_MOVING(oldx,oldy)) + Blocked2Moving(x, y, &oldx, &oldy); + if (!IS_MOVING(oldx, oldy)) { printf("GameActions(): (BLOCKED=>MOVING) context corrupted!\n"); - printf("GameActions(): BLOCKED: x = %d, y = %d\n",x,y); - printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n",oldx,oldy); + printf("GameActions(): BLOCKED: x = %d, y = %d\n", x, y); + printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n", oldx, oldy); printf("GameActions(): This should never happen!\n"); } } #endif } - for(y=0;yjx, jy = local_player->jy; - if (element==EL_SIEB_LEER || element==EL_SIEB_VOLL || - Store[x][y]==EL_SIEB_LEER) + if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL || + Store[x][y] == EL_SIEB_LEER) { SiebAktivieren(x, y, 1); sieb = TRUE; } - else if (element==EL_SIEB2_LEER || element==EL_SIEB2_VOLL || - Store[x][y]==EL_SIEB2_LEER) + else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL || + Store[x][y] == EL_SIEB2_LEER) { SiebAktivieren(x, y, 2); sieb = TRUE; @@ -2917,22 +3326,22 @@ void GameActions(int player_action) if (SiebAktiv) { if (!(SiebAktiv%4)) - PlaySoundLevel(sieb_x,sieb_y,SND_MIEP); + PlaySoundLevel(sieb_x, sieb_y, SND_MIEP); SiebAktiv--; if (!SiebAktiv) { - for(y=0;yGfxPos; - */ + int softscroll_offset = (setup.soft_scrolling ? TILEX : 0); + int x, y; - XCopyArea(display,drawto_field,drawto_field,gc, - FX + TILEX*(dx==-1) - softscroll_offset, - FY + TILEY*(dy==-1) - softscroll_offset, + XCopyArea(display, drawto_field, drawto_field, gc, + FX + TILEX*(dx == -1) - softscroll_offset, + FY + TILEY*(dy == -1) - softscroll_offset, SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset, SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset, - FX + TILEX*(dx==1) - softscroll_offset, - FY + TILEY*(dy==1) - softscroll_offset); + FX + TILEX*(dx == 1) - softscroll_offset, + FY + TILEY*(dy == 1) - softscroll_offset); if (dx) { - x = (dx==1 ? BX1 : BX2); - for(y=BY1; y<=BY2; y++) - DrawScreenField(x,y); + x = (dx == 1 ? BX1 : BX2); + for (y=BY1; y<=BY2; y++) + DrawScreenField(x, y); } if (dy) { - y = (dy==1 ? BY1 : BY2); - for(x=BX1; x<=BX2; x++) - DrawScreenField(x,y); + y = (dy == 1 ? BY1 : BY2); + for (x=BX1; x<=BX2; x++) + DrawScreenField(x, y); } redraw_mask |= REDRAW_FIELD; } -BOOL MoveFigureOneStep(struct PlayerInfo *player, - int dx, int dy, int real_dx, int real_dy) +boolean MoveFigureOneStep(struct PlayerInfo *player, + int dx, int dy, int real_dx, int real_dy) { int jx = player->jx, jy = player->jy; int new_jx = jx+dx, new_jy = jy+dy; @@ -3041,94 +3446,108 @@ BOOL MoveFigureOneStep(struct PlayerInfo *player, int can_move; if (player->gone || (!dx && !dy)) - return(MF_NO_ACTION); + return MF_NO_ACTION; player->MovDir = (dx < 0 ? MV_LEFT : dx > 0 ? MV_RIGHT : dy < 0 ? MV_UP : dy > 0 ? MV_DOWN : MV_NO_MOVING); - if (!IN_LEV_FIELD(new_jx,new_jy)) - return(MF_NO_ACTION); + if (!IN_LEV_FIELD(new_jx, new_jy)) + return MF_NO_ACTION; - if (!networking && !AllPlayersInSight(player, new_jx,new_jy)) - return(MF_NO_ACTION); + if (!options.network && !AllPlayersInSight(player, new_jx, new_jy)) + return MF_NO_ACTION; - element = MovingOrBlocked2Element(new_jx,new_jy); + element = MovingOrBlocked2Element(new_jx, new_jy); if (DONT_GO_TO(element)) { - if (element==EL_SALZSAEURE && dx==0 && dy==1) + if (element == EL_SALZSAEURE && dx == 0 && dy == 1) { - Blurb(jx,jy); + Blurb(jx, jy); Feld[jx][jy] = EL_SPIELFIGUR; - InitMovingField(jx,jy,MV_DOWN); + InitMovingField(jx, jy, MV_DOWN); Store[jx][jy] = EL_SALZSAEURE; - ContinueMoving(jx,jy); + ContinueMoving(jx, jy); BuryHero(player); } else KillHero(player); - return(MF_MOVING); + return MF_MOVING; } - can_move = DigField(player, new_jx,new_jy, real_dx,real_dy, DF_DIG); + can_move = DigField(player, new_jx, new_jy, real_dx, real_dy, DF_DIG); if (can_move != MF_MOVING) - return(can_move); + return can_move; StorePlayer[jx][jy] = 0; player->last_jx = jx; player->last_jy = jy; jx = player->jx = new_jx; jy = player->jy = new_jy; - StorePlayer[jx][jy] = EL_SPIELER1 + player->nr; + StorePlayer[jx][jy] = player->element_nr; player->MovPos = (dx > 0 || dy > 0 ? -1 : 1) * 7*TILEX/8; ScrollFigure(player, SCROLL_INIT); - return(MF_MOVING); + return MF_MOVING; } -BOOL MoveFigure(struct PlayerInfo *player, int dx, int dy) +boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) { int jx = player->jx, jy = player->jy; int old_jx = jx, old_jy = jy; int moved = MF_NO_ACTION; if (player->gone || (!dx && !dy)) - return(FALSE); + return FALSE; + + if (!FrameReached(&player->move_delay, MoveSpeed) && !tape.playing) + return FALSE; + + if (player->MovPos) + { + /* should only happen if pre-1.2 tape recordings are played */ + /* this is only for backward compatibility */ + +#if DEBUG + printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES.\n"); +#endif - if (!FrameReached(&player->move_delay,MoveSpeed) && !tape.playing) - return(FALSE); + 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))) - moved |= MoveFigureOneStep(player, dx,0, dx,dy); + if (!(moved |= MoveFigureOneStep(player, 0, dy, dx, dy))) + moved |= MoveFigureOneStep(player, dx, 0, dx, dy); } else { - if (!(moved |= MoveFigureOneStep(player, dx,0, dx,dy))) - moved |= MoveFigureOneStep(player, 0,dy, dx,dy); + if (!(moved |= MoveFigureOneStep(player, dx, 0, dx, dy))) + 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) + if (moved & MF_MOVING && !ScreenMovPos && + (player == local_player || !options.network)) { int old_scroll_x = scroll_x, old_scroll_y = scroll_y; - int offset = (scroll_delay_on ? 3 : 0); + int offset = (setup.scroll_delay ? 3 : 0); - if (!IN_VIS_FIELD(SCREENX(jx),SCREENY(jy))) + if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) { /* actual player has left the screen -- scroll in that direction */ if (jx != old_jx) /* player has moved horizontally */ @@ -3140,9 +3559,13 @@ BOOL MoveFigure(struct PlayerInfo *player, int dx, int dy) { 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 + 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); @@ -3154,9 +3577,13 @@ BOOL MoveFigure(struct PlayerInfo *player, int dx, int dy) } 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 + 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); @@ -3168,40 +3595,17 @@ BOOL MoveFigure(struct PlayerInfo *player, int dx, int dy) } } -#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 (networking || AllPlayersInVisibleScreen()) + if (!options.network && !AllPlayersInVisibleScreen()) { - ScrollScreen(player, SCROLL_INIT); - - /* - ScreenMovDir = player->MovDir; - ScreenMovPos = player->MovPos; - ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); - */ - - ScrollLevel(old_scroll_x - scroll_x, old_scroll_y - scroll_y); + scroll_x = old_scroll_x; + scroll_y = old_scroll_y; } else { - scroll_x = old_scroll_x; - scroll_y = old_scroll_y; + ScrollScreen(player, SCROLL_INIT); + ScrollLevel(old_scroll_x - scroll_x, old_scroll_y - scroll_y); } } } @@ -3218,19 +3622,19 @@ BOOL MoveFigure(struct PlayerInfo *player, int dx, int dy) else if (old_jx == jx && old_jy != jy) player->MovDir = (old_jy < jy ? MV_DOWN : MV_UP); - DrawLevelField(jx,jy); /* für "ErdreichAnbroeckeln()" */ + DrawLevelField(jx, jy); /* for "ErdreichAnbroeckeln()" */ player->last_move_dir = player->MovDir; } else player->last_move_dir = MV_NO_MOVING; - TestIfHeroHitsBadThing(jx,jy); + TestIfHeroHitsBadThing(jx, jy); if (player->gone) RemoveHero(player); - return(moved); + return moved; } void ScrollFigure(struct PlayerInfo *player, int mode) @@ -3246,38 +3650,18 @@ void ScrollFigure(struct PlayerInfo *player, int mode) player->actual_frame_counter = FrameCounter; player->GfxPos = ScrollStepSize * (player->MovPos / ScrollStepSize); - /* - ScreenGfxPos = local_player->GfxPos; - */ - if (Feld[last_jx][last_jy] == EL_LEERRAUM) Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING; DrawPlayer(player); return; } - else if (!FrameReached(&player->actual_frame_counter,1)) + else if (!FrameReached(&player->actual_frame_counter, 1)) return; player->MovPos += (player->MovPos > 0 ? -1 : 1) * TILEX/8; player->GfxPos = ScrollStepSize * (player->MovPos / ScrollStepSize); - /* - if (ScreenMovPos) - { - ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * TILEX/8; - ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); - } - */ - - /* - if (ScreenGfxPos && ScreenGfxPos != local_player->GfxPos) - { - ScreenGfxPos = local_player->GfxPos; - redraw_mask |= REDRAW_FIELD; - } - */ - if (Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING) Feld[last_jx][last_jy] = EL_LEERRAUM; @@ -3300,7 +3684,7 @@ void ScrollFigure(struct PlayerInfo *player, int mode) void ScrollScreen(struct PlayerInfo *player, int mode) { - static long screen_frame_counter = 0; + static unsigned long screen_frame_counter = 0; if (mode == SCROLL_INIT) { @@ -3310,17 +3694,11 @@ void ScrollScreen(struct PlayerInfo *player, int mode) ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); return; } - else if (!FrameReached(&screen_frame_counter,1)) + else if (!FrameReached(&screen_frame_counter, 1)) return; if (ScreenMovPos) { - /* - printf("ScreenMovDir = %d, ", ScreenMovDir); - printf("ScreenMovPos = %d, ", ScreenMovPos); - printf("ScreenGfxPos = %d\n", ScreenGfxPos); - */ - ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * TILEX/8; ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); redraw_mask |= REDRAW_FIELD; @@ -3334,10 +3712,10 @@ void TestIfGoodThingHitsBadThing(int goodx, int goody) int i, killx = goodx, killy = goody; static int xy[4][2] = { - { 0,-1 }, - { -1,0 }, - { +1,0 }, - { 0,+1 } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; static int harmless[4] = { @@ -3347,13 +3725,13 @@ void TestIfGoodThingHitsBadThing(int goodx, int goody) MV_DOWN }; - for(i=0; i<4; i++) + for (i=0; i<4; i++) { - int x,y, element; + int x, y, element; x = goodx + xy[i][0]; y = goody + xy[i][1]; - if (!IN_LEV_FIELD(x,y)) + if (!IN_LEV_FIELD(x, y)) continue; element = Feld[x][y]; @@ -3371,10 +3749,10 @@ void TestIfGoodThingHitsBadThing(int goodx, int goody) if (killx != goodx || killy != goody) { - if (IS_PLAYER(goodx,goody)) - KillHero(PLAYERINFO(goodx,goody)); + if (IS_PLAYER(goodx, goody)) + KillHero(PLAYERINFO(goodx, goody)); else - Bang(goodx,goody); + Bang(goodx, goody); } } @@ -3383,10 +3761,10 @@ void TestIfBadThingHitsGoodThing(int badx, int bady) int i, killx = badx, killy = bady; static int xy[4][2] = { - { 0,-1 }, - { -1,0 }, - { +1,0 }, - { 0,+1 } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; static int harmless[4] = { @@ -3396,18 +3774,18 @@ void TestIfBadThingHitsGoodThing(int badx, int bady) MV_DOWN }; - for(i=0; i<4; i++) + for (i=0; i<4; i++) { - int x,y, element; + int x, y, element; x = badx + xy[i][0]; y = bady + xy[i][1]; - if (!IN_LEV_FIELD(x,y)) + if (!IN_LEV_FIELD(x, y)) continue; element = Feld[x][y]; - if (IS_PLAYER(x,y)) + if (IS_PLAYER(x, y)) { killx = x; killy = y; @@ -3415,7 +3793,7 @@ void TestIfBadThingHitsGoodThing(int badx, int bady) } else if (element == EL_PINGUIN) { - if (MovDir[x][y] == harmless[i] && IS_MOVING(x,y)) + if (MovDir[x][y] == harmless[i] && IS_MOVING(x, y)) continue; killx = x; @@ -3426,35 +3804,31 @@ void TestIfBadThingHitsGoodThing(int badx, int bady) if (killx != badx || killy != bady) { - if (IS_PLAYER(killx,killy)) - KillHero(PLAYERINFO(killx,killy)); + if (IS_PLAYER(killx, killy)) + KillHero(PLAYERINFO(killx, killy)); else - Bang(killx,killy); + Bang(killx, killy); } } void TestIfHeroHitsBadThing(int x, int y) { - TestIfGoodThingHitsBadThing(x,y); + TestIfGoodThingHitsBadThing(x, y); } void TestIfBadThingHitsHero(int x, int y) { - /* - TestIfGoodThingHitsBadThing(JX,JY); - */ - - TestIfBadThingHitsGoodThing(x,y); + TestIfBadThingHitsGoodThing(x, y); } void TestIfFriendHitsBadThing(int x, int y) { - TestIfGoodThingHitsBadThing(x,y); + TestIfGoodThingHitsBadThing(x, y); } void TestIfBadThingHitsFriend(int x, int y) { - TestIfBadThingHitsGoodThing(x,y); + TestIfBadThingHitsGoodThing(x, y); } void TestIfBadThingHitsOtherBadThing(int badx, int bady) @@ -3462,19 +3836,19 @@ void TestIfBadThingHitsOtherBadThing(int badx, int bady) int i, killx = badx, killy = bady; static int xy[4][2] = { - { 0,-1 }, - { -1,0 }, - { +1,0 }, - { 0,+1 } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; - for(i=0; i<4; i++) + for (i=0; i<4; i++) { - int x,y, element; + int x, y, element; x=badx + xy[i][0]; y=bady + xy[i][1]; - if (!IN_LEV_FIELD(x,y)) + if (!IN_LEV_FIELD(x, y)) continue; element = Feld[x][y]; @@ -3488,7 +3862,7 @@ void TestIfBadThingHitsOtherBadThing(int badx, int bady) } if (killx != badx || killy != bady) - Bang(badx,bady); + Bang(badx, bady); } void KillHero(struct PlayerInfo *player) @@ -3501,7 +3875,7 @@ void KillHero(struct PlayerInfo *player) if (IS_PFORTE(Feld[jx][jy])) Feld[jx][jy] = EL_LEERRAUM; - Bang(jx,jy); + Bang(jx, jy); BuryHero(player); } @@ -3512,8 +3886,8 @@ void BuryHero(struct PlayerInfo *player) if (player->gone) return; - PlaySoundLevel(jx,jy, SND_AUTSCH); - PlaySoundLevel(jx,jy, SND_LACHEN); + PlaySoundLevel(jx, jy, SND_AUTSCH); + PlaySoundLevel(jx, jy, SND_LACHEN); player->GameOver = TRUE; RemoveHero(player); @@ -3527,7 +3901,7 @@ void RemoveHero(struct PlayerInfo *player) player->gone = TRUE; StorePlayer[jx][jy] = 0; - for(i=0; ipush_delay = 0; - return(MF_NO_ACTION); + return MF_NO_ACTION; } - if (IS_MOVING(x,y) || IS_PLAYER(x,y)) - return(MF_NO_ACTION); + if (IS_MOVING(x, y) || IS_PLAYER(x, y)) + return MF_NO_ACTION; element = Feld[x][y]; @@ -3574,7 +3948,7 @@ int DigField(struct PlayerInfo *player, case EL_EDELSTEIN_ROT: case EL_EDELSTEIN_LILA: case EL_DIAMANT: - RemoveField(x,y); + RemoveField(x, y); local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 : 1); if (local_player->gems_still_needed < 0) local_player->gems_still_needed = 0; @@ -3586,35 +3960,35 @@ int DigField(struct PlayerInfo *player, break; case EL_DYNAMIT_AUS: - RemoveField(x,y); + RemoveField(x, y); player->dynamite++; RaiseScoreElement(EL_DYNAMIT); DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW); - PlaySoundLevel(x,y,SND_PONG); + PlaySoundLevel(x, y, SND_PONG); break; case EL_DYNABOMB_NR: - RemoveField(x,y); + RemoveField(x, y); player->dynabomb_count++; player->dynabombs_left++; RaiseScoreElement(EL_DYNAMIT); - PlaySoundLevel(x,y,SND_PONG); + PlaySoundLevel(x, y, SND_PONG); break; case EL_DYNABOMB_SZ: - RemoveField(x,y); + RemoveField(x, y); player->dynabomb_size++; RaiseScoreElement(EL_DYNAMIT); - PlaySoundLevel(x,y,SND_PONG); + PlaySoundLevel(x, y, SND_PONG); break; case EL_DYNABOMB_XL: - RemoveField(x,y); + RemoveField(x, y); player->dynabomb_xl = TRUE; RaiseScoreElement(EL_DYNAMIT); - PlaySoundLevel(x,y,SND_PONG); + PlaySoundLevel(x, y, SND_PONG); break; case EL_SCHLUESSEL1: @@ -3624,16 +3998,16 @@ int DigField(struct PlayerInfo *player, { int key_nr = element-EL_SCHLUESSEL1; - RemoveField(x,y); + RemoveField(x, y); player->key[key_nr] = TRUE; RaiseScoreElement(EL_SCHLUESSEL); - DrawMiniGraphicExt(drawto,gc, - DX_KEYS+key_nr*MINI_TILEX,DY_KEYS, + DrawMiniGraphicExt(drawto, gc, + DX_KEYS+key_nr*MINI_TILEX, DY_KEYS, GFX_SCHLUESSEL1+key_nr); - DrawMiniGraphicExt(window,gc, - DX_KEYS+key_nr*MINI_TILEX,DY_KEYS, + DrawMiniGraphicExt(window, gc, + DX_KEYS+key_nr*MINI_TILEX, DY_KEYS, GFX_SCHLUESSEL1+key_nr); - PlaySoundLevel(x,y,SND_PONG); + PlaySoundLevel(x, y, SND_PONG); break; } @@ -3641,46 +4015,46 @@ int DigField(struct PlayerInfo *player, Feld[x][y] = EL_ABLENK_EIN; ZX = x; ZY = y; - DrawLevelField(x,y); - return(MF_ACTION); + DrawLevelField(x, y); + return MF_ACTION; break; case EL_FELSBROCKEN: case EL_BOMBE: case EL_KOKOSNUSS: case EL_ZEIT_LEER: - if (dy || mode==DF_SNAP) - return(MF_NO_ACTION); + if (dy || mode == DF_SNAP) + return MF_NO_ACTION; player->Pushing = TRUE; - if (!IN_LEV_FIELD(x+dx,y+dy) || !IS_FREE(x+dx,y+dy)) - return(MF_NO_ACTION); + if (!IN_LEV_FIELD(x+dx, y+dy) || !IS_FREE(x+dx, y+dy)) + return MF_NO_ACTION; if (real_dy) { - if (IN_LEV_FIELD(jx,jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy])) - return(MF_NO_ACTION); + if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy])) + return MF_NO_ACTION; } if (player->push_delay == 0) player->push_delay = FrameCounter; if (!FrameReached(&player->push_delay, player->push_delay_value) && !tape.playing) - return(MF_NO_ACTION); + return MF_NO_ACTION; - RemoveField(x,y); + RemoveField(x, y); Feld[x+dx][y+dy] = element; player->push_delay_value = 2+RND(8); - DrawLevelField(x+dx,y+dy); - if (element==EL_FELSBROCKEN) - PlaySoundLevel(x+dx,y+dy,SND_PUSCH); - else if (element==EL_KOKOSNUSS) - PlaySoundLevel(x+dx,y+dy,SND_KNURK); + DrawLevelField(x+dx, y+dy); + if (element == EL_FELSBROCKEN) + PlaySoundLevel(x+dx, y+dy, SND_PUSCH); + else if (element == EL_KOKOSNUSS) + PlaySoundLevel(x+dx, y+dy, SND_KNURK); else - PlaySoundLevel(x+dx,y+dy,SND_KLOPF); + PlaySoundLevel(x+dx, y+dy, SND_KLOPF); break; case EL_PFORTE1: @@ -3688,7 +4062,7 @@ int DigField(struct PlayerInfo *player, case EL_PFORTE3: case EL_PFORTE4: if (!player->key[element-EL_PFORTE1]) - return(MF_NO_ACTION); + return MF_NO_ACTION; break; case EL_PFORTE1X: @@ -3696,24 +4070,24 @@ int DigField(struct PlayerInfo *player, case EL_PFORTE3X: case EL_PFORTE4X: if (!player->key[element-EL_PFORTE1X]) - return(MF_NO_ACTION); + return MF_NO_ACTION; break; case EL_AUSGANG_ZU: case EL_AUSGANG_ACT: - /* Tür ist (noch) nicht offen! */ - return(MF_NO_ACTION); + /* door is not (yet) open */ + return MF_NO_ACTION; break; case EL_AUSGANG_AUF: - if (mode==DF_SNAP) - return(MF_NO_ACTION); + if (mode == DF_SNAP) + return MF_NO_ACTION; - PlaySoundLevel(x,y,SND_BUING); + PlaySoundLevel(x, y, SND_BUING); /* player->gone = TRUE; - PlaySoundLevel(x,y,SND_BUING); + PlaySoundLevel(x, y, SND_BUING); if (!local_player->friends_still_needed) player->LevelSolved = player->GameOver = TRUE; @@ -3724,18 +4098,18 @@ int DigField(struct PlayerInfo *player, case EL_BIRNE_AUS: Feld[x][y] = EL_BIRNE_EIN; local_player->lights_still_needed--; - DrawLevelField(x,y); - PlaySoundLevel(x,y,SND_DENG); - return(MF_ACTION); + DrawLevelField(x, y); + PlaySoundLevel(x, y, SND_DENG); + return MF_ACTION; break; case EL_ZEIT_VOLL: Feld[x][y] = EL_ZEIT_LEER; TimeLeft += 10; - DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW); - DrawLevelField(x,y); - PlaySoundStereo(SND_GONG,PSND_MAX_RIGHT); - return(MF_ACTION); + DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW); + DrawLevelField(x, y); + PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT); + return MF_ACTION; break; case EL_SOKOBAN_FELD_LEER: @@ -3744,33 +4118,33 @@ int DigField(struct PlayerInfo *player, case EL_SOKOBAN_FELD_VOLL: case EL_SOKOBAN_OBJEKT: case EL_SONDE: - if (mode==DF_SNAP) - return(MF_NO_ACTION); + if (mode == DF_SNAP) + return MF_NO_ACTION; player->Pushing = TRUE; - if (!IN_LEV_FIELD(x+dx,y+dy) - || (!IS_FREE(x+dx,y+dy) + if (!IN_LEV_FIELD(x+dx, y+dy) + || (!IS_FREE(x+dx, y+dy) && (Feld[x+dx][y+dy] != EL_SOKOBAN_FELD_LEER || !IS_SB_ELEMENT(element)))) - return(MF_NO_ACTION); + return MF_NO_ACTION; if (dx && real_dy) { - if (IN_LEV_FIELD(jx,jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy])) - return(MF_NO_ACTION); + if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy])) + return MF_NO_ACTION; } else if (dy && real_dx) { - if (IN_LEV_FIELD(jx+real_dx,jy) && !IS_SOLID(Feld[jx+real_dx][jy])) - return(MF_NO_ACTION); + if (IN_LEV_FIELD(jx+real_dx, jy) && !IS_SOLID(Feld[jx+real_dx][jy])) + return MF_NO_ACTION; } if (player->push_delay == 0) player->push_delay = FrameCounter; if (!FrameReached(&player->push_delay, player->push_delay_value) && !tape.playing) - return(MF_NO_ACTION); + return MF_NO_ACTION; if (IS_SB_ELEMENT(element)) { @@ -3780,36 +4154,36 @@ int DigField(struct PlayerInfo *player, local_player->sokobanfields_still_needed++; } else - RemoveField(x,y); + RemoveField(x, y); if (Feld[x+dx][y+dy] == EL_SOKOBAN_FELD_LEER) { Feld[x+dx][y+dy] = EL_SOKOBAN_FELD_VOLL; local_player->sokobanfields_still_needed--; if (element == EL_SOKOBAN_OBJEKT) - PlaySoundLevel(x,y,SND_DENG); + PlaySoundLevel(x, y, SND_DENG); } else Feld[x+dx][y+dy] = EL_SOKOBAN_OBJEKT; } else { - RemoveField(x,y); + RemoveField(x, y); Feld[x+dx][y+dy] = element; } player->push_delay_value = 2; - DrawLevelField(x,y); - DrawLevelField(x+dx,y+dy); - PlaySoundLevel(x+dx,y+dy,SND_PUSCH); + DrawLevelField(x, y); + DrawLevelField(x+dx, y+dy); + PlaySoundLevel(x+dx, y+dy, SND_PUSCH); if (IS_SB_ELEMENT(element) && local_player->sokobanfields_still_needed == 0 && game_emulation == EMU_SOKOBAN) { player->LevelSolved = player->GameOver = TRUE; - PlaySoundLevel(x,y,SND_BUING); + PlaySoundLevel(x, y, SND_BUING); } break; @@ -3821,63 +4195,64 @@ int DigField(struct PlayerInfo *player, break; default: - return(MF_NO_ACTION); + return MF_NO_ACTION; break; } player->push_delay = 0; - return(MF_MOVING); + return MF_MOVING; } -BOOL SnapField(struct PlayerInfo *player, int dx, int dy) +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)) - return(FALSE); + if (player->gone || !IN_LEV_FIELD(x, y)) + return FALSE; if (dx && dy) - return(FALSE); + return FALSE; if (!dx && !dy) { player->snapped = FALSE; - return(FALSE); + return FALSE; } if (player->snapped) - return(FALSE); + return FALSE; player->MovDir = (dx < 0 ? MV_LEFT : dx > 0 ? MV_RIGHT : dy < 0 ? MV_UP : dy > 0 ? MV_DOWN : MV_NO_MOVING); - if (!DigField(player, x,y, 0,0, DF_SNAP)) - return(FALSE); + if (!DigField(player, x, y, 0, 0, DF_SNAP)) + return FALSE; player->snapped = TRUE; - DrawLevelField(x,y); + DrawLevelField(x, y); BackToFront(); - return(TRUE); + return TRUE; } -BOOL PlaceBomb(struct PlayerInfo *player) +boolean PlaceBomb(struct PlayerInfo *player) { int jx = player->jx, jy = player->jy; int element; if (player->gone || player->MovPos) - return(FALSE); + return FALSE; element = Feld[jx][jy]; - if ((player->dynamite==0 && player->dynabombs_left==0) || - element==EL_DYNAMIT || element==EL_DYNABOMB || element==EL_EXPLODING) - return(FALSE); + if ((player->dynamite == 0 && player->dynabombs_left == 0) || + element == EL_DYNAMIT || element == EL_DYNABOMB || + element == EL_EXPLODING) + return FALSE; if (element != EL_LEERRAUM) Store[jx][jy] = element; @@ -3889,18 +4264,20 @@ BOOL PlaceBomb(struct PlayerInfo *player) player->dynamite--; DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW); - DrawGraphicThruMask(SCREENX(jx),SCREENY(jy),GFX_DYNAMIT); + if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy))) + DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT); } else { Feld[jx][jy] = EL_DYNABOMB; - Store2[jx][jy] = EL_SPIELER1 + player->nr; /* for DynaExplode() */ + Store2[jx][jy] = player->element_nr; /* for DynaExplode() */ MovDelay[jx][jy] = 96; player->dynabombs_left--; - DrawGraphicThruMask(SCREENX(jx),SCREENY(jy),GFX_DYNABOMB); + if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy))) + DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNABOMB); } - return(TRUE); + return TRUE; } void PlaySoundLevel(int x, int y, int sound_nr) @@ -3909,16 +4286,17 @@ void PlaySoundLevel(int x, int y, int sound_nr) int volume, stereo; int silence_distance = 8; - if ((!sound_simple_on && !IS_LOOP_SOUND(sound_nr)) || - (!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) || + if (!IN_LEV_FIELD(x, y) || sx < -silence_distance || sx >= SCR_FIELDX+silence_distance || sy < -silence_distance || sy >= SCR_FIELDY+silence_distance) return; volume = PSND_MAX_VOLUME; + #ifndef MSDOS stereo = (sx-SCR_FIELDX/2)*12; #else @@ -3927,7 +4305,7 @@ void PlaySoundLevel(int x, int y, int sound_nr) if(stereo < PSND_MAX_LEFT) stereo = PSND_MAX_LEFT; #endif - if (!IN_SCR_FIELD(sx,sy)) + if (!IN_SCR_FIELD(sx, sy)) { int dx = ABS(sx-SCR_FIELDX/2)-SCR_FIELDX/2; int dy = ABS(sy-SCR_FIELDY/2)-SCR_FIELDY/2;