projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed comments from old to new style (one-line comments only)
[rocksndiamonds.git]
/
src
/
game_mm
/
mm_tools.c
diff --git
a/src/game_mm/mm_tools.c
b/src/game_mm/mm_tools.c
index a5cd79da35f90ab3ae9a0eeaa33597df57982459..b4decbacc6a50d50cb107aebf86f1e31727350e4 100644
(file)
--- a/
src/game_mm/mm_tools.c
+++ b/
src/game_mm/mm_tools.c
@@
-41,7
+41,7
@@
void SetDrawtoField_MM(int mode)
SetTileCursorSXSY(cSX, cSY);
}
SetTileCursorSXSY(cSX, cSY);
}
-void ClearWindow()
+void ClearWindow(
void
)
{
ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
{
ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
@@
-127,10
+127,12
@@
void DrawMiniGraphic_MM(int x, int y, int graphic)
MarkTileDirty(x / 2, y / 2);
}
MarkTileDirty(x / 2, y / 2);
}
-void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
+#if 0
+static void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
{
getSizedGraphicSource(graphic, 0, TILESIZE / 4, bitmap, x, y);
}
{
getSizedGraphicSource(graphic, 0, TILESIZE / 4, bitmap, x, y);
}
+#endif
void DrawMiniGraphicExt_MM(DrawBuffer *d, int x, int y, int graphic)
{
void DrawMiniGraphicExt_MM(DrawBuffer *d, int x, int y, int graphic)
{
@@
-157,35
+159,35
@@
void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic,
return;
}
return;
}
- if (dx || dy) /
* Verschiebung der Grafik? */
+ if (dx || dy) /
/ Verschiebung der Grafik?
{
{
- if (x < BX1) /
* Element kommt von links ins Bild */
+ if (x < BX1) /
/ Element kommt von links ins Bild
{
x = BX1;
width = dx;
cx = TILEX - dx;
dx = 0;
}
{
x = BX1;
width = dx;
cx = TILEX - dx;
dx = 0;
}
- else if (x > BX2) /
* Element kommt von rechts ins Bild */
+ else if (x > BX2) /
/ Element kommt von rechts ins Bild
{
x = BX2;
width = -dx;
dx = TILEX + dx;
}
{
x = BX2;
width = -dx;
dx = TILEX + dx;
}
- else if (x==BX1 && dx < 0) /
* Element verläßt links das Bild */
+ else if (x==BX1 && dx < 0) /
/ Element verläßt links das Bild
{
width += dx;
cx = -dx;
dx = 0;
}
{
width += dx;
cx = -dx;
dx = 0;
}
- else if (x==BX2 && dx > 0) /
* Element verläßt rechts das Bild */
+ else if (x==BX2 && dx > 0) /
/ Element verläßt rechts das Bild
width -= dx;
width -= dx;
- else if (dx) /
* allg. Bewegung in x-Richtung */
+ else if (dx) /
/ allg. Bewegung in x-Richtung
MarkTileDirty(x + SIGN(dx), y);
MarkTileDirty(x + SIGN(dx), y);
- if (y < BY1) /
* Element kommt von oben ins Bild */
+ if (y < BY1) /
/ Element kommt von oben ins Bild
{
{
- if (cut_mode==CUT_BELOW) /
* Element oberhalb des Bildes */
+ if (cut_mode==CUT_BELOW) /
/ Element oberhalb des Bildes
return;
y = BY1;
return;
y = BY1;
@@
-193,13
+195,13
@@
void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic,
cy = TILEY - dy;
dy = 0;
}
cy = TILEY - dy;
dy = 0;
}
- else if (y > BY2) /
* Element kommt von unten ins Bild */
+ else if (y > BY2) /
/ Element kommt von unten ins Bild
{
y = BY2;
height = -dy;
dy = TILEY + dy;
}
{
y = BY2;
height = -dy;
dy = TILEY + dy;
}
- else if (y==BY1 && dy < 0) /
* Element verläßt oben das Bild */
+ else if (y==BY1 && dy < 0) /
/ Element verläßt oben das Bild
{
height += dy;
cy = -dy;
{
height += dy;
cy = -dy;
@@
-207,19
+209,19
@@
void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic,
}
else if (dy > 0 && cut_mode == CUT_ABOVE)
{
}
else if (dy > 0 && cut_mode == CUT_ABOVE)
{
- if (y == BY2) /
* Element unterhalb des Bildes */
+ if (y == BY2) /
/ Element unterhalb des Bildes
return;
height = dy;
cy = TILEY - dy;
dy = TILEY;
MarkTileDirty(x, y + 1);
return;
height = dy;
cy = TILEY - dy;
dy = TILEY;
MarkTileDirty(x, y + 1);
- } /
* Element verläßt unten das Bild */
+ } /
/ Element verläßt unten das Bild
else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW))
{
height -= dy;
}
else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW))
{
height -= dy;
}
- else if (dy) /
* allg. Bewegung in y-Richtung */
+ else if (dy) /
/ allg. Bewegung in y-Richtung
{
MarkTileDirty(x, y + SIGN(dy));
}
{
MarkTileDirty(x, y + SIGN(dy));
}
@@
-423,7
+425,7
@@
void DrawField_MM(int x, int y)
DrawElement_MM(x, y, element);
}
DrawElement_MM(x, y, element);
}
-void DrawLevel_MM()
+void DrawLevel_MM(
void
)
{
int x,y;
{
int x,y;
@@
-551,7
+553,8
@@
void DrawElement_MM(int x, int y, int element)
DrawGraphic_MM(x, y, el2gfx(element));
}
DrawGraphic_MM(x, y, el2gfx(element));
}
-void DrawMicroWalls_MM(int x, int y, int element)
+#if 0
+static void DrawMicroWalls_MM(int x, int y, int element)
{
Bitmap *bitmap;
int graphic = el2gfx(WALL_BASE(element));
{
Bitmap *bitmap;
int graphic = el2gfx(WALL_BASE(element));
@@
-572,7
+575,7
@@
void DrawMicroWalls_MM(int x, int y, int element)
}
}
}
}
-void DrawMicroElement_MM(int x, int y, int element)
+
static
void DrawMicroElement_MM(int x, int y, int element)
{
Bitmap *bitmap;
int graphic = el2gfx(element);
{
Bitmap *bitmap;
int graphic = el2gfx(element);
@@
-594,7
+597,7
@@
void DrawMicroElement_MM(int x, int y, int element)
MICROLEV_XPOS + x * MICRO_TILEX, MICROLEV_YPOS + y * MICRO_TILEY);
}
MICROLEV_XPOS + x * MICRO_TILEX, MICROLEV_YPOS + y * MICRO_TILEY);
}
-void DrawMicroLevelExt_MM(int xpos, int ypos)
+
static
void DrawMicroLevelExt_MM(int xpos, int ypos)
{
int x, y;
{
int x, y;
@@
-606,6
+609,7
@@
void DrawMicroLevelExt_MM(int xpos, int ypos)
redraw_mask |= REDRAW_FIELD;
}
redraw_mask |= REDRAW_FIELD;
}
+#endif
void DrawMiniLevel_MM(int size_x, int size_y, int scroll_x, int scroll_y)
{
void DrawMiniLevel_MM(int size_x, int size_y, int scroll_x, int scroll_y)
{
@@
-618,7
+622,8
@@
void DrawMiniLevel_MM(int size_x, int size_y, int scroll_x, int scroll_y)
redraw_mask |= REDRAW_FIELD;
}
redraw_mask |= REDRAW_FIELD;
}
-int REQ_in_range(int x, int y)
+#if 0
+static int REQ_in_range(int x, int y)
{
if (y > DY + 249 && y < DY + 278)
{
{
if (y > DY + 249 && y < DY + 278)
{
@@
-630,6
+635,7
@@
int REQ_in_range(int x, int y)
return 0;
}
return 0;
}
+#endif
Pixel ReadPixel(DrawBuffer *bitmap, int x, int y)
{
Pixel ReadPixel(DrawBuffer *bitmap, int x, int y)
{
@@
-766,7
+772,7
@@
int el2gfx(int element)
}
}
}
}
-void RedrawPlayfield_MM()
+void RedrawPlayfield_MM(
void
)
{
DrawLevel_MM();
DrawLaser_MM();
{
DrawLevel_MM();
DrawLaser_MM();