projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20091030-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
Display.c
diff --git
a/src/game_sp/Display.c
b/src/game_sp/Display.c
index ea36612fb302949ecf2bf80828ea1468c1bbefab..2eefc737c8a85f01c18b20cbcc5e70a9c604892d 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;
@@
-120,11
+124,7
@@
void ScrollTo(int X, int Y)
// ScrollX = X
// ScrollY = Y
// ScrollX = X
// ScrollY = Y
-#if 1
- DDScrollBuffer_ScrollTo(X, Y);
-#else
Stage.ScrollTo(X, Y);
Stage.ScrollTo(X, Y);
-#endif
}
void ScrollTowards(int X, int Y)
}
void ScrollTowards(int X, int Y)
@@
-134,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);
@@
-145,8
+149,12
@@
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
#if 1
-
DDScrollBuffer_ScrollTowards(X, Y, 2 * Stretch
);
+
Stage.ScrollTowards(X, Y, 2 * Stretch * ZoomFactor
);
#else
Stage.ScrollTowards(X, Y, 2 * Stretch);
#endif
#else
Stage.ScrollTowards(X, Y, 2 * Stretch);
#endif
@@
-156,10
+164,6
@@
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
{
long oldX, oldY;
{
long oldX, oldY;
-#if 1
- printf("::: 1: X,Y == %d, %d (1)\n", X, Y);
-#endif
-
if (NoDisplayFlag)
return;
if (NoDisplayFlag)
return;
@@
-174,13
+178,5
@@
void SoftScrollTo(int X, int Y, long TimeMS, int FPS)
// ScrollX = X
// ScrollY = Y
// ScrollX = X
// ScrollY = Y
-#if 1
- printf("::: 2: X,Y == %d, %d\n", X, Y);
-#endif
-
-#if 1
- DDScrollBuffer_SoftScrollTo(X, Y, TimeMS, FPS);
-#else
Stage.SoftScrollTo(X, Y, TimeMS, FPS);
Stage.SoftScrollTo(X, Y, TimeMS, FPS);
-#endif
}
}