hedgewars: comparison cocoaTouch/GameSetup.m

equal deleted inserted replaced

-:f94a52a763d4
+:2520ee7a5484
 //
 //  Created by Vittorio on 10/01/10.
 //  Copyright 2010 __MyCompanyName__. All rights reserved.
 //
+#include <sys/types.h>
+#include <sys/sysctl.h>
 #import "GameSetup.h"
 #import "SDL_uikitappdelegate.h"
 #import "SDL_net.h"
 #import "PascalImports.h"
-#include <sys/types.h>
+#import "CommodityFunctions.h"
-#include <sys/sysctl.h>
 #define BUFFER_SIZE 256
 #define debug(format, ...) CFShow([NSString stringWithFormat:format, ## __VA_ARGS__]);
 @implementation GameSetup
 -(id) init {
 	if (self = [super init]) {
 	srandom(time(NULL));
 ipcPort = (random() % 64541) + 1025;
-NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"];
+systemSettings = [[NSDictionary alloc] initWithContentsOfFile:SETTINGS_FILE()]; //should check it exists
-systemSettings = [[NSDictionary alloc] initWithContentsOfFile:filePath]; //should check it exists
 return self;
 } else
 return nil;
 }
 */
 // prevents using an empty nickname
 NSString *username;
 NSString *originalUsername = [systemSettings objectForKey:@"username"];
-if ([originalUsername isEqualToString:@""]) {
+if ([originalUsername length] == 0) {
 username = [[NSString alloc] initWithFormat:@"MobileUser-%@",ipcString];
 } else {
 username = [[NSString alloc] initWithString:originalUsername];
 }
-	gameArgs[0] = [username UTF8String];                                    //UserNick
+	gameArgs[0] = [username UTF8String];                                                    //UserNick
-	gameArgs[1] = [ipcString UTF8String];                                   //ipcPort
+	gameArgs[1] = [ipcString UTF8String];                                                   //ipcPort
-	gameArgs[2] = [[[systemSettings objectForKey:@"sounds"] stringValue] UTF8String];     //isSoundEnabled
+	gameArgs[2] = [[[systemSettings objectForKey:@"sound"] stringValue] UTF8String];        //isSoundEnabled
-	gameArgs[3] = [[[systemSettings objectForKey:@"music"] stringValue] UTF8String];      //isMusicEnabled
+	gameArgs[3] = [[[systemSettings objectForKey:@"music"] stringValue] UTF8String];        //isMusicEnabled
-	gameArgs[4] = [localeString UTF8String];                                //cLocaleFName
+	gameArgs[4] = [localeString UTF8String];                                                //cLocaleFName
 	gameArgs[5] = [[[systemSettings objectForKey:@"alternate"] stringValue] UTF8String];	//cAltDamage
-	gameArgs[6] = [wSize UTF8String];                                       //cScreenHeight
+	gameArgs[6] = [wSize UTF8String];                                                       //cScreenHeight
-gameArgs[7] = [hSize UTF8String];                                       //cScreenWidth
+gameArgs[7] = [hSize UTF8String];                                                       //cScreenWidth
 [wSize release];
 [hSize release];
 	[localeString release];
 	[ipcString release];

changeset 3335	2520ee7a5484
parent 3332	3c90a923f156
child 3349	5571592f10a8