From 3c35f4043da92da4ea6f6b9ca94908009bbf1a99 Mon Sep 17 00:00:00 2001
From: onpon4 <onpon4@riseup.net>
Date: Tue, 12 Jan 2016 14:03:08 -0500
Subject: [PATCH] Added installation of starfighter.desktop and
 starfighter.png.

---
 Makefile         |  8 ++++++++
 src/event.h      |  2 +-
 src/loadSave.cpp | 11 ++++++++---
 src/missions.cpp |  7 ++++---
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 60a8006..8806ca1 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,15 @@ PROG = starfighter
 DOCS = docs/*
 DATA = data gfx sound music
 DATAFILES = data/* gfx/* sound/* music/*
+LAUNCHER = misc/starfighter.desktop
+ICON = misc/starfighter.png
 
 PREFIX ?= /usr
 BINDIR ?= $(PREFIX)/games/
 DATADIR ?= $(PREFIX)/share/games/parallelrealities/
 DOCDIR ?= $(PREFIX)/share/doc/$(PROG)/
+MENUDIR ?= $(PREFIX)/share/applications/
+ICONDIR ?= $(PREFIX)/share/icons/
 
 # top-level rule to create the program.
 ALL = $(PROG)
@@ -36,10 +40,14 @@ install: $(ALL)
 	mkdir -p $(DESTDIR)$(BINDIR)
 	mkdir -p $(DESTDIR)$(DATADIR)
 	mkdir -p $(DESTDIR)$(DOCDIR)
+	mkdir -p $(MENUDIR)
+	mkdir -p $(ICONDIR)
 
 	install -m 755 $(PROG) $(DESTDIR)$(BINDIR)$(PROG)
 	cp -r $(DATA) $(DESTDIR)$(DATADIR)
 	cp $(DOCS) $(DESTDIR)$(DOCDIR)
+	cp $(LAUNCHER) $(MENUDIR)
+	cp $(ICON) $(ICONDIR)
 
 optimise:
 	advpng -z gfx/*.png
diff --git a/src/event.h b/src/event.h
index 01b44f5..8fea55c 100644
--- a/src/event.h
+++ b/src/event.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 typedef struct Event_ {
 
-	int time;
+	Uint32 time;
 	int face;
 	char message[255];
 	int entity;
diff --git a/src/loadSave.cpp b/src/loadSave.cpp
index e03a45a..a8a424f 100644
--- a/src/loadSave.cpp
+++ b/src/loadSave.cpp
@@ -144,6 +144,7 @@ bool loadGame(int slot)
 {
 	char filename[PATH_MAX];
 	FILE *fp;
+	unsigned long timeTaken;
 
 	sprintf(filename, "%ssave%.2d.sav", engine.configDirectory, slot);
 	fp = fopen(filename, "rb");
@@ -195,10 +196,14 @@ bool loadGame(int slot)
 							&game.totalOtherKills, &game.shieldPickups,
 							&game.rocketPickups, &game.cellPickups, &game.powerups,
 							&game.minesKilled, &game.slavesRescued) < 15) ||
-						(fscanf(fp, "%ld%*c", &game.timeTaken) < 1))
+						(fscanf(fp, "%lu%*c", &timeTaken) < 1))
 				{
 					printf("Warning: Save data is not correctly formatted. Some data may be lost.\n");
 				}
+				else
+				{
+					engine.timeTaken = (Uint32)(timeTaken);
+				}
 				game.destinationPlanet = game.stationedPlanet;
 				break;
 			default:
@@ -282,7 +287,7 @@ void saveGame(int slot)
 				"%d\n"
 				"%d %d\n"
 				"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n"
-				"%ld\n",
+				"%lu\n",
 
 				game.saveFormat,
 
@@ -325,7 +330,7 @@ void saveGame(int slot)
 				game.rocketPickups, game.cellPickups, game.powerups,
 				game.minesKilled, game.slavesRescued,
 
-				game.timeTaken) <= 0)
+				(unsigned long)(game.timeTaken)) <= 0)
 		{
 			printf("Error Saving Game to Slot %d\n", slot);
 		}
diff --git a/src/missions.cpp b/src/missions.cpp
index 9185082..82a553e 100644
--- a/src/missions.cpp
+++ b/src/missions.cpp
@@ -911,9 +911,10 @@ void missionFinishedScreen()
 
 		game.timeTaken += engine.timeTaken;
 
-		snprintf(temp, sizeof temp, "Mission Time: %2ld:%02ld:%02ld",
-			engine.timeTaken / 3600, (engine.timeTaken / 60) % 60,
-			engine.timeTaken % 60);
+		snprintf(temp, sizeof temp, "Mission Time: %2lu:%02lu:%02lu",
+			(unsigned long)(engine.timeTaken / 3600),
+			(unsigned long)((engine.timeTaken / 60) % 60),
+			(unsigned long)(engine.timeTaken % 60));
 
 		screen_renderString(temp, -1, 500, FONT_WHITE);