Fixes crash-bug #14766 when switching between restricted and unrestricted modes.

Removes a compiler warning on non-Mac platforms.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1842 127b21dd-08f5-0310-b4b7-95ae10353056

src/Core/OOSoundSource.m

@@ -243,8 +243,9 @@ SOFTWARE.
 	
 }
 
-
+#if OOLITE_MAC_OS_X
 #pragma mark (OOSoundChannelDelegate)
+#endif
 
 - (void)channel:(OOSoundChannel *)channel didFinishPlayingSound:(OOSound *)sound
 {

src/Core/Universe.m

@@ -392,7 +392,13 @@ static OOComparisonResult comparePrice(id dict1, id dict2, void * context);
 	
 	[ResourceManager setUseAddOns:!strict];
 	[ResourceManager loadScripts];
-	
+
+	// NOTE: Anything in the sharedCache is now trashed and must be
+	//       reloaded. Ideally anything using the sharedCache should
+	//       be aware of cache flushes so it can automatically
+	//       reinitialize itself - mwerle 20081107.
+	[[OOShipRegistry sharedRegistry] init];
+
 #ifndef GNUSTEP
 	//// speech stuff
 	
@@ -473,7 +479,7 @@ static OOComparisonResult comparePrice(id dict1, id dict2, void * context);
 	[pirateVictimRoles autorelease];
 	pirateVictimRoles = [[NSSet alloc] initWithArray:[ResourceManager arrayFromFilesNamed:@"pirate-victim-roles.plist" inFolder:@"Config" andMerge:YES]];
 	
-	[autoAIMap autorelease];
+	//[autoAIMap autorelease]; // Having this line in causes a crash when switching from normal to strict and then back to normal.
 	autoAIMap = [ResourceManager dictionaryFromFilesNamed:@"autoAImap.plist" inFolder:@"Config" andMerge:YES];
 
 	[equipmentData autorelease];