From fcb4d815df83e233ef1606d3cba5c210e140fc98 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Wed, 25 May 2016 07:57:13 +0100
Subject: [PATCH] Misc. code clean up.

---
 src/battle/player.c    |  3 +--
 src/battle/starfield.c | 21 ++-------------------
 src/battle/starfield.h |  2 ++
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/battle/player.c b/src/battle/player.c
index 04c2ff7..860f893 100644
--- a/src/battle/player.c
+++ b/src/battle/player.c
@@ -649,8 +649,7 @@ static int isPriorityMissionTarget(Entity *e, int dist, int closest)
 
 static void cycleRadarZoom(void)
 {
-	battle.radarRange++;
-	battle.radarRange %= 3;
+	battle.radarRange = (battle.radarRange + 1) % 3;
 }
 
 int playerHasGun(int type)
diff --git a/src/battle/starfield.c b/src/battle/starfield.c
index b7b52fe..bbb0365 100644
--- a/src/battle/starfield.c
+++ b/src/battle/starfield.c
@@ -47,25 +47,8 @@ void doStars(float dx, float dy)
 		stars[i].x -= (dx * stars[i].speed);
 		stars[i].y -= (dy * stars[i].speed);
 		
-		if (stars[i].x >= SCREEN_WIDTH)
-		{
-			stars[i].x = 0;
-		}
-		
-		if (stars[i].x < 0)
-		{
-			stars[i].x = SCREEN_WIDTH - 1;
-		}
-		
-		if (stars[i].y >= SCREEN_HEIGHT)
-		{
-			stars[i].y = 0;
-		}
-		
-		if (stars[i].y < 0)
-		{
-			stars[i].y = SCREEN_HEIGHT - 1;
-		}
+		stars[i].x = mod(stars[i].x, SCREEN_WIDTH - 1);
+		stars[i].y = mod(stars[i].y, SCREEN_HEIGHT - 1);
 	}
 }
 
diff --git a/src/battle/starfield.h b/src/battle/starfield.h
index 01f1abc..c0bfe66 100644
--- a/src/battle/starfield.h
+++ b/src/battle/starfield.h
@@ -20,4 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../common.h"
 
+extern float mod(float n, float x);
+
 extern App app;