X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_game.c;h=84242f0be78ce1a6ff95bc6f8ee7d84f6658378d;hb=de400acbdd01156c04c9862e8d4331f11a14a282;hp=8729d1652d9a4fac65a4e00b27652a7bc5090062;hpb=113a9a0fdeb78daec8c23413359763ef362a58d2;p=rocksndiamonds.git diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c index 8729d165..84242f0b 100644 --- a/src/game_mm/mm_game.c +++ b/src/game_mm/mm_game.c @@ -66,9 +66,17 @@ #define DL_LASER_ENABLED 1 /* values for 'click_delay_value' in ClickElement() */ -#define CLICK_DELAY_SHORT 125 -#define CLICK_DELAY_LONG 250 -#define AUTO_ROTATE_DELAY CLICK_DELAY_SHORT +#define CLICK_DELAY_FIRST 12 /* delay (frames) after first click */ +#define CLICK_DELAY 6 /* delay (frames) for pressed butten */ + +#define AUTO_ROTATE_DELAY CLICK_DELAY +#define INIT_GAME_ACTIONS_DELAY (ONE_SECOND_DELAY / GAME_FRAME_DELAY) +#define NUM_INIT_CYCLE_STEPS 16 +#define PACMAN_MOVE_DELAY 12 +#define ENERGY_DELAY (4 * ONE_SECOND_DELAY / GAME_FRAME_DELAY) +#define HEALTH_DEC_DELAY 3 +#define HEALTH_INC_DELAY 9 +#define HEALTH_DELAY(x) ((x) ? HEALTH_DEC_DELAY : HEALTH_INC_DELAY) /* forward declaration for internal use */ static int MovingOrBlocked2Element_MM(int, int); @@ -80,6 +88,238 @@ static void ContinueMoving_MM(int, int); static void Moving2Blocked_MM(int, int, int *, int *); +#if 0 +// ============================================================================= +// TMP_dump_masks_MM (code) +// ============================================================================= + +void TMP_dump_masks_MM() +{ + int i; + + printf("static const char mm_masks[10][16][16] =\n"); + printf("{\n"); + + for (i = EL_MM_MASK_MCDUFFIN_RIGHT; i <= EL_MM_MASK_CIRCLE; i++) + { + int graphic_mask = el2gfx(i); + Bitmap *bitmap; + int src_x, src_y; + int x, y; + + getGraphicSource(graphic_mask, 0, &bitmap, &src_x, &src_y); + + printf(" {\n"); + + for (y = 0; y < TILEY; y += 2) + { + printf(" \""); + + for (x = 0; x < TILEX; x += 2) + { + Pixel pixel = GetPixel(bitmap, src_x + x, src_y + y); + + printf("%c", (pixel ? 'X' : ' ')); + } + + printf("\",\n"); + } + + printf(" },\n"); + } + + printf("};\n"); +} +#endif + +// ============================================================================= +// TMP_dump_masks_MM (result) +// ============================================================================= + +static const char mm_masks[10][16][16 + 1] = +{ + { + " ", + " XXXXX ", + " XXXXXXX ", + " XXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX", + " XXXXXXXXXXXXXX", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + }, + { + " ", + " XXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + }, + { + " ", + " XXXXXX ", + " XXXXXXXXX ", + " XXXXXXXXXXX ", + "XXXXXXXXXXXXX ", + "XXXXXXXXXXXXX ", + "XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + }, + { + " ", + " XXXXXX ", + " XXXXXXXX ", + " XXXXXXXXXX ", + " XXXXXXXXXXX ", + " XXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXX XXXXX ", + }, + { + " XXXXXX XXXXXX ", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + " ", + " ", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + " XXXXXX XXXXXX ", + }, + { + " XXXXXX XXXXXX ", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + " XXXXXX XXXXXX ", + " XXXXXX XXXXXX ", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + "XXXXXXX XXXXXXX", + " XXXXXX XXXXXX ", + }, + { + " XX XXXXX ", + " XXX XXXX ", + " XXXX XXX X", + " XXXXXXXXX XX", + " XXXXXXXXX XXX", + "XXXXXXXXX XXXX", + "XXXXXXXX XXXXX", + " XXXX XXX ", + " XXX XXXX ", + "XXXXX XXXXXXXX", + "XXXX XXXXXXXXX", + "XXX XXXXXXXXX ", + "XX XXXXXXXXX ", + "X XXX XXXX ", + " XXXX XXX ", + " XXXXX XX ", + }, + { + " XXXXX XX ", + " XXXX XXX ", + "X XXX XXXX ", + "XX XXXXXXXXX ", + "XXX XXXXXXXXX ", + "XXXX XXXXXXXXX", + "XXXXX XXXXXXXX", + " XXX XXXX ", + " XXXX XXX ", + "XXXXXXXX XXXXX", + "XXXXXXXXX XXXX", + " XXXXXXXXX XXX", + " XXXXXXXXX XX", + " XXXX XXX X", + " XXX XXXX ", + " XX XXXXX ", + }, + { + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + }, + { + " ", + " XXXX ", + " XXXXXXXX ", + " XXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXXXX ", + " XXXXXXXXXX ", + " XXXXXXXX ", + " XXXX ", + " ", + }, +}; + static int get_element_angle(int element) { int element_phase = get_element_phase(element); @@ -215,41 +455,28 @@ static void InitField(int x, int y, boolean init_game) } } -static void InitCycleElements() +static void InitCycleElements_RotateSingleStep() { - int i, j; + int i; if (game_mm.num_cycle == 0) /* no elements to cycle */ return; - for (i = 0; i < 16; i++) + for (i = 0; i < game_mm.num_cycle; i++) { - for (j = 0; j < game_mm.num_cycle; j++) - { - int x = game_mm.cycle[j].x; - int y = game_mm.cycle[j].y; - int step = SIGN(game_mm.cycle[j].steps); - int last_element = Feld[x][y]; - int next_element = get_rotated_element(last_element, step); - - if (!game_mm.cycle[j].steps) - continue; + int x = game_mm.cycle[i].x; + int y = game_mm.cycle[i].y; + int step = SIGN(game_mm.cycle[i].steps); + int last_element = Feld[x][y]; + int next_element = get_rotated_element(last_element, step); - Feld[x][y] = next_element; - - DrawField_MM(x, y); - game_mm.cycle[j].steps -= step; - } - - BackToFront(); - ColorCycling(); - -#ifdef DEBUG - if (setup.quick_doors) + if (!game_mm.cycle[i].steps) continue; -#endif - Delay(AUTO_ROTATE_DELAY); + Feld[x][y] = next_element; + + DrawField_MM(x, y); + game_mm.cycle[i].steps -= step; } } @@ -280,6 +507,9 @@ static void InitLaser() laser.num_beamers = 0; laser.beamer_edge[0] = 0; + laser.dest_element = EL_EMPTY; + laser.wall_mask = 0; + AddLaserEdge(LX, LY); /* set laser starting edge */ pen_ray = GetPixelFromRGB(window, @@ -292,12 +522,16 @@ void InitGameEngine_MM() { int i, x, y; +#if 0 + TMP_dump_masks_MM(); +#endif + /* set global game control values */ game_mm.num_cycle = 0; game_mm.num_pacman = 0; game_mm.score = 0; - game_mm.energy_left = native_mm_level.time; + game_mm.energy_left = 0; // later set to "native_mm_level.time" game_mm.kettles_still_needed = (native_mm_level.auto_count_kettles ? 0 : native_mm_level.kettles_needed); game_mm.lights_still_needed = 0; @@ -352,7 +586,10 @@ void InitGameEngine_MM() void InitGameActions_MM() { - InitCycleElements(); + int num_init_game_frames = INIT_GAME_ACTIONS_DELAY; + int cycle_steps_done = 0; + int i; + InitLaser(); #if 0 @@ -385,24 +622,26 @@ void InitGameActions_MM() OpenDoor(DOOR_OPEN_ALL); #endif - if (setup.sound_loops) - PlaySoundExt(SND_FUEL, SOUND_MAX_VOLUME, SOUND_MAX_RIGHT, SND_CTRL_PLAY_LOOP); - -#if 0 // !!! TEMPORARILY DISABLED !!! - for (i = 0; i <= game_mm.energy_left; i += 2) + for (i = 0; i <= num_init_game_frames; i++) { - if (!setup.sound_loops) - PlaySoundStereo(SND_FUEL, SOUND_MAX_RIGHT); + if (i == num_init_game_frames) + StopSound_MM(SND_MM_GAME_LEVELTIME_CHARGING); + else if (setup.sound_loops) + PlaySoundLoop_MM(SND_MM_GAME_LEVELTIME_CHARGING); + else + PlaySound_MM(SND_MM_GAME_LEVELTIME_CHARGING); -#if 0 - BlitBitmap(pix[PIX_DOOR], drawto, - DOOR_GFX_PAGEX4 + XX_ENERGY, - DOOR_GFX_PAGEY1 + YY_ENERGY + ENERGY_YSIZE - i, - ENERGY_XSIZE, i, - DX_ENERGY, DY_ENERGY + ENERGY_YSIZE - i); -#endif + game_mm.energy_left = native_mm_level.time * i / num_init_game_frames; + + UpdateAndDisplayGameControlValues(); + + while (cycle_steps_done < NUM_INIT_CYCLE_STEPS * i / num_init_game_frames) + { + InitCycleElements_RotateSingleStep(); + + cycle_steps_done++; + } - redraw_mask |= REDRAW_DOOR_1; BackToFront(); ColorCycling(); @@ -411,14 +650,8 @@ void InitGameActions_MM() if (setup.quick_doors) continue; #endif - - Delay(20); } - if (setup.sound_loops) - StopSound(SND_FUEL); -#endif - #if 0 if (setup.sound_music && num_bg_loops) PlayMusic(level_nr % num_bg_loops); @@ -531,17 +764,9 @@ int ScanPixel() } else { - int graphic_mask = getMaskFromElement(element); - Bitmap *bitmap; - int src_x, src_y; - int mask_x, mask_y; - - getGraphicSource(graphic_mask, 0, &bitmap, &src_x, &src_y); - - mask_x = src_x + dx; - mask_y = src_y + dy; + int pos = getMaskFromElement(element) - IMG_MM_MASK_MCDUFFIN_RIGHT; - pixel = (ReadPixel(bitmap, mask_x, mask_y) ? 1 : 0); + pixel = (mm_masks[pos][dy / 2][dx / 2] == 'X' ? 1 : 0); } } else @@ -744,7 +969,7 @@ void ScanLaser() if (rf) DrawLaser(rf - 1, DL_LASER_ENABLED); - Ct = CT = Counter(); + Ct = CT = FrameCounter; #if 0 if (!IN_LEV_FIELD(ELX, ELY)) @@ -1086,7 +1311,7 @@ boolean HitElement(int element, int hit_mask) ((element - EL_POLAR_START) % 2 || (element - EL_POLAR_START) / 2 != laser.current_angle % 8)) { - PlaySoundStereo(SND_KINK, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); laser.num_damages--; @@ -1096,7 +1321,7 @@ boolean HitElement(int element, int hit_mask) if (IS_POLAR_CROSS(element) && (element - EL_POLAR_CROSS_START) != laser.current_angle % 4) { - PlaySoundStereo(SND_KINK, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); laser.num_damages--; @@ -1174,7 +1399,7 @@ boolean HitElement(int element, int hit_mask) if ((!IS_POLAR(element) && !IS_POLAR_CROSS(element)) && current_angle != laser.current_angle) - PlaySoundStereo(SND_LASER, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); laser.overloaded = (get_opposite_angle(laser.current_angle) == @@ -1192,7 +1417,7 @@ boolean HitElement(int element, int hit_mask) if (element == EL_BOMB || element == EL_MINE) { - PlaySoundStereo(SND_KINK, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); if (element == EL_MINE) laser.overloaded = TRUE; @@ -1220,6 +1445,7 @@ boolean HitElement(int element, int hit_mask) if (game_mm.kettles_still_needed == 0) { + int exit_element = (element == EL_KETTLE ? EL_EXIT_OPEN : EL_RECEIVER); int x, y; static int xy[4][2] = { @@ -1229,7 +1455,7 @@ boolean HitElement(int element, int hit_mask) { 0, +1 } }; - PlaySoundStereo(SND_KLING, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, exit_element, MM_ACTION_OPENING); for (y = 0; y < lev_fieldy; y++) { @@ -1280,7 +1506,7 @@ boolean HitElement(int element, int hit_mask) if (element == EL_LIGHTBULB_OFF || element == EL_LIGHTBULB_ON) { - PlaySoundStereo(SND_KINK, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); DrawLaser(0, DL_LASER_ENABLED); @@ -1637,13 +1863,14 @@ boolean HitBlock(int element, int hit_mask) boolean HitLaserSource(int element, int hit_mask) { - if (HitOnlyAnEdge(element, hit_mask)) - return FALSE; + if (HitOnlyAnEdge(element, hit_mask)) + return FALSE; + + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); - PlaySoundStereo(SND_AUTSCH, ST(ELX)); - laser.overloaded = TRUE; + laser.overloaded = TRUE; - return TRUE; + return TRUE; } boolean HitLaserDestination(int element, int hit_mask) @@ -1656,7 +1883,8 @@ boolean HitLaserDestination(int element, int hit_mask) game_mm.kettles_still_needed == 0 && laser.current_angle == get_opposite_angle(get_element_angle(element)))) { - PlaySoundStereo(SND_HOLZ, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); + return TRUE; } @@ -1695,7 +1923,7 @@ boolean HitReflectingWalls(int element, int hit_mask) hit_mask == HIT_MASK_RIGHT || hit_mask == HIT_MASK_BOTTOM)) { - PlaySoundStereo(SND_HUI, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); LX -= XS; LY -= YS; @@ -1794,7 +2022,7 @@ boolean HitReflectingWalls(int element, int hit_mask) (hit_mask == HIT_MASK_TOPRIGHT || hit_mask == HIT_MASK_BOTTOMLEFT ? ANG_MIRROR_135 : ANG_MIRROR_45); - PlaySoundStereo(SND_HUI, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); AddDamagedField(ELX, ELY); AddLaserEdge(LX, LY); @@ -1830,7 +2058,7 @@ boolean HitReflectingWalls(int element, int hit_mask) hit_mask == (HIT_MASK_ALL ^ HIT_MASK_TOPRIGHT) ? ANG_MIRROR_135 : ANG_MIRROR_45); - PlaySoundStereo(SND_HUI, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); /* AddDamagedField(ELX, ELY); @@ -1923,7 +2151,7 @@ boolean HitAbsorbingWalls(int element, int hit_mask) element == EL_BLOCK_WOOD || element == EL_GATE_WOOD) { - PlaySoundStereo(SND_HOLZ, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING); return TRUE; } @@ -2184,17 +2412,19 @@ static void Explode_MM(int x, int y, int phase, int mode) { if (Store[x][y] == EL_BOMB) { - laser.num_damages--; DrawLaser(0, DL_LASER_DISABLED); - laser.num_edges = 0; + InitLaser(); Bang_MM(laser.start_edge.x, laser.start_edge.y); Store[x][y] = EL_EMPTY; + + game_mm.game_over = TRUE; + game_mm.game_over_cause = GAME_OVER_BOMB; + + laser.overloaded = FALSE; } else if (IS_MCDUFFIN(Store[x][y])) { - game_mm.game_over = TRUE; - game_mm.game_over_cause = GAME_OVER_BOMB; Store[x][y] = EL_EMPTY; } @@ -2276,13 +2506,13 @@ static void Bang_MM(int x, int y) } if (IS_PACMAN(element)) - PlaySoundStereo(SND_QUIEK, ST(x)); + PlayLevelSound_MM(x, y, element, MM_ACTION_EXPLODING); else if (element == EL_BOMB || IS_MCDUFFIN(element)) - PlaySoundStereo(SND_ROAAAR, ST(x)); + PlayLevelSound_MM(x, y, element, MM_ACTION_EXPLODING); else if (element == EL_KEY) - PlaySoundStereo(SND_KLING, ST(x)); + PlayLevelSound_MM(x, y, element, MM_ACTION_EXPLODING); else - PlaySoundStereo((mode == EX_SHORT ? SND_WHOOSH : SND_KABUMM), ST(x)); + PlayLevelSound_MM(x, y, element, MM_ACTION_EXPLODING); Explode_MM(x, y, EX_PHASE_START, mode); } @@ -2439,13 +2669,12 @@ static void ContinueMoving_MM(int x, int y) laser.redraw = TRUE; } -void ClickElement(int mx, int my, int button) +void ClickElement(int x, int y, int button) { static unsigned int click_delay = 0; - static int click_delay_value = CLICK_DELAY_SHORT; + static int click_delay_value = CLICK_DELAY; static boolean new_button = TRUE; int element; - int x = (mx - SX) / TILEX, y = (my - SY) / TILEY; /* do not rotate objects hit by the laser after the game was solved */ if (game_mm.level_solved && Hit[x][y]) @@ -2454,7 +2683,7 @@ void ClickElement(int mx, int my, int button) if (button == MB_RELEASED) { new_button = TRUE; - click_delay_value = CLICK_DELAY_SHORT; + click_delay_value = CLICK_DELAY; /* release eventually hold auto-rotating mirror */ RotateMirror(x, y, MB_RELEASED); @@ -2462,13 +2691,13 @@ void ClickElement(int mx, int my, int button) return; } - if (!DelayReached(&click_delay, click_delay_value) && !new_button) + if (!FrameReached(&click_delay, click_delay_value) && !new_button) return; if (button == MB_MIDDLEBUTTON) /* middle button has no function */ return; - if (!IN_PIX_FIELD(mx - SX, my - SY)) + if (!IN_LEV_FIELD(x, y)) return; if (Feld[x][y] == EL_EMPTY) @@ -2539,7 +2768,7 @@ void ClickElement(int mx, int my, int button) DrawLaser(0, DL_LASER_ENABLED); } - click_delay_value = (new_button ? CLICK_DELAY_LONG : CLICK_DELAY_SHORT); + click_delay_value = (new_button ? CLICK_DELAY_FIRST : CLICK_DELAY); new_button = FALSE; } @@ -2645,7 +2874,7 @@ void AutoRotateMirrors() static unsigned int rotate_delay = 0; int x, y; - if (!DelayReached(&rotate_delay, AUTO_ROTATE_DELAY)) + if (!FrameReached(&rotate_delay, AUTO_ROTATE_DELAY)) return; for (x = 0; x < lev_fieldx; x++) @@ -2737,9 +2966,9 @@ void ColorCycling(void) if (color_status == STATIC_COLORS) return; - CC = Counter(); + CC = FrameCounter; - if (CC < Cc || CC > Cc + 50) + if (CC < Cc || CC > Cc + 2) { Cc = CC; @@ -2771,9 +3000,8 @@ void ColorCycling(void) } } -static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) +static void GameActions_MM_Ext(struct MouseActionInfo action, boolean warp_mode) { - static unsigned int action_delay = 0; static unsigned int pacman_delay = 0; static unsigned int energy_delay = 0; static unsigned int overload_delay = 0; @@ -2782,8 +3010,6 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) int r, d; - WaitUntilDelayReached(&action_delay, GameFrameDelay); - for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++) Stop[x][y] = FALSE; @@ -2818,9 +3044,9 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) laser.redraw = FALSE; #endif - CT = Counter(); + CT = FrameCounter; - if (game_mm.num_pacman && DelayReached(&pacman_delay, 250)) + if (game_mm.num_pacman && FrameReached(&pacman_delay, PACMAN_MOVE_DELAY)) { MovePacMen(); @@ -2831,7 +3057,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) } } - if (DelayReached(&energy_delay, 4000)) + if (FrameReached(&energy_delay, ENERGY_DELAY)) { game_mm.energy_left--; if (game_mm.energy_left >= 0) @@ -2863,7 +3089,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) Delay(50); } - StopSound(SND_WARNTON); + StopSound_MM(SND_MM_GAME_HEALTH_CHARGING); FadeMusic(); DrawLaser(0, DL_LASER_DISABLED); @@ -2911,7 +3137,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) if (((laser.overloaded && laser.overload_value < MAX_LASER_OVERLOAD) || (!laser.overloaded && laser.overload_value > 0)) && - DelayReached(&overload_delay, 60 + !laser.overloaded * 120)) + FrameReached(&overload_delay, HEALTH_DELAY(laser.overloaded))) { if (laser.overloaded) laser.overload_value++; @@ -2942,20 +3168,17 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) (native_mm_level.laser_blue ? color_down : 0x00)); DrawLaser(0, DL_LASER_ENABLED); +#if 0 BackToFront(); - } - - if (laser.overloaded) - { - if (setup.sound_loops) - PlaySoundExt(SND_WARNTON, SOUND_MAX_VOLUME, SOUND_MAX_RIGHT, - SND_CTRL_PLAY_LOOP); - else - PlaySoundStereo(SND_WARNTON, SOUND_MAX_RIGHT); +#endif } if (!laser.overloaded) - StopSound(SND_WARNTON); + StopSound_MM(SND_MM_GAME_HEALTH_CHARGING); + else if (setup.sound_loops) + PlaySoundLoop_MM(SND_MM_GAME_HEALTH_CHARGING); + else + PlaySound_MM(SND_MM_GAME_HEALTH_CHARGING); if (laser.overloaded) { @@ -3025,7 +3248,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) CT -= Ct; - if (element == EL_BOMB && CT > 1500) + if (element == EL_BOMB && CT > 75) { if (game_mm.cheat_no_explosion) return; @@ -3063,7 +3286,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) return; } - if (element == EL_FUSE_ON && CT > 500) + if (element == EL_FUSE_ON && CT > 25) { laser.fuse_off = TRUE; laser.fuse_x = ELX; @@ -3073,7 +3296,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) DrawGraphic_MM(ELX, ELY, IMG_MM_FUSE); } - if (element == EL_BALL_GRAY && CT > 1500) + if (element == EL_BALL_GRAY && CT > 75) { static int new_elements[] = { @@ -3192,9 +3415,9 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) return; } - if (IS_WALL_ICE(element) && CT > 1000) + if (IS_WALL_ICE(element) && CT > 50) { - PlaySoundStereo(SND_SLURP, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_SHRINKING); { Feld[ELX][ELY] = Feld[ELX][ELY] - EL_WALL_ICE + EL_WALL_CHANGING; @@ -3244,7 +3467,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) return; } - if (IS_WALL_AMOEBA(element) && CT > 1200) + if (IS_WALL_AMOEBA(element) && CT > 60) { int k1, k2, k3, dx, dy, de, dm; int element2 = Feld[ELX][ELY]; @@ -3332,7 +3555,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) ScanLaser(); DrawLaser(0, DL_LASER_ENABLED); - PlaySoundStereo(SND_AMOEBE, ST(dx)); + PlayLevelSound_MM(dx, dy, element, MM_ACTION_GROWING); Feld[x][y] = Feld[x][y] - EL_WALL_AMOEBA + EL_WALL_CHANGING; Store[x][y] = EL_WALL_AMOEBA; @@ -3346,7 +3569,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) ScanLaser(); DrawLaser(0, DL_LASER_ENABLED); - PlaySoundStereo(SND_AMOEBE, ST(dx)); + PlayLevelSound_MM(dx, dy, element, MM_ACTION_GROWING); for (i = 4; i >= 0; i--) { @@ -3362,7 +3585,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) } if ((element == EL_BLOCK_WOOD || element == EL_BLOCK_STONE) && - laser.stops_inside_element && CT > 1500) + laser.stops_inside_element && CT > 75) { int x, y; int k; @@ -3400,7 +3623,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) return; } - PlaySoundStereo(SND_BONG, ST(ELX)); + PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_PUSHING); Feld[ELX][ELY] = 0; Feld[x][y] = element; @@ -3419,7 +3642,7 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) return; } - if (element == EL_FUEL_FULL && CT > 200) + if (element == EL_FUEL_FULL && CT > 10) { for (i = game_mm.energy_left; i <= MAX_LASER_ENERGY; i+=2) { @@ -3449,10 +3672,9 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) return; } -void GameActions_MM(byte action[MAX_PLAYERS], boolean warp_mode) +void GameActions_MM(struct MouseActionInfo action, boolean warp_mode) { - if (!button_status) - ClickElement(0, 0, MB_NOT_PRESSED); + ClickElement(action.lx, action.ly, action.button); GameActions_MM_Ext(action, warp_mode); } @@ -3522,7 +3744,7 @@ void MovePacMen() getGraphicSource(graphic, 0, &bitmap, &src_x, &src_y); - CT = Counter(); + CT = FrameCounter; ox = SX + ox * TILEX; oy = SY + oy * TILEY; @@ -3530,7 +3752,7 @@ void MovePacMen() BlitBitmap(bitmap, window, src_x, src_y, TILEX, TILEY, ox + i * mx, oy + i * my); - Ct = Ct + Counter() - CT; + Ct = Ct + FrameCounter - CT; } DrawField_MM(nx, ny);