author | alfadur |
Fri, 02 Nov 2018 23:33:22 +0300 | |
changeset 14104 | 7845beb87cb5 |
parent 12877 | 00215a7ec5f5 |
permissions | -rw-r--r-- |
3829 | 1 |
/* |
2 |
* Hedgewars-iOS, a Hedgewars port for iOS devices |
|
6700 | 3 |
* Copyright (c) 2009-2012 Vittorio Giovara <vittorio.giovara@gmail.com> |
3829 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
8441
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
3829 | 17 |
*/ |
18 |
||
3547 | 19 |
|
20 |
#import "GameConfigViewController.h" |
|
3930 | 21 |
#import "MapConfigViewController.h" |
3547 | 22 |
#import "TeamConfigViewController.h" |
23 |
#import "SchemeWeaponConfigViewController.h" |
|
5156 | 24 |
#import "GameInterfaceBridge.h" |
11120
83c0d96f86ea
- HelpPageLobbyViewController returned to project (back from 2012!), also help bubble images added
antonc27 <antonc27@mail.ru>
parents:
11116
diff
changeset
|
25 |
#import "HelpPageLobbyViewController.h" |
6832 | 26 |
|
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
27 |
@interface GameConfigViewController () |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
28 |
@property (nonatomic, retain) IBOutlet UISegmentedControl *tabsSegmentedControl; //iPhone only |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
29 |
|
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
30 |
@property (nonatomic, retain) IBOutlet UIBarButtonItem *backButton; //iPhone only |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
31 |
@property (nonatomic, retain) IBOutlet UIBarButtonItem *startButton; //iPhone only |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
32 |
@end |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
33 |
|
3547 | 34 |
@implementation GameConfigViewController |
11120
83c0d96f86ea
- HelpPageLobbyViewController returned to project (back from 2012!), also help bubble images added
antonc27 <antonc27@mail.ru>
parents:
11116
diff
changeset
|
35 |
@synthesize imgContainer, titleImage, sliderBackground, helpPage, |
6634
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
36 |
mapConfigViewController, teamConfigViewController, schemeWeaponConfigViewController; |
3930 | 37 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
38 |
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { |
3616
85d69ddb41b6
tackling the iphoneos todo (another trial for the beginning sporadic bug, remove curl animation, don't need to go to detail page)
koda
parents:
3548
diff
changeset
|
39 |
return rotationManager(interfaceOrientation); |
3547 | 40 |
} |
41 |
||
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
42 |
#pragma mark - Buttons |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
43 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
44 |
- (IBAction)buttonPressed:(id)sender { |
4362
8dae325dc625
added missing graphics and fixed some glitches/crashes/bugs
koda
parents:
4349
diff
changeset
|
45 |
UIButton *theButton = (UIButton *)sender; |
3930 | 46 |
|
3547 | 47 |
switch (theButton.tag) { |
48 |
case 0: |
|
3971 | 49 |
if ([self.mapConfigViewController busy]) { |
3625 | 50 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Wait for the Preview",@"") |
51 |
message:NSLocalizedString(@"Before returning the preview needs to be generated",@"") |
|
52 |
delegate:nil |
|
53 |
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") |
|
54 |
otherButtonTitles:nil]; |
|
55 |
[alert show]; |
|
4861
91f889289a47
(ios) perform a small change about how to close the game window, should hopefully save memory and avoid crashes (who am i kidding? that's the usual PR talk...)
koda
parents:
4856
diff
changeset
|
56 |
} else { |
6869
a187c280dd3d
ios: convert audio operation from class to instance, plays better with memory
koda
parents:
6832
diff
changeset
|
57 |
[[AudioManagerController mainManager] playBackSound]; |
11116
102684240fe8
- Interscreen transitions fixed
Anton Malmygin <antonc27@mail.ru>
parents:
11103
diff
changeset
|
58 |
[[self presentingViewController] dismissViewControllerAnimated:YES completion:nil]; |
4861
91f889289a47
(ios) perform a small change about how to close the game window, should hopefully save memory and avoid crashes (who am i kidding? that's the usual PR talk...)
koda
parents:
4856
diff
changeset
|
59 |
} |
3547 | 60 |
break; |
61 |
case 1: |
|
6869
a187c280dd3d
ios: convert audio operation from class to instance, plays better with memory
koda
parents:
6832
diff
changeset
|
62 |
[[AudioManagerController mainManager] playClickSound]; |
6080
ce02ddfe8aa1
on ipad2 and above animate the little hogs on game config and fix the hat display imaging
koda
parents:
6079
diff
changeset
|
63 |
if ([self isEverythingSet] == NO) |
ce02ddfe8aa1
on ipad2 and above animate the little hogs on game config and fix the hat display imaging
koda
parents:
6079
diff
changeset
|
64 |
return; |
3547 | 65 |
theButton.enabled = NO; |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
66 |
[self clearImgContainer]; |
3626 | 67 |
[self startGame:theButton]; |
8441 | 68 |
|
3792 | 69 |
break; |
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
70 |
case 2: { |
6869
a187c280dd3d
ios: convert audio operation from class to instance, plays better with memory
koda
parents:
6832
diff
changeset
|
71 |
[[AudioManagerController mainManager] playClickSound]; |
3792 | 72 |
if (self.helpPage == nil) |
6830
d2df090453aa
ios: prevent an horrible hack for the in-game help pages; they would actually need a serious refactoring to allow localisation and rotation support
koda
parents:
6700
diff
changeset
|
73 |
self.helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController-iPad" bundle:nil]; |
3792 | 74 |
self.helpPage.view.alpha = 0; |
11121
182a42b79610
- HelpPageLobbyViewController updated: various UI fixes, autorotation fixes, help bubbles for iPad grouped
antonc27 <antonc27@mail.ru>
parents:
11120
diff
changeset
|
75 |
self.helpPage.view.frame = self.view.frame; |
6108 | 76 |
[self.view addSubview:self.helpPage.view]; |
11122
2b4e89e5203b
- Fix for show/hide helpPage animations
antonc27 <antonc27@mail.ru>
parents:
11121
diff
changeset
|
77 |
[UIView animateWithDuration:0.5 animations:^{ |
2b4e89e5203b
- Fix for show/hide helpPage animations
antonc27 <antonc27@mail.ru>
parents:
11121
diff
changeset
|
78 |
self.helpPage.view.alpha = 1; |
2b4e89e5203b
- Fix for show/hide helpPage animations
antonc27 <antonc27@mail.ru>
parents:
11121
diff
changeset
|
79 |
}]; |
3547 | 80 |
break; |
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
81 |
} |
3547 | 82 |
default: |
3792 | 83 |
DLog(@"Nope"); |
3547 | 84 |
break; |
85 |
} |
|
86 |
} |
|
87 |
||
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
88 |
#pragma mark - Tabs Segmented Control |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
89 |
|
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
90 |
- (void)localizeTabsSegmentedControl |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
91 |
{ |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
92 |
for (NSUInteger i = 0; i < self.tabsSegmentedControl.numberOfSegments; i++) |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
93 |
{ |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
94 |
NSString *oldTitle = [self.tabsSegmentedControl titleForSegmentAtIndex:i]; |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
95 |
[self.tabsSegmentedControl setTitle:NSLocalizedString(oldTitle, nil) forSegmentAtIndex:i]; |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
96 |
} |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
97 |
} |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
98 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
99 |
- (IBAction)segmentPressed:(id)sender { |
6219 | 100 |
|
3547 | 101 |
UISegmentedControl *theSegment = (UISegmentedControl *)sender; |
102 |
||
6869
a187c280dd3d
ios: convert audio operation from class to instance, plays better with memory
koda
parents:
6832
diff
changeset
|
103 |
[[AudioManagerController mainManager] playSelectSound]; |
3547 | 104 |
switch (theSegment.selectedSegmentIndex) { |
105 |
case 0: |
|
3923
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
106 |
// this message is compulsory otherwise the table won't be loaded at all |
6115
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
107 |
[self.mapConfigViewController viewWillAppear:NO]; |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
108 |
[self.view bringSubviewToFront:self.mapConfigViewController.view]; |
3547 | 109 |
break; |
110 |
case 1: |
|
3923
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
111 |
// this message is compulsory otherwise the table won't be loaded at all |
6115
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
112 |
[self.teamConfigViewController viewWillAppear:NO]; |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
113 |
[self.view bringSubviewToFront:self.teamConfigViewController.view]; |
3547 | 114 |
break; |
115 |
case 2: |
|
3923
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
116 |
// this message is compulsory otherwise the table won't be loaded at all |
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
117 |
[schemeWeaponConfigViewController viewWillAppear:NO]; |
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
118 |
[self.view bringSubviewToFront:schemeWeaponConfigViewController.view]; |
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
119 |
break; |
4144 | 120 |
case 3: |
121 |
if (helpPage == nil) { |
|
6830
d2df090453aa
ios: prevent an horrible hack for the in-game help pages; they would actually need a serious refactoring to allow localisation and rotation support
koda
parents:
6700
diff
changeset
|
122 |
helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController-iPhone" bundle:nil]; |
11121
182a42b79610
- HelpPageLobbyViewController updated: various UI fixes, autorotation fixes, help bubbles for iPad grouped
antonc27 <antonc27@mail.ru>
parents:
11120
diff
changeset
|
123 |
CGRect helpPageFrame = self.view.frame; |
182a42b79610
- HelpPageLobbyViewController updated: various UI fixes, autorotation fixes, help bubbles for iPad grouped
antonc27 <antonc27@mail.ru>
parents:
11120
diff
changeset
|
124 |
helpPageFrame.size.height -= 44; //toolbar height |
182a42b79610
- HelpPageLobbyViewController updated: various UI fixes, autorotation fixes, help bubbles for iPad grouped
antonc27 <antonc27@mail.ru>
parents:
11120
diff
changeset
|
125 |
self.helpPage.view.frame = helpPageFrame; |
4144 | 126 |
[self.view addSubview:helpPage.view]; |
127 |
} |
|
128 |
// this message is compulsory otherwise the table won't be loaded at all |
|
129 |
[helpPage viewWillAppear:NO]; |
|
130 |
[self.view bringSubviewToFront:helpPage.view]; |
|
131 |
break; |
|
3923
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
132 |
default: |
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
133 |
DLog(@"Nope"); |
3547 | 134 |
break; |
135 |
} |
|
6219 | 136 |
|
3547 | 137 |
} |
138 |
||
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
139 |
#pragma mark - |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
140 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
141 |
- (BOOL)isEverythingSet { |
3547 | 142 |
// don't start playing if the preview is in progress |
3971 | 143 |
if ([self.mapConfigViewController busy]) { |
3547 | 144 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Wait for the Preview",@"") |
145 |
message:NSLocalizedString(@"Before playing the preview needs to be generated",@"") |
|
146 |
delegate:nil |
|
147 |
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") |
|
148 |
otherButtonTitles:nil]; |
|
149 |
[alert show]; |
|
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
150 |
return NO; |
3547 | 151 |
} |
4150 | 152 |
|
3547 | 153 |
// play only if there is more than one team |
3971 | 154 |
if ([self.teamConfigViewController.listOfSelectedTeams count] < 2) { |
3547 | 155 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too few teams playing",@"") |
3616
85d69ddb41b6
tackling the iphoneos todo (another trial for the beginning sporadic bug, remove curl animation, don't need to go to detail page)
koda
parents:
3548
diff
changeset
|
156 |
message:NSLocalizedString(@"Select at least two teams to play a game",@"") |
3547 | 157 |
delegate:nil |
158 |
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") |
|
159 |
otherButtonTitles:nil]; |
|
160 |
[alert show]; |
|
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
161 |
return NO; |
3547 | 162 |
} |
4150 | 163 |
|
3547 | 164 |
// play if there's room for enough hogs in the selected map |
165 |
int hogs = 0; |
|
166 |
for (NSDictionary *teamData in teamConfigViewController.listOfSelectedTeams) |
|
167 |
hogs += [[teamData objectForKey:@"number"] intValue]; |
|
3971 | 168 |
if (hogs > self.mapConfigViewController.maxHogs) { |
3547 | 169 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too many hogs",@"") |
3616
85d69ddb41b6
tackling the iphoneos todo (another trial for the beginning sporadic bug, remove curl animation, don't need to go to detail page)
koda
parents:
3548
diff
changeset
|
170 |
message:NSLocalizedString(@"The map is too small for that many hogs",@"") |
3547 | 171 |
delegate:nil |
172 |
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") |
|
173 |
otherButtonTitles:nil]; |
|
174 |
[alert show]; |
|
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
175 |
return NO; |
3547 | 176 |
} |
4150 | 177 |
|
178 |
// play if there aren't too many teams |
|
6908
896ed2afcfb8
ios: turn on more warning messages and start correcting them
koda
parents:
6869
diff
changeset
|
179 |
if ((int)[self.teamConfigViewController.listOfSelectedTeams count] > HW_getMaxNumberOfTeams()) { |
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
180 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too many teams",@"") |
4362
8dae325dc625
added missing graphics and fixed some glitches/crashes/bugs
koda
parents:
4349
diff
changeset
|
181 |
message:NSLocalizedString(@"You exceeded the maximum number of tems allowed in a game",@"") |
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
182 |
delegate:nil |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
183 |
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
184 |
otherButtonTitles:nil]; |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
185 |
[alert show]; |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
186 |
return NO; |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
187 |
} |
4150 | 188 |
|
189 |
// play only if one scheme and one weapon are selected |
|
3971 | 190 |
if ([self.schemeWeaponConfigViewController.selectedScheme length] == 0 || [self.schemeWeaponConfigViewController.selectedWeapon length] == 0 ) { |
3548
4d220ee7c75f
server somewhat simplified and correct sporadic crasher
koda
parents:
3547
diff
changeset
|
191 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Missing detail",@"") |
3616
85d69ddb41b6
tackling the iphoneos todo (another trial for the beginning sporadic bug, remove curl animation, don't need to go to detail page)
koda
parents:
3548
diff
changeset
|
192 |
message:NSLocalizedString(@"Select one Scheme and one Weapon for this game",@"") |
3548
4d220ee7c75f
server somewhat simplified and correct sporadic crasher
koda
parents:
3547
diff
changeset
|
193 |
delegate:nil |
4d220ee7c75f
server somewhat simplified and correct sporadic crasher
koda
parents:
3547
diff
changeset
|
194 |
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") |
4d220ee7c75f
server somewhat simplified and correct sporadic crasher
koda
parents:
3547
diff
changeset
|
195 |
otherButtonTitles:nil]; |
4d220ee7c75f
server somewhat simplified and correct sporadic crasher
koda
parents:
3547
diff
changeset
|
196 |
[alert show]; |
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
197 |
return NO; |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
198 |
} |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
199 |
|
4349 | 200 |
// play if the gameflags are set correctly (divideteam works only with 2 teams) |
4150 | 201 |
NSString *schemePath = [[NSString alloc] initWithFormat:@"%@/%@",SCHEMES_DIRECTORY(),self.schemeWeaponConfigViewController.selectedScheme]; |
202 |
NSArray *gameFlags = [[NSDictionary dictionaryWithContentsOfFile:schemePath] objectForKey:@"gamemod"]; |
|
203 |
if ([[gameFlags objectAtIndex:2] boolValue] && [self.teamConfigViewController.listOfSelectedTeams count] != 2) { |
|
204 |
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Scheme mismatch",@"") |
|
205 |
message:NSLocalizedString(@"The scheme you selected allows only for two teams",@"") |
|
206 |
delegate:nil |
|
207 |
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"") |
|
208 |
otherButtonTitles:nil]; |
|
209 |
[alert show]; |
|
210 |
return NO; |
|
211 |
} |
|
212 |
||
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
213 |
return YES; |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
214 |
} |
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
215 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
216 |
- (void)startGame:(UIButton *)button { |
3881
e570268a9d52
re-add City theme with the UpdateDataFolder script (and revert changes made to the flake sprite)
koda
parents:
3829
diff
changeset
|
217 |
button.enabled = YES; |
3697 | 218 |
|
5455
df05cdb998ed
add support for 'gameplay modes' on ios, renamed into 'style'; also colored in grey some segmented controls and moved some ui objects
koda
parents:
5208
diff
changeset
|
219 |
NSString *script = self.mapConfigViewController.missionCommand; |
df05cdb998ed
add support for 'gameplay modes' on ios, renamed into 'style'; also colored in grey some segmented controls and moved some ui objects
koda
parents:
5208
diff
changeset
|
220 |
if ([script isEqualToString:@""]) |
df05cdb998ed
add support for 'gameplay modes' on ios, renamed into 'style'; also colored in grey some segmented controls and moved some ui objects
koda
parents:
5208
diff
changeset
|
221 |
script = self.schemeWeaponConfigViewController.scriptCommand; |
df05cdb998ed
add support for 'gameplay modes' on ios, renamed into 'style'; also colored in grey some segmented controls and moved some ui objects
koda
parents:
5208
diff
changeset
|
222 |
|
3632 | 223 |
// create the configuration file that is going to be sent to engine |
6266
b02a1e92dba2
convert gameinterfacebridge in simple-to-use class methods
koda
parents:
6219
diff
changeset
|
224 |
NSDictionary *gameDictionary = [[NSDictionary alloc] initWithObjectsAndKeys: |
3971 | 225 |
self.mapConfigViewController.seedCommand,@"seed_command", |
226 |
self.mapConfigViewController.templateFilterCommand,@"templatefilter_command", |
|
227 |
self.mapConfigViewController.mapGenCommand,@"mapgen_command", |
|
228 |
self.mapConfigViewController.mazeSizeCommand,@"mazesize_command", |
|
229 |
self.mapConfigViewController.themeCommand,@"theme_command", |
|
230 |
self.mapConfigViewController.staticMapCommand,@"staticmap_command", |
|
231 |
self.teamConfigViewController.listOfSelectedTeams,@"teams_list", |
|
232 |
self.schemeWeaponConfigViewController.selectedScheme,@"scheme", |
|
233 |
self.schemeWeaponConfigViewController.selectedWeapon,@"weapon", |
|
5455
df05cdb998ed
add support for 'gameplay modes' on ios, renamed into 'style'; also colored in grey some segmented controls and moved some ui objects
koda
parents:
5208
diff
changeset
|
234 |
script,@"mission_command", |
3971 | 235 |
nil]; |
3973 | 236 |
|
6353
d8f62c805619
restore displaying statistics at the end of a game and restore warning lower views that they are going to appear
koda
parents:
6266
diff
changeset
|
237 |
[GameInterfaceBridge registerCallingController:self]; |
6266
b02a1e92dba2
convert gameinterfacebridge in simple-to-use class methods
koda
parents:
6219
diff
changeset
|
238 |
[GameInterfaceBridge startLocalGame:gameDictionary]; |
3547 | 239 |
} |
240 |
||
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
241 |
- (void)loadNiceHogs |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
242 |
{ |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
243 |
@autoreleasepool |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
244 |
{ |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
245 |
NSString *filePath = [[NSString alloc] initWithFormat:@"%@/Hedgehog/Idle.png",GRAPHICS_DIRECTORY()]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
246 |
UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:filePath]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
247 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
248 |
NSArray *hatArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:HATS_DIRECTORY() error:NULL]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
249 |
NSUInteger numberOfHats = [hatArray count]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
250 |
int animationFrames = IS_VERY_POWERFUL([HWUtils modelType]) ? 16 : 1; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
251 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
252 |
self.imgContainer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 40)]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
253 |
NSInteger numberOfHogs = 1 + arc4random_uniform(15); |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
254 |
DLog(@"Drawing %ld nice hedgehogs", (long)numberOfHogs); |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
255 |
for (int i = 0; i < numberOfHogs; i++) { |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
256 |
NSString *hat = [hatArray objectAtIndex:arc4random_uniform((int)numberOfHats)]; |
6080
ce02ddfe8aa1
on ipad2 and above animate the little hogs on game config and fix the hat display imaging
koda
parents:
6079
diff
changeset
|
257 |
|
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
258 |
NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/%@", HATS_DIRECTORY(), hat]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
259 |
UIImage *hatSprite = [[UIImage alloc] initWithContentsOfFile:hatFile]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
260 |
NSMutableArray *animation = [[NSMutableArray alloc] initWithCapacity:animationFrames]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
261 |
for (int j = 0; j < animationFrames; j++) { |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
262 |
int x = ((j*32)/(int)hatSprite.size.height)*32; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
263 |
int y = (j*32)%(int)hatSprite.size.height; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
264 |
UIImage *hatSpriteFrame = [hatSprite cutAt:CGRectMake(x, y, 32, 32)]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
265 |
UIImage *hogSpriteFrame = [hogSprite cutAt:CGRectMake(x, y, 32, 32)]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
266 |
UIImage *hogWithHat = [hogSpriteFrame mergeWith:hatSpriteFrame atPoint:CGPointMake(0, 5)]; |
12875
350d8bde5ccd
- Lazy checks for preventing crash when drawing 'nice hogs' on config screen (frontend) on iPad. Now we have animation glitch sometimes, but this is preferable to crash anyway
antonc27 <antonc27@mail.ru>
parents:
11554
diff
changeset
|
267 |
if (hogWithHat) { |
350d8bde5ccd
- Lazy checks for preventing crash when drawing 'nice hogs' on config screen (frontend) on iPad. Now we have animation glitch sometimes, but this is preferable to crash anyway
antonc27 <antonc27@mail.ru>
parents:
11554
diff
changeset
|
268 |
[animation addObject:hogWithHat]; |
350d8bde5ccd
- Lazy checks for preventing crash when drawing 'nice hogs' on config screen (frontend) on iPad. Now we have animation glitch sometimes, but this is preferable to crash anyway
antonc27 <antonc27@mail.ru>
parents:
11554
diff
changeset
|
269 |
} |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
270 |
} |
3948
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3930
diff
changeset
|
271 |
|
12875
350d8bde5ccd
- Lazy checks for preventing crash when drawing 'nice hogs' on config screen (frontend) on iPad. Now we have animation glitch sometimes, but this is preferable to crash anyway
antonc27 <antonc27@mail.ru>
parents:
11554
diff
changeset
|
272 |
UIImageView *hog = [[UIImageView alloc] initWithImage:[animation firstObject]]; |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
273 |
hog.animationImages = animation; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
274 |
hog.animationDuration = 3; |
6080
ce02ddfe8aa1
on ipad2 and above animate the little hogs on game config and fix the hat display imaging
koda
parents:
6079
diff
changeset
|
275 |
|
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
276 |
int x = 20*i+arc4random_uniform(128); |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
277 |
while (x > 320 - 32) |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
278 |
x = i*arc4random_uniform(32); |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
279 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
280 |
hog.frame = CGRectMake(x, 25, hog.frame.size.width, hog.frame.size.height); |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
281 |
[self.imgContainer addSubview:hog]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
282 |
[hog startAnimating]; |
6080
ce02ddfe8aa1
on ipad2 and above animate the little hogs on game config and fix the hat display imaging
koda
parents:
6079
diff
changeset
|
283 |
} |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
284 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
285 |
dispatch_async(dispatch_get_main_queue(), ^{ |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
286 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
287 |
[self.view addSubview:self.imgContainer]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
288 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
289 |
// don't place the nice hogs if there is no space for them |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
290 |
if ((self.interfaceOrientation == UIInterfaceOrientationPortrait || |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
291 |
self.interfaceOrientation == UIInterfaceOrientationPortraitUpsideDown)) |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
292 |
self.imgContainer.alpha = 0; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
293 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
294 |
self.isDrawingNiceHogs = NO; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
295 |
}); |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
296 |
} |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
297 |
} |
6080
ce02ddfe8aa1
on ipad2 and above animate the little hogs on game config and fix the hat display imaging
koda
parents:
6079
diff
changeset
|
298 |
|
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
299 |
- (void)clearImgContainer |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
300 |
{ |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
301 |
for (UIView *oneView in [self.imgContainer subviews]) |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
302 |
{ |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
303 |
if ([oneView isMemberOfClass:[UIImageView class]]) |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
304 |
{ |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
305 |
UIImageView *anImageView = (UIImageView *)oneView; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
306 |
[anImageView removeFromSuperview]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
307 |
} |
3948
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3930
diff
changeset
|
308 |
} |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
309 |
|
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
310 |
[self.imgContainer removeFromSuperview]; |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
311 |
self.imgContainer = nil; |
3948
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3930
diff
changeset
|
312 |
} |
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3930
diff
changeset
|
313 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
314 |
- (void)viewDidLoad |
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
315 |
{ |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
316 |
[super viewDidLoad]; |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
317 |
|
3629
86212d2b116a
redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents:
3626
diff
changeset
|
318 |
self.view.backgroundColor = [UIColor blackColor]; |
3697 | 319 |
|
6634
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
320 |
CGRect screenRect = [[UIScreen mainScreen] safeBounds]; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
321 |
self.view.frame = screenRect; |
3547 | 322 |
|
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
323 |
if (IS_IPAD()) |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
324 |
{ |
6115
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
325 |
// the label for the filter slider |
6634
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
326 |
UILabel *backLabel = [[UILabel alloc] initWithFrame:CGRectMake(116, 714, 310, 40) |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
327 |
andTitle:nil |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
328 |
withBorderWidth:2.0f]; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
329 |
self.sliderBackground = backLabel; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
330 |
[self.view addSubview:self.sliderBackground]; |
3983
aa24192417a8
use labels instead of images, should save ram and space
koda
parents:
3978
diff
changeset
|
331 |
|
6115
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
332 |
// the label for max hogs |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
333 |
UILabel *maxLabel = [[UILabel alloc] initWithFrame:CGRectMake(598, 714, 310, 40) |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
334 |
andTitle:NSLocalizedString(@"Loading...",@"") |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
335 |
withBorderWidth:2.0f]; |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
336 |
maxLabel.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]]; |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
337 |
maxLabel.textColor = [UIColor whiteColor]; |
11554
893722a2a1f9
- Some warnings fixed with text alignment on iOS front-end
antonc27 <antonc27@mail.ru>
parents:
11232
diff
changeset
|
338 |
maxLabel.textAlignment = NSTextAlignmentCenter; |
6115
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
339 |
[self.view addSubview:maxLabel]; |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
340 |
self.mapConfigViewController.maxLabel = maxLabel; |
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
341 |
} |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
342 |
else |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
343 |
{ |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
344 |
[self localizeTabsSegmentedControl]; |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
345 |
|
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
346 |
[self.backButton setTitle:NSLocalizedString(@"Back", nil)]; |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
347 |
[self.startButton setTitle:NSLocalizedString(@"Start", nil)]; |
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
348 |
|
6678 | 349 |
self.mapConfigViewController.view.frame = CGRectMake(0, 0, screenRect.size.width, screenRect.size.height-44); |
3616
85d69ddb41b6
tackling the iphoneos todo (another trial for the beginning sporadic bug, remove curl animation, don't need to go to detail page)
koda
parents:
3548
diff
changeset
|
350 |
} |
11232
e1bbd85a53b7
- Toolbar elements are localizable now in GameConfig for iPhone
antonc27 <antonc27@mail.ru>
parents:
11226
diff
changeset
|
351 |
|
3948
24daa33a3114
some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents:
3930
diff
changeset
|
352 |
[self.view addSubview:self.mapConfigViewController.view]; |
6634
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
353 |
[self.view bringSubviewToFront:self.mapConfigViewController.slider]; |
3547 | 354 |
} |
355 |
||
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
356 |
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval) duration { |
6634
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
357 |
if (IS_IPAD() == NO) |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
358 |
return; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
359 |
|
11132
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
360 |
[self updateiPadUIForInterfaceOrientation:toInterfaceOrientation]; |
11123
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
361 |
|
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
362 |
if (self.helpPage) |
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
363 |
{ |
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
364 |
self.helpPage.view.frame = self.view.frame; |
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
365 |
} |
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
366 |
} |
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
367 |
|
11132
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
368 |
- (void)updateiPadUIForInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation |
11123
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
369 |
{ |
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
370 |
if ((interfaceOrientation == UIInterfaceOrientationLandscapeLeft || |
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
371 |
interfaceOrientation == UIInterfaceOrientationLandscapeRight)) { |
6634
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
372 |
self.imgContainer.alpha = 1; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
373 |
self.titleImage.frame = CGRectMake(357, 17, 309, 165); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
374 |
self.schemeWeaponConfigViewController.view.frame = CGRectMake(0, 60, 320, 620); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
375 |
self.mapConfigViewController.view.frame = CGRectMake(704, 0, 320, 680); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
376 |
self.teamConfigViewController.view.frame = CGRectMake(337, 187, 350, 505); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
377 |
self.mapConfigViewController.maxLabel.frame = CGRectMake(121, 714, 300, 40); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
378 |
self.sliderBackground.frame = CGRectMake(603, 714, 300, 40); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
379 |
self.mapConfigViewController.slider.frame = CGRectMake(653, 724, 200, 23); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
380 |
} else { |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
381 |
self.imgContainer.alpha = 0; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
382 |
self.titleImage.frame = CGRectMake(37, 28, 309, 165); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
383 |
self.schemeWeaponConfigViewController.view.frame = CGRectMake(0, 214, 378, 366); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
384 |
self.mapConfigViewController.view.frame = CGRectMake(390, 0, 378, 580); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
385 |
self.teamConfigViewController.view.frame = CGRectMake(170, 590, 428, 366); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
386 |
self.mapConfigViewController.maxLabel.frame = CGRectMake(104, 975, 200, 40); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
387 |
self.sliderBackground.frame = CGRectMake(465, 975, 200, 40); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
388 |
self.mapConfigViewController.slider.frame = CGRectMake(475, 983, 180, 23); |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
389 |
} |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
390 |
} |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
391 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
392 |
- (void)viewWillAppear:(BOOL)animated |
11225
4d8ab775bad3
- Fix for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11219
diff
changeset
|
393 |
{ |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
394 |
[super viewWillAppear:animated]; |
11225
4d8ab775bad3
- Fix for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11219
diff
changeset
|
395 |
|
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
396 |
if (IS_IPAD() && !self.imgContainer && !self.isDrawingNiceHogs) |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
397 |
{ |
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
398 |
self.isDrawingNiceHogs = YES; |
11225
4d8ab775bad3
- Fix for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11219
diff
changeset
|
399 |
[NSThread detachNewThreadSelector:@selector(loadNiceHogs) toTarget:self withObject:nil]; |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
400 |
} |
11123
bd58a851eb8d
- Fix for initial wrong UI positioning for GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11122
diff
changeset
|
401 |
|
11132
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
402 |
if (IS_IPAD()) |
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
403 |
{ |
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
404 |
// we assume here what 'statusBarOrientation' will never be changed manually! |
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
405 |
UIInterfaceOrientation currentOrientation = [[UIApplication sharedApplication] statusBarOrientation]; |
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
406 |
[self updateiPadUIForInterfaceOrientation:currentOrientation]; |
ccf095d96ef4
- Improved fix for UI elements positioning at GameConfigViewController
antonc27 <antonc27@mail.ru>
parents:
11123
diff
changeset
|
407 |
} |
3547 | 408 |
} |
409 |
||
11219
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
410 |
- (void)viewDidAppear:(BOOL)animated |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
411 |
{ |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
412 |
[super viewDidAppear:animated]; |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
413 |
|
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
414 |
if (IS_IPAD()) |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
415 |
{ |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
416 |
// need to call this again in order to fix layout on iOS 9 when going back from rotated stats page |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
417 |
UIInterfaceOrientation currentOrientation = [[UIApplication sharedApplication] statusBarOrientation]; |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
418 |
[self updateiPadUIForInterfaceOrientation:currentOrientation]; |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
419 |
} |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
420 |
} |
51cc7ec00c2d
- Possible fix for wrong layout on iOS 9 when going back from rotated stats page (for iPad)
antonc27 <antonc27@mail.ru>
parents:
11210
diff
changeset
|
421 |
|
12877
00215a7ec5f5
- BIG CHANGE: Convert iOS project to use ARC
antonc27 <antonc27@mail.ru>
parents:
12875
diff
changeset
|
422 |
- (void)didReceiveMemoryWarning |
11225
4d8ab775bad3
- Fix for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11219
diff
changeset
|
423 |
{ |
11226
bd45676ab966
- Some improvements for 'loadNiceHogs' in GameConfig for iPad
antonc27 <antonc27@mail.ru>
parents:
11225
diff
changeset
|
424 |
[self clearImgContainer]; |
6115
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
425 |
|
6634
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
426 |
if (self.titleImage.superview == nil) |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
427 |
self.titleImage = nil; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
428 |
if (self.sliderBackground.superview == nil) |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
429 |
self.sliderBackground = nil; |
e00762923086
ios game configuration page supports rotation, with some enhancements (like the new slider); some glitches here and there
koda
parents:
6353
diff
changeset
|
430 |
|
6115
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
431 |
if (self.mapConfigViewController.view.superview == nil) |
485cfecadc9a
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
koda
parents:
6108
diff
changeset
|
432 |
self.mapConfigViewController = nil; |
3971 | 433 |
if (self.teamConfigViewController.view.superview == nil) |
434 |
self.teamConfigViewController = nil; |
|
435 |
if (self.schemeWeaponConfigViewController.view.superview == nil) |
|
436 |
self.schemeWeaponConfigViewController = nil; |
|
11120
83c0d96f86ea
- HelpPageLobbyViewController returned to project (back from 2012!), also help bubble images added
antonc27 <antonc27@mail.ru>
parents:
11116
diff
changeset
|
437 |
if (self.helpPage.view.superview == nil) |
83c0d96f86ea
- HelpPageLobbyViewController returned to project (back from 2012!), also help bubble images added
antonc27 <antonc27@mail.ru>
parents:
11116
diff
changeset
|
438 |
self.helpPage = nil; |
3923
694e6f6e0e30
various classes updates (new version in mainmenu, opt in mapconfig, clear all in savegames)
koda
parents:
3911
diff
changeset
|
439 |
MSG_MEMCLEAN(); |
3778 | 440 |
[super didReceiveMemoryWarning]; |
3547 | 441 |
} |
442 |
||
443 |
@end |