kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings in Xcode

Browse Source
This commit is contained in:
aurhat
2016-10-25 20:43:39 +02:00
parent 7c27ddd167
commit e52c7b4e6e
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/xcode/Launcher.h
+1 -1
View File
@@ -2,7 +2,7 @@
@class ConsoleView;
@interface Launcher : NSObject {
@interface Launcher : NSObject<NSToolbarDelegate> {
IBOutlet NSTextField *admin_password;
IBOutlet NSWindow *window;
source/xcode/Launcher.m
+7 -11
View File
@@ -323,7 +323,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
NSString *file = [Launcher userdir];
file = [file stringByAppendingPathComponent:files[i]];
[lines addObjectsFromArray:[[NSString stringWithContentsOfFile:file] componentsSeparatedByString:@"\n"]];
[lines addObjectsFromArray:[[NSString stringWithContentsOfFile:file usedEncoding:NULL error:NULL] componentsSeparatedByString:@"\n"]]; // 10.4+
if(i==0 && ![lines count]) // ugh - special case when first run...
{
@@ -333,7 +333,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
for(j = 0; j < sizeof(defaultfiles)/sizeof(NSString*); j++)
{
file = [[Launcher cwd] stringByAppendingPathComponent:defaultfiles[j]];
[lines addObjectsFromArray:[[NSString stringWithContentsOfFile:file] componentsSeparatedByString:@"\n"]];
[lines addObjectsFromArray:[[NSString stringWithContentsOfFile:file usedEncoding:NULL error:NULL] componentsSeparatedByString:@"\n"]]; // 10.4+
}
}
@@ -449,7 +449,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
NSTask *task = [[NSTask alloc] init];
[task setCurrentDirectoryPath:cwd];
[task setLaunchPath:exe];
[task setArguments:args]; NSLog([args description]);
[task setArguments:args]; NSLog(@"%@",[args description]);
[task setEnvironment:[NSDictionary dictionaryWithObjectsAndKeys:
@"1", @"SDL_SINGLEDISPLAY",
@"1", @"SDL_ENABLEAPPEVENTS", nil
@@ -462,7 +462,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
NSBeginCriticalAlertSheet(
[NSLocalizedString(@"ClientAlertTitle", @"") expand] , nil, nil, nil,
window, nil, nil, nil, nil,
[NSLocalizedString(@"ClientAlertMesg", @"") expand]);
@"%@", [NSLocalizedString(@"ClientAlertMesg", @"") expand]);
okay = NO;
NS_ENDHANDLER
}
@@ -489,11 +489,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
[args addObject:[NSString stringWithFormat:@"-h%@", [res objectAtIndex:1]]];
[args addObject:@"-z32"]; //otherwise seems to have a fondness to use -z16 which looks crap
[args addObject:[NSString stringWithFormat:@"-a%d", [defs integerForKey:dkFSAA]]];
if([defs integerForKey:dkFULLSCREEN] == 0)
[args addObject:@"-t0"];
else
[args addObject:@"-t1"];
[args addObject:[NSString stringWithFormat:@"-t%d", [defs integerForKey:dkFULLSCREEN]]];
if ([stencil state] == NSOnState)
[args addObject:@"-s8"];
@@ -621,7 +617,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
NSBeginCriticalAlertSheet(
[NSLocalizedString(@"InitAlertTitle", @"") expand], nil, nil, nil,
window, self, nil, nil, nil,
[NSLocalizedString(@"InitAlertMesg", @"") expand]);
@"%@", [NSLocalizedString(@"InitAlertMesg", @"") expand]);
}
-(BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication {
@@ -652,7 +648,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key)
NSBeginCriticalAlertSheet(
[NSLocalizedString(@"FileAlertTitle", @"") expand], NSLocalizedString(@"Ok", @""), NSLocalizedString(@"Cancel", @""), nil,
window, self, @selector(openPackageFolder:returnCode:contextInfo:), nil, nil,
[NSLocalizedString(@"FileAlertMesg", @"") expand]);
@"%@", [NSLocalizedString(@"FileAlertMesg", @"") expand]);
return NO;
}
source/xcode/SDLMain.h
+1 -1
View File
@@ -10,7 +10,7 @@
#import <Cocoa/Cocoa.h>
@interface SDLMain : NSObject
@interface SDLMain : NSObject<NSFileManagerDelegate>
@end
#endif /* _SDLMain_h_ */