epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the launch process

Browse Source
This commit is contained in:
Paul Chote
2010-04-17 00:44:40 +12:00
parent 623b12f5fb
commit df521bc9ed
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packaging/osx/OpenRA.app/Contents/MacOS/OpenRA
View File

@@ -5,9 +5,4 @@
APP_PATH=`echo $0 | awk '{split($0,patharr,"/"); idx=1; while(patharr[idx+3] != "") { if (patharr[idx] != "/") {printf("%s/", patharr[idx]); idx++ }} }'` APP_PATH=`echo $0 | awk '{split($0,patharr,"/"); idx=1; while(patharr[idx+3] != "") { if (patharr[idx] != "/") {printf("%s/", patharr[idx]); idx++ }} }'`
cd "$APP_PATH/Contents/Resources" cd "$APP_PATH/Contents/Resources"
./OpenRA $@
if [ ! -e mods/ra/packages/redalert.mix ]; then
osascript install_ra_mix.scpt
else
./OpenRA settings=../../../launcher.ini
fi

BIN
packaging/osx/OpenRA.app/Contents/Resources/install_ra_mix.scpt
View File

Binary file not shown.

18
packaging/osx/launcher/Controller.m
View File

@@ -37,7 +37,23 @@
[settings setValue:modString forSetting:@"InitialMods"]; [settings setValue:modString forSetting:@"InitialMods"];
[settings save]; [settings save];
[[NSWorkspace sharedWorkspace] launchApplication:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"OpenRA.app"]]; // Launch the game
NSMutableArray *args = [NSMutableArray arrayWithObjects:@"settings=../../../launcher.ini",nil];
NSString *path = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"OpenRA.app/Contents/MacOS/OpenRA"];
NSTask *task = [[NSTask alloc] init];
[task setLaunchPath:path];
[task setArguments:args];
[task launch];
// Bring the game to the front
ProcessSerialNumber psn;
if (noErr == GetProcessForPID([task processIdentifier], &psn)) {
SetFrontProcess(&psn);
}
[task release];
// Close the launcher
[NSApp terminate: nil]; [NSApp terminate: nil];
} }