X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDisplay.c;h=ceaf64423d5a6673bfe9e233485ba5982d2598bb;hb=ce0bba1a070e5e64939491eb68087f68ef8fe870;hp=2eefc737c8a85f01c18b20cbcc5e70a9c604892d;hpb=c35ed5e69718416c4b428f1ffeddf31105e933b2;p=rocksndiamonds.git diff --git a/src/game_sp/Display.c b/src/game_sp/Display.c index 2eefc737..ceaf6442 100644 --- a/src/game_sp/Display.c +++ b/src/game_sp/Display.c @@ -4,14 +4,11 @@ #include "Display.h" -// static char *VB_Name = "modDisplay"; - -// --- Option Explicit int ScreenScrollXPos, ScreenScrollYPos; -int ScreenPosition, data_h_Xtmp, data_h_Ytmp; +int ScreenPosition; -int ShowRedDiskCounter, ShowPanel; +int ShowPanel; int ExplosionShake; boolean NoDisplayFlag; @@ -19,87 +16,12 @@ long DisplayMinX, DisplayMaxX, DisplayWidth; long DisplayMinY, DisplayMaxY, DisplayHeight; -int subDisplayInfotronsNeeded() -{ - int subDisplayInfotronsNeeded; - - if (NoDisplayFlag) - return subDisplayInfotronsNeeded; - - { -#if 0 - MainForm.lblInfoCount.Caption = InfotronsNeeded; - MainForm.lblInfoCount.Refresh; -#endif - } - - return subDisplayInfotronsNeeded; -} - -int subDisplayPlayingTime() -{ - int subDisplayPlayingTime; - - - return subDisplayPlayingTime; -} - -int subDisplayLevel() +void subDisplayLevel() { - int subDisplayLevel; - if (NoDisplayFlag || ! LevelLoaded) - return subDisplayLevel; - -#if 1 - DisplayLevel(); -#else - MainForm.DisplayLevel(); -#endif - - return subDisplayLevel; -} - -void subDisplayPanel() -{ -} - -int subCheckRestoreRedDiskCountDisplay() -{ - int subCheckRestoreRedDiskCountDisplay; - - if (NoDisplayFlag) - return subCheckRestoreRedDiskCountDisplay; - - if (ShowRedDiskCounter == 0) - return subCheckRestoreRedDiskCountDisplay; - - ShowRedDiskCounter = ShowRedDiskCounter - 1; - if (ShowRedDiskCounter == 0) - { - { -#if 0 - MainForm.lblRedDiskCount.Caption = 0; - MainForm.lblRedDiskCount.Refresh; -#endif - } - } - - return subCheckRestoreRedDiskCountDisplay; -} - -void subDisplayRedDiskCount() -{ - if (NoDisplayFlag) return; - { -#if 0 - MainForm.lblRedDiskCount.Caption = RedDiskCount; - MainForm.lblRedDiskCount.Refresh; -#endif - } - ShowRedDiskCounter = 0x46; + DisplayLevel(); } void ScrollTo(int X, int Y) @@ -134,10 +56,6 @@ void ScrollTowards(int X, int Y) if (NoDisplayFlag) return; -#if 0 - printf("::: 1 ---> %d, %d\n", X, Y); -#endif - oldX = ScrollX; oldY = ScrollY; X = ScrollDelta * (X / ScrollDelta); @@ -149,15 +67,7 @@ void ScrollTowards(int X, int Y) // ScrollX = X // ScrollY = Y -#if 0 - printf("::: 2 ---> %d, %d\n", X, Y); -#endif - -#if 1 Stage.ScrollTowards(X, Y, 2 * Stretch * ZoomFactor); -#else - Stage.ScrollTowards(X, Y, 2 * Stretch); -#endif } void SoftScrollTo(int X, int Y, long TimeMS, int FPS)