equal
deleted
inserted
replaced
62 [settings setObject:[NSNumber numberWithBool:theSwitch.on] forKey:@"sound"]; |
62 [settings setObject:[NSNumber numberWithBool:theSwitch.on] forKey:@"sound"]; |
63 [settings setObject:[NSNumber numberWithBool:NO] forKey:@"music"]; |
63 [settings setObject:[NSNumber numberWithBool:NO] forKey:@"music"]; |
64 theOtherSwitch = (UISwitch *)[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:1]].accessoryView; |
64 theOtherSwitch = (UISwitch *)[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:1]].accessoryView; |
65 [theOtherSwitch setOn:NO animated:YES]; |
65 [theOtherSwitch setOn:NO animated:YES]; |
66 |
66 |
67 if (theOtherSwitch.on) |
67 // since switching sound on won't turn music on anyways, we can always turn off music |
68 [AudioManagerController pauseBackgroundMusic]; |
68 [AudioManagerController pauseBackgroundMusic]; |
|
69 [settings setObject:[NSNumber numberWithBool:NO] forKey:@"music"]; |
69 break; |
70 break; |
70 case 20: //musicSwitch |
71 case 20: //musicSwitch |
71 // if switch above (sound) is off, never turn on |
72 // if switch above (sound) is off, never turn on |
72 if (NO == [[settings objectForKey:@"sound"] boolValue]) { |
73 if (NO == [[settings objectForKey:@"sound"] boolValue]) { |
73 [settings setObject:[NSNumber numberWithBool:NO] forKey:@"music"]; |
74 [settings setObject:[NSNumber numberWithBool:NO] forKey:@"music"]; |
78 |
79 |
79 if (theSwitch.on) |
80 if (theSwitch.on) |
80 [AudioManagerController playBackgroundMusic]; |
81 [AudioManagerController playBackgroundMusic]; |
81 else |
82 else |
82 [AudioManagerController pauseBackgroundMusic]; |
83 [AudioManagerController pauseBackgroundMusic]; |
83 |
|
84 break; |
84 break; |
85 case 30: //alternateSwitch |
85 case 30: //alternateSwitch |
86 [settings setObject:[NSNumber numberWithBool:theSwitch.on] forKey:@"alternate"]; |
86 [settings setObject:[NSNumber numberWithBool:theSwitch.on] forKey:@"alternate"]; |
87 break; |
87 break; |
88 case 90: //synched weapons/scheme |
88 case 90: //synched weapons/scheme |