From dd5faacd4f332d260c373da3d298fc035fa1a2a0 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Tue, 9 Jun 2015 11:31:59 -0400
Subject: [PATCH] Mac: Make preset sounds and graphics show as file packages -
 Remove legacy sound/graphic file definitions - Fix a couple of compiler
 warnings

---
 src/BoE-Info.plist        | 100 +++++++++++++++++++-------------------
 src/boe.startup.cpp       |   2 +-
 src/tools/fileio_scen.cpp |   4 +-
 3 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/src/BoE-Info.plist b/src/BoE-Info.plist
index d3c0190d..8cc18daf 100644
--- a/src/BoE-Info.plist
+++ b/src/BoE-Info.plist
@@ -80,50 +80,6 @@
 			<key>NSPersistentStoreTypeKey</key>
 			<string>Binary</string>
 		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>meg</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>boegraphics</string>
-			<key>CFBundleTypeName</key>
-			<string>LegacyMacGraphics</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>beGR</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>None</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>com.spidweb.bladesofexile.oldgraphics</string>
-			</array>
-			<key>LSTypeIsPackage</key>
-			<false/>
-			<key>NSPersistentStoreTypeKey</key>
-			<string>Binary</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeIconFile</key>
-			<string>boesounds</string>
-			<key>CFBundleTypeName</key>
-			<string>LegacySounds</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>beSN</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>com.spidweb.bladesofexile.oldsounds</string>
-			</array>
-			<key>LSTypeIsPackage</key>
-			<false/>
-			<key>NSPersistentStoreTypeKey</key>
-			<string>Binary</string>
-		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -132,7 +88,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>boesave</string>
 			<key>CFBundleTypeName</key>
-			<string>Saved Game</string>
+			<string>Blades of Exile Saved Game</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>game</string>
@@ -157,7 +113,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>boescenario</string>
 			<key>CFBundleTypeName</key>
-			<string>Scenario</string>
+			<string>Blades of Exile Scenario</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>BETM</string>
@@ -201,7 +157,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>boegraphics</string>
 			<key>CFBundleTypeName</key>
-			<string>Preset Graphics</string>
+			<string>Blades of Exile Graphics</string>
 			<key>CFBundleTypeRole</key>
 			<string>None</string>
 			<key>LSItemContentTypes</key>
@@ -221,7 +177,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>boesounds</string>
 			<key>CFBundleTypeName</key>
-			<string>Preset Sounds</string>
+			<string>Blades of Exile Sounds</string>
 			<key>CFBundleTypeRole</key>
 			<string>None</string>
 			<key>LSItemContentTypes</key>
@@ -268,7 +224,9 @@
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>com.apple.ostype</key>
-				<array/>
+				<array>
+					<string>BETM</string>
+				</array>
 				<key>public.filename-extension</key>
 				<array>
 					<string>exs</string>
@@ -291,6 +249,10 @@
 			<string>com.spidweb.bladesofexile.savegame</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
+				<key>com.apple.ostype</key>
+				<array>
+					<string>beSV</string>
+				</array>
 				<key>public.filename-extension</key>
 				<array>
 					<string>exg</string>
@@ -316,6 +278,46 @@
 				</array>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>com.apple.package</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Blades of Exile Graphics</string>
+			<key>UTTypeIconFile</key>
+			<string>boegraphics</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.spidweb.bladesofexile.graphics</string>
+			<key>UTTypeReferenceURL</key>
+			<string></string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>exd</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>com.apple.package</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Blades of Exile Sounds</string>
+			<key>UTTypeIconFile</key>
+			<string>boesounds</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.spidweb.bladesofexile.sounds</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>exa</string>
+				</array>
+			</dict>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/src/boe.startup.cpp b/src/boe.startup.cpp
index 79653aba..cc5cc8ef 100644
--- a/src/boe.startup.cpp
+++ b/src/boe.startup.cpp
@@ -11,7 +11,7 @@
 #include "boe.graphutil.hpp"
 #include "boe.items.hpp"
 #include "boe.party.hpp"
-#include "boe.party.hpp"
+#include "boe.main.hpp"
 #include "soundtool.hpp"
 #include "fileio.hpp"
 #include "dlogutil.hpp"
diff --git a/src/tools/fileio_scen.cpp b/src/tools/fileio_scen.cpp
index ceeb1055..21f3ac1a 100644
--- a/src/tools/fileio_scen.cpp
+++ b/src/tools/fileio_scen.cpp
@@ -451,7 +451,7 @@ static void readQuestFromXml(ticpp::Element& data, cQuest& quest) {
 	}
 }
 
-static void readShopFromXml(ticpp::Element& data, cShop& shop, cScenario& scen) {
+static void readShopFromXml(ticpp::Element& data, cShop& shop) {
 	using namespace ticpp;
 	std::string type, name, val, fname;
 	data.GetDocument()->GetValue(&fname);
@@ -733,7 +733,7 @@ static void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
 					quests++;
 				} else if(type == "shop") {
 					scenario.shops.emplace_back();
-					readShopFromXml(*game, scenario.shops[shops], scenario);
+					readShopFromXml(*game, scenario.shops[shops]);
 					shops++;
 				} else if(type == "timer") {
 					if(timers >= 20)