1 files changed, 6 insertions, 59 deletions

diff --git a/src/game.c b/src/game.c
index 8342166..bbd4cf5 100644
--- a/src/game.c
+++ b/src/game.c
@@ -6,7 +6,6 @@
 #include "player.h"
 #include "paddle.h"
 
-static void draw_paddles(struct game *g);
 static void wait(struct game *g);
 static void input(struct game *g);
 static void update(struct game *g);
@@ -22,8 +21,8 @@ new_game(void)
 		return NULL;
 	}
 
-	g->players[0] = new_player();
-	g->players[1] = new_player();
+	g->players[0] = new_player(0);
+	g->players[1] = new_player(1);
 
 	return g;
 }
@@ -93,60 +92,8 @@ update(struct game *g)
 static void
 draw(struct game *g)
 {
-	draw_paddles(g);
-}
-
-static void
-draw_paddles(struct game *g)
-{
-	int off;
-	int pos;
-
-	/* Player 1 horizontal paddle */
-	for (pos = 0; pos < 79; ++pos) {
-		mvprintw(23, pos, " ");
-	}
-	off = g->players[0]->paddle_h.pos;
-	off -= g->players[0]->paddle_h.size / 2;
-	for (pos = 0; pos < g->players[0]->paddle_h.size; ++pos) {
-		attr_on(WA_REVERSE, NULL);
-		mvprintw(23, off + pos, " ");
-		attr_off(WA_REVERSE, NULL);
-	}
-
-	/* Player 1 vertical paddle */
-	for (pos = 0; pos < 24; ++pos) {
-		mvprintw(pos, 2, " ");
-	}
-	off = g->players[0]->paddle_v.pos;
-	off -= g->players[0]->paddle_v.size / 2;
-	for (pos = 0; pos < g->players[0]->paddle_v.size; ++pos) {
-		attr_on(WA_REVERSE, NULL);
-		mvprintw(off + pos, 2, " ");
-		attr_off(WA_REVERSE, NULL);
-	}
-
-	/* Player 2 horizontal paddle */
-	for (pos = 0; pos < 79; ++pos) {
-		mvprintw(1, pos, " ");
-	}
-	off = g->players[1]->paddle_h.pos;
-	off -= g->players[1]->paddle_h.size / 2;
-	for (pos = 0; pos < g->players[1]->paddle_h.size; ++pos) {
-		attr_on(WA_REVERSE, NULL);
-		mvprintw(1, off + pos, " ");
-		attr_off(WA_REVERSE, NULL);
-	}
-
-	/* Player 2 vertical paddle */
-	for (pos = 0; pos < 24; ++pos) {
-		mvprintw(pos, 77, " ");
-	}
-	off = g->players[1]->paddle_v.pos;
-	off -= g->players[1]->paddle_v.size / 2;
-	for (pos = 0; pos < g->players[1]->paddle_v.size; ++pos) {
-		attr_on(WA_REVERSE, NULL);
-		mvprintw(off + pos, 77, " ");
-		attr_off(WA_REVERSE, NULL);
-	}
+	draw_paddle(&g->players[0]->paddle_h);
+	draw_paddle(&g->players[0]->paddle_v);
+	draw_paddle(&g->players[1]->paddle_h);
+	draw_paddle(&g->players[1]->paddle_v);
 }