X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_game.c;h=8729d1652d9a4fac65a4e00b27652a7bc5090062;hb=113a9a0fdeb78daec8c23413359763ef362a58d2;hp=fbd23b43498a2120609cd6c3496920bffa3500ef;hpb=6689304a6b2e10506949457dae724cb94f1ba71f;p=rocksndiamonds.git diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c index fbd23b43..8729d165 100644 --- a/src/game_mm/mm_game.c +++ b/src/game_mm/mm_game.c @@ -292,9 +292,6 @@ void InitGameEngine_MM() { int i, x, y; - /* set global editor control values */ - editor.draw_walls_masked = FALSE; - /* set global game control values */ game_mm.num_cycle = 0; game_mm.num_pacman = 0; @@ -310,6 +307,8 @@ void InitGameEngine_MM() game_mm.game_over = FALSE; game_mm.game_over_cause = 0; + game_mm.laser_overload_value = 0; + /* set global laser control values (must be set before "InitLaser()") */ laser.start_edge.x = 0; laser.start_edge.y = 0; @@ -351,7 +350,7 @@ void InitGameEngine_MM() DrawLevel_MM(); } -void InitGameEngine_MM_AfterFadingIn() +void InitGameActions_MM() { InitCycleElements(); InitLaser(); @@ -2925,6 +2924,8 @@ static void GameActions_MM_Ext(byte action[MAX_PLAYERS], boolean warp_mode) laser.overload_value = 0; } + game_mm.laser_overload_value = laser.overload_value; + if (laser.overload_value < MAX_LASER_OVERLOAD - 8) { int color_up = 0xFF * laser.overload_value / MAX_LASER_OVERLOAD;