Merge pull request #158 from MaddTheSane/xcode7Fix

Fix the project to build under Xcode 7.

src/Cocoa/MyOpenGLView.m

@@ -1047,7 +1047,7 @@ FAIL:
 		[bitmap autorelease];
 		
 		NSString *filepath = [[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:name] stringByAppendingPathExtension:@"png"];
-		[[bitmap representationUsingType:NSPNGFileType properties:nil] writeToFile:filepath atomically:YES];
+		[[bitmap representationUsingType:NSPNGFileType properties:[NSDictionary dictionary]] writeToFile:filepath atomically:YES];
 	}
 }
 
@@ -1075,7 +1075,7 @@ FAIL:
 		[bitmap autorelease];
 		
 		NSString *filepath = [[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:name] stringByAppendingPathExtension:@"png"];
-		[[bitmap representationUsingType:NSPNGFileType properties:nil] writeToFile:filepath atomically:YES];
+		[[bitmap representationUsingType:NSPNGFileType properties:[NSDictionary dictionary]] writeToFile:filepath atomically:YES];
 	}
 }
 
@@ -1104,7 +1104,7 @@ FAIL:
 		[bitmap autorelease];
 		
 		NSString *filepath = [[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:name] stringByAppendingPathExtension:@"png"];
-		[[bitmap representationUsingType:NSPNGFileType properties:nil] writeToFile:filepath atomically:YES];
+		[[bitmap representationUsingType:NSPNGFileType properties:[NSDictionary dictionary]] writeToFile:filepath atomically:YES];
 	}
 }
 
@@ -1133,7 +1133,7 @@ FAIL:
 		[bitmap autorelease];
 		
 		NSString *filepath = [[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:name] stringByAppendingPathExtension:@"png"];
-		[[bitmap representationUsingType:NSPNGFileType properties:nil] writeToFile:filepath atomically:YES];
+		[[bitmap representationUsingType:NSPNGFileType properties:[NSDictionary dictionary]] writeToFile:filepath atomically:YES];
 	}
 }
 

src/Core/Entities/PlayerEntity.m

@@ -1610,8 +1610,8 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
 	
 	DESTROY(dockingReport);
 	dockingReport = [[NSMutableString alloc] init];
-	[hud resetGuis:[NSDictionary dictionaryWithObjectsAndKeys:[NSDictionary dictionaryWithObjectsAndKeys:nil], @"message_gui",
-														[NSDictionary dictionaryWithObjectsAndKeys:nil], @"comm_log_gui", nil]];
+	[hud resetGuis:[NSDictionary dictionaryWithObjectsAndKeys:[NSDictionary dictionary], @"message_gui",
+														[NSDictionary dictionary], @"comm_log_gui", nil]];
 	
 	[self initControls];
 }

src/Core/Scripting/OOJSInterfaceDefinition.m

@@ -30,6 +30,7 @@ MA 02110-1301, USA.
 @implementation OOJSInterfaceDefinition
 
 - (id) init {
+	self = [super init];
 	_callback = JSVAL_VOID;
 	_callbackThis = NULL;
 

src/Core/Scripting/OOJSPopulatorDefinition.m

@@ -31,6 +31,7 @@ MA 02110-1301, USA.
 @implementation OOJSPopulatorDefinition
 
 - (id) init {
+	self = [super init];
 	_callback = JSVAL_VOID;
 	_callbackThis = NULL;