From 9dea8e88228e99ea99bea9689eb57377a6faab8c Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Mon, 30 Apr 2018 18:16:52 +0100
Subject: [PATCH] Mac makefile and compile fixes.

---
 makefile.mac         | 21 +++++++++++++++++++++
 src/battle/bullets.c |  2 +-
 src/battle/hud.c     |  8 ++++----
 src/galaxy/mission.c |  2 +-
 src/system/input.c   |  4 ++--
 5 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 makefile.mac

diff --git a/makefile.mac b/makefile.mac
new file mode 100644
index 0000000..6f6fe1c
--- /dev/null
+++ b/makefile.mac
@@ -0,0 +1,21 @@
+PROG = tbftss
+CC = gcc
+PREFIX ?= /usr
+BIN_DIR ?= $(PREFIX)/bin
+DATA_DIR ?= /opt/$(PROG)
+LOCALE_DIR = $(PREFIX)/share/locale
+
+SEARCHPATH += src/plat/unix
+_OBJS += unixInit.o
+
+include common.mk
+
+CXXFLAGS += `sdl2-config --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\"
+CXXFLAGS += -Wall -Wempty-body -ansi -pedantic -Werror -Wstrict-prototypes -Werror=uninitialized -Warray-bounds
+CXXFLAGS += -g
+
+LDFLAGS += `sdl2-config --libs` -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lm
+
+# linking the program.
+$(PROG): $(OBJS)
+	$(CC) -o $@ $(OBJS) $(LDFLAGS)
diff --git a/src/battle/bullets.c b/src/battle/bullets.c
index d7aca4a..d9b08a1 100644
--- a/src/battle/bullets.c
+++ b/src/battle/bullets.c
@@ -303,7 +303,7 @@ static void faceTarget(Bullet *b)
 	
 	wantedAngle = (int)getAngle(b->x, b->y, b->target->x, b->target->y) % 360;
 
-	if (fabs(wantedAngle - b->angle) > TURN_THRESHOLD)
+	if (abs(wantedAngle - b->angle) > TURN_THRESHOLD)
 	{
 		dir = (wantedAngle - b->angle + 360) % 360 > 180 ? -1 : 1;
 
diff --git a/src/battle/hud.c b/src/battle/hud.c
index a8ee8c1..e441f46 100644
--- a/src/battle/hud.c
+++ b/src/battle/hud.c
@@ -46,7 +46,7 @@ static SDL_Texture *shield;
 static SDL_Texture *ecm;
 static SDL_Texture *boost;
 static SDL_Texture *nextGun;
-static SDL_Texture *clock;
+static SDL_Texture *clockIcon;
 static SDL_Texture *objectives;
 static int numMessages;
 static const char *gunName[BT_MAX];
@@ -101,7 +101,7 @@ void initHud(void)
 	ecm = getTexture("gfx/hud/ecm.png");
 	boost = getTexture("gfx/hud/boost.png");
 	nextGun = getTexture("gfx/hud/nextGun.png");
-	clock = getTexture("gfx/hud/clock.png");
+	clockIcon = getTexture("gfx/hud/clock.png");
 	objectives = getTexture("gfx/hud/objectives.png");
 }
 
@@ -475,13 +475,13 @@ static void drawObjectives(void)
 		{
 			timeRemaining = game.currentMission->challengeData.timeLimit - battle.stats[STAT_TIME];
 			
-			blit(clock, (SCREEN_WIDTH / 2) - 50, 14, 0);
+			blit(clockIcon, (SCREEN_WIDTH / 2) - 50, 14, 0);
 			drawText(SCREEN_WIDTH / 2, 10, 16, TA_CENTER, (timeRemaining < 11 * FPS) ? colors.red : colors.white, timeToString(timeRemaining, 0));
 		}
 		else
 		{
 			drawText(SCREEN_WIDTH / 2, 10, 16, TA_CENTER, colors.white, timeToString(battle.stats[STAT_TIME], 0));
-			blit(clock, (SCREEN_WIDTH / 2) - 50, 14, 0);
+			blit(clockIcon, (SCREEN_WIDTH / 2) - 50, 14, 0);
 		}
 		
 		if (game.currentMission->challengeData.killLimit)
diff --git a/src/galaxy/mission.c b/src/galaxy/mission.c
index eb625db..d4d2596 100644
--- a/src/galaxy/mission.c
+++ b/src/galaxy/mission.c
@@ -510,5 +510,5 @@ static unsigned long hashcode(const char *str)
         c = *str++;
 	}
 
-	return abs(hash);
+	return hash;
 }
diff --git a/src/system/input.c b/src/system/input.c
index a6a38c3..3b5ab7e 100644
--- a/src/system/input.c
+++ b/src/system/input.c
@@ -37,7 +37,7 @@ void initInput(void)
 
 void doKeyDown(SDL_KeyboardEvent *event)
 {
-	if (event->keysym.scancode >= 0 && event->keysym.scancode < MAX_KEYBOARD_KEYS && event->repeat == 0)
+	if (event->keysym.scancode < MAX_KEYBOARD_KEYS && event->repeat == 0)
 	{
 		app.keyboard[event->keysym.scancode] = 1;
 		app.lastKeyPressed = event->keysym.scancode;
@@ -46,7 +46,7 @@ void doKeyDown(SDL_KeyboardEvent *event)
 
 void doKeyUp(SDL_KeyboardEvent *event)
 {
-	if (event->keysym.scancode >= 0 && event->keysym.scancode < MAX_KEYBOARD_KEYS)
+	if (event->keysym.scancode < MAX_KEYBOARD_KEYS)
 	{
 		app.keyboard[event->keysym.scancode] = 0;
 	}