projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed graphical bugs if digging or collecting caused player relocation
[rocksndiamonds.git]
/
src
/
game_sp
/
MainForm.c
diff --git
a/src/game_sp/MainForm.c
b/src/game_sp/MainForm.c
index b6d7952cc14d99a515a17ccfcd2d521156caf3ef..96d71a9653be859b519e6919c4506ea432bef886 100644
(file)
--- a/
src/game_sp/MainForm.c
+++ b/
src/game_sp/MainForm.c
@@
-6,22
+6,22
@@
static void DrawFrame(int Delta);
static void DrawFrame(int Delta);
-static void ReStretch();
+static void ReStretch(
void
);
void DrawField(int X, int Y);
void DrawFieldAnimated(int X, int Y);
void DrawFieldNoAnimated(int X, int Y);
void DrawField(int X, int Y);
void DrawFieldAnimated(int X, int Y);
void DrawFieldNoAnimated(int X, int Y);
-void DrawFrameIfNeeded()
+void DrawFrameIfNeeded(
void
)
{
DrawFrame(0);
{
DrawFrame(0);
- /
* !!! CHECK THIS !!! */
+ /
/ !!! CHECK THIS !!!
if (! menBorder)
DrawFrame(1);
}
if (! menBorder)
DrawFrame(1);
}
-void DisplayLevel()
+void DisplayLevel(
void
)
{
int X, Y;
{
int X, Y;
@@
-53,7
+53,7
@@
void DisplayLevel()
}
}
}
}
-void Form_Load()
+void Form_Load(
void
)
{
InitGlobals();
{
InitGlobals();
@@
-93,7
+93,7
@@
static void DrawFrame(int Delta)
}
}
}
}
-static void RestoreFrame()
+static void RestoreFrame(
void
)
{
int i, LX, tY, RX, BY;
{
int i, LX, tY, RX, BY;
@@
-115,7
+115,7
@@
static void RestoreFrame()
}
}
}
}
-void SetDisplayRegion()
+void SetDisplayRegion(
void
)
{
if (! menBorder)
{
{
if (! menBorder)
{
@@
-139,7
+139,7
@@
void SetDisplayRegion()
}
}
}
}
-void menPlay_Click()
+void menPlay_Click(
void
)
{
bPlaying = True;
{
bPlaying = True;
@@
-150,7
+150,7
@@
void menPlay_Click()
subMainGameLoop_Init();
}
subMainGameLoop_Init();
}
-static void ReStretch()
+static void ReStretch(
void
)
{
if (LevelLoaded)
{
{
if (LevelLoaded)
{
@@
-168,24
+168,24
@@
static void ReStretch()
ScrollTo(ScreenScrollXPos, ScreenScrollYPos);
}
ScrollTo(ScreenScrollXPos, ScreenScrollYPos);
}
-void SetScrollEdges()
+void SetScrollEdges(
void
)
{
int border1_offset = (menBorder ? 1 : 2);
int border2_offset = (menBorder ? 0 : TILESIZE / 2);
{
int border1_offset = (menBorder ? 1 : 2);
int border2_offset = (menBorder ? 0 : TILESIZE / 2);
- /
* scroll correction for border frame (1 tile) or border element (2 tiles) */
+ /
/ scroll correction for border frame (1 tile) or border element (2 tiles)
ScrollMinX = 0;
ScrollMinY = 0;
ScrollMaxX = (DisplayMaxX + border1_offset - SCR_FIELDX) * TILEX;
ScrollMaxY = (DisplayMaxY + border1_offset - SCR_FIELDY) * TILEY;
ScrollMinX = 0;
ScrollMinY = 0;
ScrollMaxX = (DisplayMaxX + border1_offset - SCR_FIELDX) * TILEX;
ScrollMaxY = (DisplayMaxY + border1_offset - SCR_FIELDY) * TILEY;
- /
* scroll correction for border element (half tile on left and right side) */
+ /
/ scroll correction for border element (half tile on left and right side)
ScrollMinX += border2_offset;
ScrollMinY += border2_offset;
ScrollMaxX -= border2_offset;
ScrollMaxY -= border2_offset;
ScrollMinX += border2_offset;
ScrollMinY += border2_offset;
ScrollMaxX -= border2_offset;
ScrollMaxY -= border2_offset;
- /
* scroll correction for even number of visible tiles (half tile shifted) */
+ /
/ scroll correction for even number of visible tiles (half tile shifted)
ScrollMinX -= game_sp.scroll_xoffset;
ScrollMaxX -= game_sp.scroll_xoffset;
ScrollMinY -= game_sp.scroll_yoffset;
ScrollMinX -= game_sp.scroll_xoffset;
ScrollMaxX -= game_sp.scroll_xoffset;
ScrollMinY -= game_sp.scroll_yoffset;