From 4e2017ea1cb01ce02d65f67cd0fb373f4951a6ab Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 20 May 2013 21:18:10 -0400
Subject: Move paddle updating code into new function.

---
(limited to 'src/game.c')

diff --git a/src/game.c b/src/game.c
index cce4497..7eb4712 100644
--- a/src/game.c
+++ b/src/game.c
@@ -4,6 +4,7 @@
 
 #include "game.h"
 #include "player.h"
+#include "paddle.h"
 
 static void draw_paddles(struct game *g);
 static void wait(struct game *g);
@@ -83,31 +84,10 @@ input(struct game *g)
 static void
 update(struct game *g)
 {
-	struct paddle *pad;
-
-	/* Player 1 horizontal paddle */
-	pad = &g->players[0]->paddle_h;
-	pad->pos += pad->speed * pad->dir;
-	if (pad->pos < pad->size / 2 + 2)  pad->pos = pad->size / 2 + 2;
-	if (pad->pos > 78 - pad->size / 2) pad->pos = 78 - pad->size / 2;
-
-	/* Player 1 vertical paddle */
-	pad = &g->players[0]->paddle_v;
-	pad->pos += pad->speed * pad->dir;
-	if (pad->pos < pad->size / 2 + 2)  pad->pos = pad->size / 2 + 2;
-	if (pad->pos > 23 - pad->size / 2) pad->pos = 23 - pad->size / 2;
-
-	/* Player 2 horizontal paddle */
-	pad = &g->players[1]->paddle_h;
-	pad->pos += pad->speed * pad->dir;
-	if (pad->pos < pad->size / 2 + 2)  pad->pos = pad->size / 2 + 2;
-	if (pad->pos > 78 - pad->size / 2) pad->pos = 78 - pad->size / 2;
-
-	/* Player 2 vertical paddle */
-	pad = &g->players[1]->paddle_v;
-	pad->pos += pad->speed * pad->dir;
-	if (pad->pos < pad->size / 2 + 2)  pad->pos = pad->size / 2 + 2;
-	if (pad->pos > 23 - pad->size / 2) pad->pos = 23 - pad->size / 2;
+	update_paddle(&g->players[0]->paddle_h);
+	update_paddle(&g->players[0]->paddle_v);
+	update_paddle(&g->players[1]->paddle_h);
+	update_paddle(&g->players[1]->paddle_v);
 }
 
 static void
--
cgit v0.9.1