Load last mod on startup.
This commit is contained in:
@@ -266,6 +266,8 @@ namespace OpenRA
|
||||
// Discard any invalid mods
|
||||
var mm = mods.Where( m => Mod.AllMods.ContainsKey( m ) ).ToArray();
|
||||
Console.WriteLine("Loading mods: {0}",string.Join(",",mm));
|
||||
Settings.Game.Mods = mm;
|
||||
Settings.Save();
|
||||
|
||||
Sound.Initialize();
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
- (void)launchFilePicker:(NSArray *)args;
|
||||
- (void)extractZip:(NSArray *)args;
|
||||
- (void)installRAPackages:(NSArray *)args;
|
||||
- (void)launchMod:(NSString *)mod;
|
||||
- (void)launch;
|
||||
- (BOOL)initMono;
|
||||
- (void)runUtilityWithArgs:(NSArray *)arg;
|
||||
- (void)utilityResponded:(NSNotification *)n;
|
||||
|
||||
@@ -50,7 +50,7 @@ extern char **environ;
|
||||
[self installRAPackages:args];
|
||||
|
||||
else
|
||||
[self launchMod:@"cnc"];
|
||||
[self launch];
|
||||
|
||||
[NSApp terminate: nil];
|
||||
}
|
||||
@@ -112,7 +112,7 @@ extern char **environ;
|
||||
return ![response isEqualToString:@"Windowed\n"];
|
||||
}
|
||||
|
||||
-(void)launchMod:(NSString *)mod
|
||||
-(void)launch
|
||||
{
|
||||
// Use LaunchServices because neither NSTask or NSWorkspace support Info.plist _and_ arguments pre-10.6
|
||||
|
||||
@@ -125,7 +125,6 @@ extern char **environ;
|
||||
monoPath,
|
||||
[NSString stringWithFormat:@"UtilityPath=%@", [[[NSBundle mainBundle] executablePath] stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]],
|
||||
[NSString stringWithFormat:@"SupportDir=%@",[@"~/Library/Application Support/OpenRA" stringByExpandingTildeInPath]],
|
||||
[NSString stringWithFormat:@"Game.Mods=%@",mod],
|
||||
nil];
|
||||
FSRef appRef;
|
||||
CFURLGetFSRef((CFURLRef)[NSURL URLWithString:[[[NSBundle mainBundle] executablePath] stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]], &appRef);
|
||||
|
||||
Binary file not shown.
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
/* When launching a mod, the arguments are of the form
|
||||
* --launch <game dir> <mono path> <utility path> <support dir option> <mod option> */
|
||||
if (argc >= 8 && strcmp(argv[1], "--launch") == 0)
|
||||
if (argc >= 7 && strcmp(argv[1], "--launch") == 0)
|
||||
{
|
||||
/* Change into the game dir */
|
||||
chdir(argv[3]);
|
||||
@@ -25,7 +25,6 @@ int main(int argc, char *argv[])
|
||||
"OpenRA.Game.exe",
|
||||
argv[5],
|
||||
argv[6],
|
||||
argv[7],
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user