equal
deleted
inserted
replaced
26 #import "WeaponSettingsViewController.h" |
26 #import "WeaponSettingsViewController.h" |
27 #import "SchemeSettingsViewController.h" |
27 #import "SchemeSettingsViewController.h" |
28 #import "SupportViewController.h" |
28 #import "SupportViewController.h" |
29 |
29 |
30 @implementation MasterViewController |
30 @implementation MasterViewController |
31 @synthesize targetController, controllerNames, lastIndexPath; |
31 @synthesize rootController, targetController, controllerNames, lastIndexPath; |
32 |
32 |
33 |
33 |
34 -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
34 -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { |
35 return rotationManager(interfaceOrientation); |
35 return rotationManager(interfaceOrientation); |
36 } |
36 } |
190 MSG_MEMCLEAN(); |
190 MSG_MEMCLEAN(); |
191 [super didReceiveMemoryWarning]; |
191 [super didReceiveMemoryWarning]; |
192 } |
192 } |
193 |
193 |
194 -(void) viewDidUnload { |
194 -(void) viewDidUnload { |
195 self.targetController = nil; |
195 //self.rootController = nil; |
|
196 //self.targetController = nil; |
196 self.controllerNames = nil; |
197 self.controllerNames = nil; |
197 self.lastIndexPath = nil; |
198 self.lastIndexPath = nil; |
198 generalSettingsViewController = nil; |
199 generalSettingsViewController = nil; |
199 teamSettingsViewController = nil; |
200 teamSettingsViewController = nil; |
200 weaponSettingsViewController = nil; |
201 weaponSettingsViewController = nil; |
203 MSG_DIDUNLOAD(); |
204 MSG_DIDUNLOAD(); |
204 [super viewDidUnload]; |
205 [super viewDidUnload]; |
205 } |
206 } |
206 |
207 |
207 -(void) dealloc { |
208 -(void) dealloc { |
208 self.targetController = nil; |
209 releaseAndNil(rootController); |
|
210 releaseAndNil(targetController); |
209 releaseAndNil(controllerNames); |
211 releaseAndNil(controllerNames); |
210 releaseAndNil(lastIndexPath); |
212 releaseAndNil(lastIndexPath); |
211 releaseAndNil(generalSettingsViewController); |
213 releaseAndNil(generalSettingsViewController); |
212 releaseAndNil(teamSettingsViewController); |
214 releaseAndNil(teamSettingsViewController); |
213 releaseAndNil(weaponSettingsViewController); |
215 releaseAndNil(weaponSettingsViewController); |
215 releaseAndNil(supportViewController); |
217 releaseAndNil(supportViewController); |
216 [super dealloc]; |
218 [super dealloc]; |
217 } |
219 } |
218 |
220 |
219 -(IBAction) dismissSplitView { |
221 -(IBAction) dismissSplitView { |
220 playSound(@"backSound"); |
222 [self.rootController dismissModalViewControllerAnimated:YES]; |
221 [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissModalView" object:nil]; |
|
222 } |
223 } |
223 |
224 |
224 @end |
225 @end |
225 |
226 |