X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FMainGameLoop.c;h=b72852921178bfc94c229f60176ddd92ade58401;hp=2a6d25515b21287fff51ec4edb236d1f1f8e7525;hb=475d747d7f6122bf9b62ccf1518fc7e8fc0f201c;hpb=97fb6c2a140f361991541bcf5a5c1e5d18deaf74 diff --git a/src/game_sp/MainGameLoop.c b/src/game_sp/MainGameLoop.c index 2a6d2551..b7285292 100644 --- a/src/game_sp/MainGameLoop.c +++ b/src/game_sp/MainGameLoop.c @@ -98,11 +98,10 @@ locExitMainGameLoop: void subCalculateScreenScrollPos() { - int ax, ay; - #if 1 int jump_pos = TILEX / 2; + /* handle wrap-around */ if (MurphyScreenXPos < -jump_pos) { MurphyScreenXPos = FieldWidth * TILEX + MurphyScreenXPos; @@ -122,17 +121,6 @@ void subCalculateScreenScrollPos() // printf("::: ExplosionShake [%d]\n", FrameCounter); } -#if 1 - ax = (SCR_FIELDX / 2) * TILESIZE; - ay = (SCR_FIELDY / 2) * TILESIZE; - - ScreenScrollXPos = MurphyScreenXPos - ax; - ScreenScrollYPos = MurphyScreenYPos - ay; -#else - ax = SXSIZE / 2; - ay = SYSIZE / 2; - - ScreenScrollXPos = (MurphyScreenXPos + TILEX / 2) - ax; - ScreenScrollYPos = (MurphyScreenYPos + TILEY / 2) - ay; -#endif + ScreenScrollXPos = MurphyScreenXPos - (SCR_FIELDX / 2) * TILESIZE; + ScreenScrollYPos = MurphyScreenYPos - (SCR_FIELDY / 2) * TILESIZE; }