X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FMainForm.c;h=d33191d69d585ea4b62a522164c8d11c107e750a;hb=9c299f0c6d66d7d0a246bbecdf2669fe5db25547;hp=c54bf63d21a3dbfd774b58b12ccd38dda746d2ce;hpb=c6d59064aa782b8ad71eddac2797fdc50e4858f9;p=rocksndiamonds.git diff --git a/src/game_sp/MainForm.c b/src/game_sp/MainForm.c index c54bf63d..d33191d6 100644 --- a/src/game_sp/MainForm.c +++ b/src/game_sp/MainForm.c @@ -187,14 +187,30 @@ static void ReStretch() void SetScrollEdges() { +#if NEW_TILESIZE +#if 0 + int pseudo_sxsize = SXSIZE * TILESIZE / TILESIZE_VAR; + int pseudo_sysize = SYSIZE * TILESIZE / TILESIZE_VAR; +#endif +#endif int border1_offset = (menBorder ? 1 : 2); int border2_offset = (menBorder ? 0 : TILESIZE / 2); /* scroll correction for border frame (1 tile) or border element (2 tiles) */ ScrollMinX = 0; ScrollMinY = 0; +#if NEW_TILESIZE +#if 1 + ScrollMaxX = (DisplayMaxX + border1_offset - SCR_FIELDX) * TILEX; + ScrollMaxY = (DisplayMaxY + border1_offset - SCR_FIELDY) * TILEY; +#else + ScrollMaxX = (DisplayMaxX + border1_offset) * TILEX - pseudo_sxsize; + ScrollMaxY = (DisplayMaxY + border1_offset) * TILEY - pseudo_sysize; +#endif +#else ScrollMaxX = (DisplayMaxX + border1_offset) * TILEX - SXSIZE; ScrollMaxY = (DisplayMaxY + border1_offset) * TILEY - SYSIZE; +#endif /* scroll correction for border element (half tile on left and right side) */ ScrollMinX += border2_offset;