projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100224-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
Display.c
diff --git
a/src/game_sp/Display.c
b/src/game_sp/Display.c
index b34ffa530ac5e6db20b00704d390785dc4f733a8..94c846ed02779d0a650907b62b0bb6d7f7ab6249 100644
(file)
--- a/
src/game_sp/Display.c
+++ b/
src/game_sp/Display.c
@@
-4,7
+4,8
@@
#include "Display.h"
#include "Display.h"
-static char *VB_Name = "modDisplay";
+// static char *VB_Name = "modDisplay";
+
// --- Option Explicit
int ScreenScrollXPos, ScreenScrollYPos;
// --- Option Explicit
int ScreenScrollXPos, ScreenScrollYPos;
@@
-50,7
+51,9
@@
int subDisplayLevel()
if (NoDisplayFlag || ! LevelLoaded)
return subDisplayLevel;
if (NoDisplayFlag || ! LevelLoaded)
return subDisplayLevel;
-#if 0
+#if 1
+ DisplayLevel();
+#else
MainForm.DisplayLevel();
#endif
MainForm.DisplayLevel();
#endif
@@
-103,6
+106,10
@@
void ScrollTo(int X, int Y)
{
long oldX, oldY;
{
long oldX, oldY;
+#if 0
+ printf("::: Display.c: ScrollTo(): %d, %d\n", X, Y);
+#endif
+
if (NoDisplayFlag)
return;
if (NoDisplayFlag)
return;
@@
-116,6
+123,7
@@
void ScrollTo(int X, int Y)
Y = Min(Y, ScrollMaxY);
// ScrollX = X
// ScrollY = Y
Y = Min(Y, ScrollMaxY);
// ScrollX = X
// ScrollY = Y
+
Stage.ScrollTo(X, Y);
}
Stage.ScrollTo(X, Y);
}
@@
-126,6
+134,10
@@
void ScrollTowards(int X, int Y)
if (NoDisplayFlag)
return;
if (NoDisplayFlag)
return;
+#if 0
+ printf("::: 1 ---> %d, %d\n", X, Y);
+#endif
+
oldX = ScrollX;
oldY = ScrollY;
X = ScrollDelta * (X / ScrollDelta);
oldX = ScrollX;
oldY = ScrollY;
X = ScrollDelta * (X / ScrollDelta);
@@
-136,7
+148,16
@@
void ScrollTowards(int X, int Y)
Y = Min(Y, ScrollMaxY);
// ScrollX = X
// ScrollY = Y
Y = Min(Y, ScrollMaxY);
// 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);
Stage.ScrollTowards(X, Y, 2 * Stretch);
+#endif
}
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
}
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
@@
-146,6
+167,12
@@
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
if (NoDisplayFlag)
return;
if (NoDisplayFlag)
return;
+#if 0
+ printf(":(: %d, %d [%d, %d - %d, %d] [%d]\n",
+ X, Y, ScrollMinX, ScrollMinY, ScrollMaxX, ScrollMaxY,
+ ScrollDelta);
+#endif
+
oldX = ScrollX;
oldY = ScrollY;
X = ScrollDelta * (X / ScrollDelta);
oldX = ScrollX;
oldY = ScrollY;
X = ScrollDelta * (X / ScrollDelta);
@@
-156,5
+183,12
@@
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
Y = Min(Y, ScrollMaxY);
// ScrollX = X
// ScrollY = Y
Y = Min(Y, ScrollMaxY);
// ScrollX = X
// ScrollY = Y
+
+#if 0
+ printf(":): %d, %d [%d, %d - %d, %d] [%d]\n",
+ X, Y, ScrollMinX, ScrollMinY, ScrollMaxX, ScrollMaxY,
+ ScrollDelta);
+#endif
+
Stage.SoftScrollTo(X, Y, TimeMS, FPS);
}
Stage.SoftScrollTo(X, Y, TimeMS, FPS);
}