X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FDDScrollBuffer.c;h=62257d0314c403d026e83152cec72c5999d31e95;hp=e9b94f96a367679080f1c92f64661b2ae3073708;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=572a4bab20b6f36ef1a4782094b27ac5a703a476 diff --git a/src/game_sp/DDScrollBuffer.c b/src/game_sp/DDScrollBuffer.c index e9b94f96..62257d03 100644 --- a/src/game_sp/DDScrollBuffer.c +++ b/src/game_sp/DDScrollBuffer.c @@ -7,552 +7,253 @@ #include -// --- VERSION 1.0 CLASS -// --- BEGIN -// --- MultiUse = -1 'True // True -// --- Persistable = 0 'NotPersistable // NotPersistable -// --- DataBindingBehavior = 0 'vbNone // vbNone -// --- DataSourceBehavior = 0 'vbNone // vbNone -// --- MTSTransactionMode = 0 'NotAnMTSObject // NotAnMTSObject -// --- END +int mScrollX, mScrollY; +int mScrollX_last, mScrollY_last; -// static char *VB_Name = "DDScrollBuffer"; -// static boolean VB_GlobalNameSpace = False; -// static boolean VB_Creatable = True; -// static boolean VB_PredeclaredId = False; -// static boolean VB_Exposed = False; +int ScreenBuffer[2 + MAX_PLAYFIELD_WIDTH + 2][2 + MAX_PLAYFIELD_HEIGHT + 2]; -// --- Option Explicit -// needs reference to: DirectX7 for Visual Basic Type Library +int getFieldbufferOffsetX_SP(void) +{ + int px = 2 * TILEX + (mScrollX - mScrollX_last) % TILEX; + + /* scroll correction for even number of visible tiles (half tile shifted) */ + px += game_sp.scroll_xoffset; -DirectDrawSurface7 Buffer; -DirectDrawSurface7 mPrimary; -long mWidth, mHeight; -long mhWnd; -long mScrollX, mScrollY; -long mDestXOff, mDestYOff; + if (ExplosionShakeMurphy != 0) + px += TILEX / 2 - GetSimpleRandom(TILEX + 1); -long ScreenBuffer[MAX_BUF_XSIZE][MAX_BUF_YSIZE]; -boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE]; + px = px * TILESIZE_VAR / TILESIZE; + return px; +} -void UpdatePlayfield() +int getFieldbufferOffsetY_SP(void) { + int py = 2 * TILEY + (mScrollY - mScrollY_last) % TILEY; + + /* scroll correction for even number of visible tiles (half tile shifted) */ + py += game_sp.scroll_yoffset; + + if (ExplosionShakeMurphy != 0) + py += TILEY / 2 - GetSimpleRandom(TILEX + 1); + + py = py * TILESIZE_VAR / TILESIZE; + + return py; +} + +void RestorePlayfield(void) +{ + int x1 = mScrollX / TILEX - 2; + int y1 = mScrollY / TILEY - 2; + int x2 = mScrollX / TILEX + (SCR_FIELDX - 1) + 2; + int y2 = mScrollY / TILEY + (SCR_FIELDY - 1) + 2; int x, y; - int sx1 = mScrollX - TILEX; - int sy1 = mScrollY - TILEY; - int sx2 = mScrollX + SXSIZE + TILEX; - int sy2 = mScrollY + SYSIZE + TILEY; - int x1 = sx1 / TILEX; - int y1 = sy1 / TILEY; - int x2 = sx2 / TILEX; - int y2 = sy2 / TILEY; + + DrawFrameIfNeeded(); for (y = DisplayMinY; y <= DisplayMaxY; y++) { for (x = DisplayMinX; x <= DisplayMaxX; x++) { - if (x >= x1 && x < x2 && y >= y1 && y < y2) + if (x >= x1 && x <= x2 && y >= y1 && y <= y2) { - int sx = x - x1; - int sy = y - y1; - int tsi = GetSI(x, y); - long id = ((PlayField16[tsi]) | - (PlayField8[tsi] << 16) | - (DisPlayField[tsi] << 24)); - boolean redraw_screen_tile = (ScreenBuffer[sx][sy] != id); - - if (redraw_screen_tile) - { - DrawFieldNoAnimated(x, y); - DrawFieldAnimated(x, y); - - ScreenBuffer[sx][sy] = id; - - redraw[sx][sy] = TRUE; - redraw_tiles++; - } + DrawFieldNoAnimated(x, y); + DrawFieldAnimated(x, y); } } } } -void OLD_UpdatePlayfield() +static void ScrollPlayfield(int dx, int dy) { + int x1 = mScrollX_last / TILEX - 2; + int y1 = mScrollY_last / TILEY - 2; + int x2 = mScrollX_last / TILEX + (SCR_FIELDX - 1) + 2; + int y2 = mScrollY_last / TILEY + (SCR_FIELDY - 1) + 2; int x, y; - int left = mScrollX / TILEX; - int top = mScrollY / TILEY; - for (y = top; y < top + MAX_BUF_YSIZE; y++) + BlitBitmap(bitmap_db_field_sp, bitmap_db_field_sp, + TILEX_VAR * (dx == -1), + TILEY_VAR * (dy == -1), + (MAX_BUF_XSIZE * TILEX_VAR) - TILEX_VAR * (dx != 0), + (MAX_BUF_YSIZE * TILEY_VAR) - TILEY_VAR * (dy != 0), + TILEX_VAR * (dx == 1), + TILEY_VAR * (dy == 1)); + + DrawFrameIfNeeded(); + + for (y = DisplayMinY; y <= DisplayMaxY; y++) { - for (x = left; x < left + MAX_BUF_XSIZE; x++) + for (x = DisplayMinX; x <= DisplayMaxX; x++) { - int sx = x % MAX_BUF_XSIZE; - int sy = y % MAX_BUF_YSIZE; - int tsi = GetSI(x, y); - long id = ((PlayField16[tsi]) | - (PlayField8[tsi] << 16) | - (DisPlayField[tsi] << 24)); - boolean redraw_screen_tile = (ScreenBuffer[sx][sy] != id); - - if (redraw_screen_tile) + if (x >= x1 && x <= x2 && y >= y1 && y <= y2) { - DrawFieldNoAnimated(x, y); - DrawFieldAnimated(x, y); + int sx = x - x1; + int sy = y - y1; + int tsi = GetSI(x, y); + int id = ((PlayField16[tsi]) | + (PlayField8[tsi] << 16) | + (DisPlayField[tsi] << 24)); + + if ((dx == -1 && x == x2) || + (dx == +1 && x == x1) || + (dy == -1 && y == y2) || + (dy == +1 && y == y1)) + { + DrawFieldNoAnimated(x, y); + DrawFieldAnimated(x, y); + } ScreenBuffer[sx][sy] = id; - - redraw[sx][sy] = TRUE; - redraw_tiles++; } } } } -void DDScrollBuffer_Let_DestXOff(long NewVal) -{ - mDestXOff = NewVal; -} - -long DDScrollBuffer_Get_DestXOff() -{ - long DestXOff; - - DestXOff = mDestXOff; - - return DestXOff; -} - -void DDScrollBuffer_Let_DestYOff(long NewVal) -{ - mDestYOff = NewVal; -} - -long DDScrollBuffer_Get_DestYOff() +static void ScrollPlayfieldIfNeededExt(boolean reset) { - long DestYOff; - - DestYOff = mDestYOff; - - return DestYOff; -} - -DirectDrawSurface7 DDScrollBuffer_Get_Surface() -{ - DirectDrawSurface7 Surface; - - Surface = Buffer; - - return Surface; -} - -long DDScrollBuffer_Get_Width() -{ - long Width; - - Width = mWidth; - - return Width; -} - -int DDScrollBuffer_Get_Height() -{ - int Height; - - Height = mHeight; - - return Height; -} - -long DDScrollBuffer_CreateAtSize(long Width, long Height, long hWndViewPort) -{ - long CreateAtSize; - - DDSURFACEDESC2 SD; - - CreateAtSize = 0; - mhWnd = hWndViewPort; - // Create ScrollBuffer: + if (reset) { - SD.lFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - SD.ddsCaps.lCaps = DDSCAPS_VIDEOMEMORY; - // SD.ddsCaps.lCaps = DDSCAPS_OFFSCREENPLAIN - SD.LWidth = Width; - SD.LHeight = Height; - } - - // --- On Error Resume Next - Buffer = DDraw.CreateSurface(SD); - if (Err.Number != 0) - return CreateAtSize; - - // --- On Error GoTo 0 - - mWidth = Width; - mHeight = Height; - mScrollX = 0; - mScrollY = 0; - CreateAtSize = -1; - - return CreateAtSize; -} + mScrollX_last = -1; + mScrollY_last = -1; -void DDScrollBuffer_Cls(int BackColor) -{ - RECT EmptyRect; - - if (NoDisplayFlag) return; + } - Buffer.BltColorFill(EmptyRect, BackColor); -} + if (mScrollX_last == -1 || mScrollY_last == -1) + { + mScrollX_last = (mScrollX / TILESIZE) * TILESIZE; + mScrollY_last = (mScrollY / TILESIZE) * TILESIZE; + return; + } -/* copy the entire screen to the window at the scroll position */ + /* check if scrolling the playfield requires redrawing the viewport bitmap */ + if ((mScrollX != mScrollX_last || + mScrollY != mScrollY_last) && + (ABS(mScrollX - mScrollX_last) >= TILEX || + ABS(mScrollY - mScrollY_last) >= TILEY)) + { + int dx = (ABS(mScrollX - mScrollX_last) < TILEX ? 0 : + mScrollX < mScrollX_last ? 1 : mScrollX > mScrollX_last ? -1 : 0); + int dy = (ABS(mScrollY - mScrollY_last) < TILEY ? 0 : + mScrollY < mScrollY_last ? 1 : mScrollY > mScrollY_last ? -1 : 0); -void BlitScreenToBitmap_SP(Bitmap *target_bitmap) -{ - int sx = TILEX + mScrollX % TILEX; - int sy = TILEY + mScrollY % TILEY; + mScrollX_last -= dx * TILEX; + mScrollY_last -= dy * TILEY; - BlitBitmap(screenBitmap, target_bitmap, sx, sy, - SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY); + ScrollPlayfield(dx, dy); + } } -void OLD_BlitScreenToBitmap_SP(Bitmap *target_bitmap) +static void ScrollPlayfieldIfNeeded(void) { - int x = mScrollX % (MAX_BUF_XSIZE * TILEX); - int y = mScrollY % (MAX_BUF_YSIZE * TILEY); - - if (x < 2 * TILEX && y < 2 * TILEY) - { - BlitBitmap(screenBitmap, target_bitmap, x, y, - SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY); - } - else if (x < 2 * TILEX && y >= 2 * TILEY) - { - BlitBitmap(screenBitmap, target_bitmap, x, y, - SCR_FIELDX * TILEX, MAX_BUF_YSIZE * TILEY - y, - SX, SY); - BlitBitmap(screenBitmap, target_bitmap, x, 0, - SCR_FIELDX * TILEX, y - 2 * TILEY, - SX, SY + MAX_BUF_YSIZE * TILEY - y); - } - else if (x >= 2 * TILEX && y < 2 * TILEY) - { - BlitBitmap(screenBitmap, target_bitmap, x, y, - MAX_BUF_XSIZE * TILEX - x, SCR_FIELDY * TILEY, - SX, SY); - BlitBitmap(screenBitmap, target_bitmap, 0, y, - x - 2 * TILEX, SCR_FIELDY * TILEY, - SX + MAX_BUF_XSIZE * TILEX - x, SY); - } - else - { - BlitBitmap(screenBitmap, target_bitmap, x, y, - MAX_BUF_XSIZE * TILEX - x, MAX_BUF_YSIZE * TILEY - y, - SX, SY); - BlitBitmap(screenBitmap, target_bitmap, 0, y, - x - 2 * TILEX, MAX_BUF_YSIZE * TILEY - y, - SX + MAX_BUF_XSIZE * TILEX - x, SY); - BlitBitmap(screenBitmap, target_bitmap, x, 0, - MAX_BUF_XSIZE * TILEX - x, y - 2 * TILEY, - SX, SY + MAX_BUF_YSIZE * TILEY - y); - BlitBitmap(screenBitmap, target_bitmap, 0, 0, - x - 2 * TILEX, y - 2 * TILEY, - SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y); - } + ScrollPlayfieldIfNeededExt(FALSE); } -void BackToFront_SP(void) +void InitScrollPlayfield(void) { - static boolean scrolling_last = FALSE; - int left = mScrollX / TILEX; - int top = mScrollY / TILEY; - boolean scrolling = (mScrollX % TILEX != 0 || mScrollY % TILEY != 0); - int x, y; - - SyncDisplay(); - - if (1 || - redraw_tiles > REDRAWTILES_THRESHOLD || scrolling || scrolling_last) - { - /* blit all (up to four) parts of the scroll buffer to the backbuffer */ - BlitScreenToBitmap_SP(backbuffer); - - /* blit the completely updated backbuffer to the window (in one blit) */ - BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY); - } - else - { - for (x = 0; x < SCR_FIELDX; x++) - { - for (y = 0; y < SCR_FIELDY; y++) - { - int xx = (left + x) % MAX_BUF_XSIZE; - int yy = (top + y) % MAX_BUF_YSIZE; - - if (redraw[xx][yy]) - BlitBitmap(screenBitmap, window, - xx * TILEX, yy * TILEY, TILEX, TILEY, - SX + x * TILEX, SY + y * TILEY); - } - } - } - - FlushDisplay(); - - for (x = 0; x < MAX_BUF_XSIZE; x++) - for (y = 0; y < MAX_BUF_YSIZE; y++) - redraw[x][y] = FALSE; - redraw_tiles = 0; - - scrolling_last = scrolling; + ScrollPlayfieldIfNeededExt(TRUE); } +#define DEBUG_REDRAW 0 -void DDScrollBuffer_Blt_Ext(Bitmap *target_bitmap) +void UpdatePlayfield(boolean force_redraw) { - RECT DR, SR; - long tX, tY, L; - int sX, sY; - // RECT ERect; - // long Restore; - - if (NoDisplayFlag) - return; + int x, y; -#if 1 - DR.left = 0; - DR.top = 0; - DR.right = SCR_FIELDX * TILEX; - DR.bottom = SCR_FIELDY * TILEY; -#else - // --- On Error GoTo BltEH - DirectX.GetWindowRect(mhWnd, DR); - // --- On Error GoTo 0 +#if DEBUG_REDRAW + int num_redrawn = 0; #endif + if (force_redraw) { - tX = (DR.right - DR.left) / Stretch; - tY = (DR.bottom - DR.top) / Stretch; - } - - { - SR.left = mScrollX + mDestXOff; - SR.top = mScrollY + mDestYOff; - - SR.right = SR.left + tX; - SR.bottom = SR.top + tY; - - // If mWidth < SR.right Then - // SR.right = mWidth - // DR.right = DR.left + Stretch * (SR.right - SR.left) - // End If - // If mHeight < SR.bottom Then - // SR.bottom = mHeight - // DR.bottom = DR.top + Stretch * (SR.bottom - SR.top) - // End If - // If (mScrollX + mDestXOff) < 0 Then - // SR.left = 0 - // DR.left = DR.left - Stretch * (mScrollX + mDestXOff) - // End If - // If (mScrollY + mDestYOff) < 0 Then - // SR.top = 0 - // DR.top = DR.top - Stretch * (mScrollY + mDestYOff) - // End If - } - -#if 1 - SR.left = (SR.left < 0 ? 0 : SR.left); - SR.top = (SR.top < 0 ? 0 : SR.top); -#endif + // force re-initialization of graphics status variables + for (y = DisplayMinY; y <= DisplayMaxY; y++) + for (x = DisplayMinX; x <= DisplayMaxX; x++) + GfxGraphic[x][y] = -1; -#if 1 - { - int full_xsize = (FieldWidth - (menBorder.Checked ? 0 : 1)) * TILEX; - int full_ysize = (FieldHeight - (menBorder.Checked ? 0 : 1)) * TILEY; - int sxsize = SCR_FIELDX * TILEX; - int sysize = SCR_FIELDY * TILEY; - - tX = (full_xsize < sxsize ? full_xsize : tX); - tY = (full_ysize < sysize ? full_ysize : tY); - sX = SX + (full_xsize < sxsize ? (sxsize - full_xsize) / 2 : 0); - sY = SY + (full_ysize < sysize ? (sysize - full_ysize) / 2 : 0); + // force complete playfield redraw + DisplayLevel(); } -#endif -#if 1 - if (!menBorder.Checked) + for (y = DisplayMinY; y <= DisplayMaxY; y++) { - SR.left += 16; - SR.top += 16; - } -#endif - -#if 1 - -#if 1 - printf("::: DDScrollBuffer.c: DDScrollBuffer_Blt(): blit from %d, %d [%ld, %ld] [%ld, %ld] [%ld, %ld]\n", - SR.left, SR.top, mScrollX, mScrollY, mDestXOff, mDestYOff, tX, tY); -#endif + for (x = DisplayMinX; x <= DisplayMaxX; x++) + { + int element = LowByte(PlayField16[GetSI(x, y)]); + int graphic = GfxGraphic[x][y]; + int sync_frame = GfxFrame[x][y]; + boolean redraw = force_redraw; -#if 0 - /* !!! quick and dirty -- FIX THIS !!! */ - if (tape.playing && tape.fast_forward && - target_bitmap == window && - (FrameCounter % 2) != 0) - printf("::: FrameCounter == %d\n", FrameCounter); -#endif + if (graphic < 0) + { + GfxGraphicLast[x][y] = GfxGraphic[x][y]; -#if 1 - SyncDisplay(); -#endif + continue; + } -#if 1 - BlitBitmap(screenBitmap, target_bitmap, - SR.left, SR.top, tX, tY, sX, sY); -#else - BlitBitmap(screenBitmap, target_bitmap, - SR.left, SR.top, - SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY); -#endif + if (element != GfxElementLast[x][y] && + graphic == GfxGraphicLast[x][y]) + { + /* element changed, but not graphic => disable updating graphic */ -#if 1 - FlushDisplay(); -#endif + GfxElementLast[x][y] = element; + GfxGraphicLast[x][y] = GfxGraphic[x][y] = -1; - return; + continue; + } -#endif + if (graphic != GfxGraphicLast[x][y]) // new graphic + { + redraw = TRUE; - // DDraw.WaitForVerticalBlank DDWAITVB_BLOCKBEGIN, 0 - if (IS_NOTHING(&Buffer, sizeof(Buffer))) - return; + GfxElementLast[x][y] = element; + GfxGraphicLast[x][y] = GfxGraphic[x][y]; + sync_frame = GfxFrame[x][y] = 0; + } + else if (isNextAnimationFrame_SP(graphic, sync_frame)) // new frame + { + redraw = TRUE; + } - if (IS_NOTHING(&PrimarySurface, sizeof(PrimarySurface))) - return; + if (redraw) + { + int sx = x * StretchWidth; + int sy = y * StretchWidth; - L = PrimarySurface.Blt(DR, &Buffer, SR, DDBLT_WAIT); - if (L != DD_OK) - { - switch (L) - { -#if 0 - case DDERR_GENERIC: - Debug.Assert(False); - break; - - case DDERR_INVALIDCLIPLIST: - Debug.Assert(False); - break; - - case DDERR_INVALIDOBJECT: - Debug.Assert(False); - break; - - case DDERR_INVALIDPARAMS: - Debug.Assert(False); - break; - - case DDERR_INVALIDRECT: - Debug.Assert(False); - break; - - case DDERR_NOALPHAHW: - Debug.Assert(False); - break; - - case DDERR_NOBLTHW: - Debug.Assert(False); - break; - - case DDERR_NOCLIPLIST: - Debug.Assert(False); - break; - - case DDERR_NODDROPSHW: - Debug.Assert(False); - break; - - case DDERR_NOMIRRORHW: - Debug.Assert(False); - break; - - case DDERR_NORASTEROPHW: - Debug.Assert(False); - break; - - case DDERR_NOROTATIONHW: - Debug.Assert(False); - break; - - case DDERR_NOSTRETCHHW: - Debug.Assert(False); - break; - - case DDERR_NOZBUFFERHW: - Debug.Assert(False); - break; - - case DDERR_SURFACEBUSY: - Debug.Assert(False); - break; -#endif + DDSpriteBuffer_BltImg(sx, sy, graphic, sync_frame); - case DDERR_SURFACELOST: - DDraw.RestoreAllSurfaces(); - if (! PrimarySurface.isLost()) - { - subDisplayLevel(); - // Blt(); - } - - // RestorePrimarySurface - // ClipToWindow 0 - break; - -#if 0 - case DDERR_UNSUPPORTED: - Debug.Assert(False); - break; - - case DDERR_WASSTILLDRAWING: - Debug.Assert(False); - break; - - default: - Debug.Assert(False); - break; +#if DEBUG_REDRAW + num_redrawn++; #endif + } } } -#if 0 - // Buffer.UpdateOverlay SR, PrimarySurface, DR, DDOVER_SHOW - if (EditFlag) - FMark.RefreshMarker(); +#if DEBUG_REDRAW + printf("::: FRAME %d: %d redrawn\n", FrameCounter, num_redrawn); #endif - - // BltEH: } -void DDScrollBuffer_Blt() +void BlitScreenToBitmap_SP(Bitmap *target_bitmap) { -#if 1 - -#if 1 - BackToFront_SP(); -#else - /* !!! TEST ONLY !!! */ - BlitBitmap(screenBitmap, window, - 0, 0, SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY); -#endif - -#else - DDScrollBuffer_Blt_Ext(window); -#endif + /* copy playfield buffer to target bitmap at scroll position */ + + int px = getFieldbufferOffsetX_SP(); + int py = getFieldbufferOffsetY_SP(); + int xsize = SXSIZE; + int ysize = SYSIZE; + int full_xsize = (FieldWidth - (menBorder ? 0 : 1)) * TILEX_VAR; + int full_ysize = (FieldHeight - (menBorder ? 0 : 1)) * TILEY_VAR; + int sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); + int sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + int sxsize = (full_xsize < xsize ? full_xsize : xsize); + int sysize = (full_ysize < ysize ? full_ysize : ysize); + + BlitBitmap(bitmap_db_field_sp, target_bitmap, px, py, sxsize, sysize, sx, sy); } void DDScrollBuffer_ScrollTo(int X, int Y) @@ -560,17 +261,10 @@ void DDScrollBuffer_ScrollTo(int X, int Y) if (NoDisplayFlag) return; - X = X / Stretch; - Y = Y / Stretch; - mScrollX = X; - mScrollY = Y; - ScrollX = mScrollX; - ScrollY = mScrollY; + ScrollX = mScrollX = X; + ScrollY = mScrollY = Y; -#if 0 - printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTo(): mScroll: %ld, %ld [%d, %d]\n", - mScrollX, mScrollY, X, Y); -#endif + ScrollPlayfieldIfNeeded(); } void DDScrollBuffer_ScrollTowards(int X, int Y, double Step) @@ -580,17 +274,11 @@ void DDScrollBuffer_ScrollTowards(int X, int Y, double Step) if (NoDisplayFlag) return; -#if 0 - printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTowards(): (1) mScroll: %ld, %ld [%d, %d, %f]\n", - mScrollX, mScrollY, X, Y, Step); -#endif - - X = X / Stretch; - Y = Y / Stretch; dx = X - mScrollX; dY = Y - mScrollY; + r = Sqr(dx * dx + dY * dY); - if (r == 0) // we are there already + if (r == 0) // we are there already return; if (Step < r) @@ -598,42 +286,32 @@ void DDScrollBuffer_ScrollTowards(int X, int Y, double Step) else r = 1; - mScrollX = mScrollX + dx * r; - mScrollY = mScrollY + dY * r; - ScrollX = mScrollX; - ScrollY = mScrollY; + ScrollX = mScrollX = mScrollX + dx * r; + ScrollY = mScrollY = mScrollY + dY * r; -#if 0 - printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTowards(): (2) mScroll: %ld, %ld [%d, %d, %f]\n", - mScrollX, mScrollY, X, Y, Step); -#endif + ScrollPlayfieldIfNeeded(); } -void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS) +void DDScrollBuffer_SoftScrollTo(int X, int Y, int TimeMS, int FPS) { double dx, dY; -#if 0 - TickCountObject Tick; -#endif - long dT, StepCount; + int StepCount; double T, tStep; - long oldX, oldY, maxD; + int oldX, oldY, maxD; static boolean AlreadyRunning = False; if (NoDisplayFlag) return; if (AlreadyRunning) - { return; - } AlreadyRunning = True; - X = X / Stretch; - Y = Y / Stretch; + dx = X - mScrollX; dY = Y - mScrollY; maxD = (Abs(dx) < Abs(dY) ? Abs(dY) : Abs(dx)); + StepCount = FPS * (TimeMS / (double)1000); if (StepCount > maxD) StepCount = maxD; @@ -641,48 +319,20 @@ void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS) if (StepCount == 0) StepCount = 1; - dT = 1000 / FPS; tStep = (double)1 / StepCount; oldX = mScrollX; oldY = mScrollY; - // R = Sqr(dX * dX + dY * dY) - // If R = 0 Then Exit Sub 'we are there already + for (T = (double)tStep; T <= (double)1; T += tStep) { - if (UserDragFlag) - goto SoftScrollEH; - - // If Claim Then Exit For - -#if 0 - Tick.DelayMS(dT, False); -#endif - - mScrollX = oldX + T * dx; - mScrollY = oldY + T * dY; - ScrollX = mScrollX; - ScrollY = mScrollY; - // Blt(); + ScrollX = mScrollX = oldX + T * dx; + ScrollY = mScrollY = oldY + T * dY; } - if (UserDragFlag) - goto SoftScrollEH; - -#if 0 - Tick.DelayMS(dT, False); -#endif + ScrollX = mScrollX = X; + ScrollY = mScrollY = Y; - mScrollX = X; - mScrollY = Y; - ScrollX = mScrollX; - ScrollY = mScrollY; - // Blt(); - -SoftScrollEH: AlreadyRunning = False; -#if 0 - printf("::: DDScrollBuffer.c: DDScrollBuffer_SoftScrollTo(): mScroll: %ld, %ld\n", - mScrollX, mScrollY); -#endif + ScrollPlayfieldIfNeeded(); }