X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=9e0327a491eac158a6907012e052b900287183eb;hb=def7303f9655be9d5fba4c313c61544fa284af2d;hp=e22a7367d4e296ffc6a0975c2723db1eed6dbdcc;hpb=5d264f3e98c7e526922ea961b85d558246fa14f4;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index e22a7367..9e0327a4 100644 --- a/src/game.c +++ b/src/game.c @@ -2840,6 +2840,19 @@ static void InitGameEngine(void) game.team_mode = (num_players > 1); } +#if 0 + printf("level %d: level.game_version == %06d\n", level_nr, + level.game_version); + printf(" tape.file_version == %06d\n", + tape.file_version); + printf(" tape.game_version == %06d\n", + tape.game_version); + printf(" tape.engine_version == %06d\n", + tape.engine_version); + printf(" => game.engine_version == %06d [tape mode: %s]\n", + game.engine_version, (tape.playing ? "PLAYING" : "RECORDING")); +#endif + // -------------------------------------------------------------------------- // set flags for bugs and changes according to active game engine version // -------------------------------------------------------------------------- @@ -2995,14 +3008,6 @@ static void InitGameEngine(void) if (use_amoeba_dropping_cannot_fall_bug) SET_PROPERTY(EL_AMOEBA_DROPPING, EP_CAN_FALL, FALSE); -#if 0 - printf("level %d: level version == %06d\n", level_nr, level.game_version); - printf(" tape version == %06d [%s] [file: %06d]\n", - tape.engine_version, (tape.playing ? "PLAYING" : "RECORDING"), - tape.file_version); - printf(" => game.engine_version == %06d\n", game.engine_version); -#endif - // ---------- initialize player's initial move delay ------------------------ // dynamically adjust player properties according to level information @@ -4389,12 +4394,6 @@ void UpdateEngineValues(int actual_scroll_x, int actual_scroll_y, { // this is used for non-R'n'D game engines to update certain engine values - if (level.game_engine_type == GAME_ENGINE_TYPE_EM) - { - actual_player_x = correctLevelPosX_EM(actual_player_x); - actual_player_y = correctLevelPosY_EM(actual_player_y); - } - // needed to determine if sounds are played within the visible screen area scroll_x = actual_scroll_x; scroll_y = actual_scroll_y; @@ -14853,9 +14852,9 @@ static void PlayLevelMusic(void) void PlayLevelSound_EM(int xx, int yy, int element_em, int sample) { int element = (element_em > -1 ? map_element_EM_to_RND_game(element_em) : 0); - int offset = (BorderElement == EL_STEELWALL ? 1 : 0); - int x = xx - 1 - offset; - int y = yy - 1 - offset; + int offset = 0; + int x = xx - offset; + int y = yy - offset; switch (sample) {