projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100218-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
Display.c
diff --git
a/src/game_sp/Display.c
b/src/game_sp/Display.c
index d75db7b92cd4e89ce1ab4bdbb8032db02117d774..94c846ed02779d0a650907b62b0bb6d7f7ab6249 100644
(file)
--- a/
src/game_sp/Display.c
+++ b/
src/game_sp/Display.c
@@
-106,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;
@@
-130,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);
@@
-141,24
+149,30
@@
void ScrollTowards(int X, int Y)
// ScrollX = X
// ScrollY = 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);
Stage.ScrollTowards(X, Y, 2 * Stretch);
+#endif
}
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
{
long oldX, oldY;
}
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
{
long oldX, oldY;
-#if 1
- printf("::: 1: Display.c: SoftScrollTo: X,Y == %d, %d\n", X, Y);
- printf("::: %d, %d, %d, %d [%ld]\n",
- ScrollMinX, ScrollMaxX,
- ScrollMinY, ScrollMaxY,
- ScrollDelta);
-#endif
-
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);
@@
-170,8
+184,10
@@
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
// ScrollX = X
// ScrollY = Y
// ScrollX = X
// ScrollY = Y
-#if 1
- printf("::: 2: Display.c: SoftScrollTo: X,Y == %d, %d\n", X, 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);
#endif
Stage.SoftScrollTo(X, Y, TimeMS, FPS);