projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20090729-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
Display.c
diff --git
a/src/game_sp/Display.c
b/src/game_sp/Display.c
index f8da42e783e5b7e8823670bec53cbad034d57b83..92cdcd99252c07924022c40aa42c6066307be08d 100644
(file)
--- a/
src/game_sp/Display.c
+++ b/
src/game_sp/Display.c
@@
-51,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
@@
-104,6
+106,10
@@
void ScrollTo(int X, int Y)
{
long oldX, oldY;
{
long oldX, oldY;
+#if 1
+ printf("::: Display.c: ScrollTo(): %d, %d\n", X, Y);
+#endif
+
if (NoDisplayFlag)
return;
if (NoDisplayFlag)
return;
@@
-117,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);
}
@@
-137,6
+144,7
@@
void ScrollTowards(int X, int Y)
Y = Min(Y, ScrollMaxY);
// ScrollX = X
// ScrollY = Y
Y = Min(Y, ScrollMaxY);
// ScrollX = X
// ScrollY = Y
+
Stage.ScrollTowards(X, Y, 2 * Stretch);
}
Stage.ScrollTowards(X, Y, 2 * Stretch);
}
@@
-157,5
+165,6
@@
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
+
Stage.SoftScrollTo(X, Y, TimeMS, FPS);
}
Stage.SoftScrollTo(X, Y, TimeMS, FPS);
}