code duplication

[netris.git] / board.h

diff --git a/board.h b/board.h
index 09212ffcedd62b1ce3bbc6718d6a7192dcf1de33..84074da823a6390ca0368cdfb9541fdf6cf6da30 100644 (file)
--- a/board.h
+++ b/board.h
@@ -1,35 +1,23 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-extern float stdOptions[7];
-
 typedef int (*ShapeDrawFunc)(int scr, int y, int x, unsigned char type);
-extern int ShapeIterate(char s, int scr, int y, int x, ShapeDrawFunc func);
+extern int shape_iterate(char s, int scr, int y, int x, ShapeDrawFunc func);
 extern char ChooseOption(float options[7]);
-extern void ClearField(int scr);
-extern unsigned char GetBlock(int scr, int y, int x);
-extern int RefreshBoard(int scr);
-extern int GlanceFunc(int scr, int y, int x, unsigned char type);
-extern int ShadowFunc(int scr, int y, int x, unsigned char type);
-extern int PlotFunc(int scr, int y, int x, unsigned char type);
-extern void PlotShape(char shape, int scr, int y, int x, int shadow);
-extern int EraseFunc(int scr, int y, int x, unsigned char type);
-extern void EraseShape(char shape, int scr, int y, int x, int shadow);
-extern int CollisionFunc(int scr, int y, int x, unsigned char type);
-extern int ShapeFits(char shape, int scr, int y, int x);
-extern int VisibleFunc(int scr, int y, int x, unsigned char type);
-extern int ShapeVisible(char shape, int scr, int y, int x);
-extern int MovePiece(int scr, int deltaY, int deltaX);
-extern int RotatePiece(int scr, int dir);
-extern int DropPiece(int scr);
-extern int BlockFree(int scr, int x, int y, unsigned char z);
-extern int BlockFall(int scr, int x, int y, unsigned char z);
-extern int CheckFall(int scr);
-extern int LineIsFull(int scr, int y);
-extern void CopyLine(int scr, int from, int to);
-extern int ClearFullLines(int scr);
-extern void FreezePiece(int scr);
-extern void InsertJunk(int scr, int color, int count, int column);
+extern void player_empty(int scr);
+extern unsigned char block_get(int scr, int y, int x);
+extern int player_draw(int scr);
+extern int block_iter_set_status(int scr, int y, int x, unsigned char type);
+extern void shape_draw(char shape, int scr, int y, int x, int shadow);
+extern void shape_erase(char shape, int scr, int y, int x, int shadow);
+extern int shape_get(char shape, int scr, int y, int x);
+extern int shape_visible(char shape, int scr, int y, int x);
+extern int player_move(int scr, int deltaY, int deltaX);
+extern int player_rotate(int scr, int dir);
+extern int player_drop(int scr);
+extern int player_down(int scr);
+extern int player_lineclear(int scr);
+extern void player_lineadd(int scr, int color, int count, int column);
 
 #endif //__BOARD_H