projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20111007-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
DDScrollBuffer.c
diff --git
a/src/game_sp/DDScrollBuffer.c
b/src/game_sp/DDScrollBuffer.c
index bb3b5c04b6c2f2cfc416706d983b3641aeebb35f..82f0d1e6d50c94d305d20e6457a5be45c15fcfde 100644
(file)
--- a/
src/game_sp/DDScrollBuffer.c
+++ b/
src/game_sp/DDScrollBuffer.c
@@
-7,14
+7,14
@@
#include <math.h>
#include <math.h>
-
long
mScrollX, mScrollY;
-
long
mScrollX_last, mScrollY_last;
+
int
mScrollX, mScrollY;
+
int
mScrollX_last, mScrollY_last;
#if 1
#if 1
-
long
ScreenBuffer[2 + MAX_PLAYFIELD_WIDTH + 2][2 + MAX_PLAYFIELD_HEIGHT + 2];
+
int
ScreenBuffer[2 + MAX_PLAYFIELD_WIDTH + 2][2 + MAX_PLAYFIELD_HEIGHT + 2];
boolean redraw[2 + MAX_PLAYFIELD_WIDTH + 2][2 + MAX_PLAYFIELD_HEIGHT + 2];
#else
boolean redraw[2 + MAX_PLAYFIELD_WIDTH + 2][2 + MAX_PLAYFIELD_HEIGHT + 2];
#else
-
long
ScreenBuffer[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+
int
ScreenBuffer[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
#endif
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
#endif
@@
-91,9
+91,9
@@
static void ScrollPlayfield(int dx, int dy)
int sx = x - x1;
int sy = y - y1;
int tsi = GetSI(x, y);
int sx = x - x1;
int sy = y - y1;
int tsi = GetSI(x, y);
-
long
id = ((PlayField16[tsi]) |
-
(PlayField8[tsi] << 16) |
-
(DisPlayField[tsi] << 24));
+
int
id = ((PlayField16[tsi]) |
+ (PlayField8[tsi] << 16) |
+ (DisPlayField[tsi] << 24));
if ((dx == -1 && x == x2) ||
(dx == +1 && x == x1) ||
if ((dx == -1 && x == x2) ||
(dx == +1 && x == x1) ||
@@
-454,12
+454,12
@@
void DDScrollBuffer_ScrollTowards(int X, int Y, double Step)
ScrollPlayfieldIfNeeded();
}
ScrollPlayfieldIfNeeded();
}
-void DDScrollBuffer_SoftScrollTo(int X, int Y,
long
TimeMS, int FPS)
+void DDScrollBuffer_SoftScrollTo(int X, int Y,
int
TimeMS, int FPS)
{
double dx, dY;
{
double dx, dY;
-
long
dT, StepCount;
+
int
dT, StepCount;
double T, tStep;
double T, tStep;
-
long
oldX, oldY, maxD;
+
int
oldX, oldY, maxD;
static boolean AlreadyRunning = False;
if (NoDisplayFlag)
static boolean AlreadyRunning = False;
if (NoDisplayFlag)