# HG changeset patch # User koda # Date 1264252527 0 # Node ID 3a8560c00f786aaaf3f518bb5ef29ae9de72102f # Parent 726e4a230b48b38d6da87b76f9afc5986adce381 settings tab has now a very nice iphone-like interface diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sat Jan 23 13:15:27 2010 +0000 @@ -63,7 +63,6 @@ } -(IBAction) startSDLgame { - [setup startThread:@"engineProtocol"]; [setup loadSettingsFromFile:@"settings.plist" forKey:@"systemSettings"]; @@ -76,10 +75,13 @@ NSLog(@"Game is launching..."); + NSAutoreleasePool *internal_pool = [[NSAutoreleasePool alloc] init]; + // direct execution or thread? check the one that gives most fps // library or call SDL_main? pascal quits at the end of the main Game(); - + + [internal_pool drain]; NSLog(@"Game is exting..."); [[window viewWithTag:54867] removeFromSuperview]; diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SDLOverrides/SDL_uikitview.m --- a/cocoaTouch/SDLOverrides/SDL_uikitview.m Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitview.m Sat Jan 23 13:15:27 2010 +0000 @@ -166,7 +166,7 @@ // one tap - single click if (1 == [touch tapCount] ) { - SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].windowID, gestureStartPoint.x, gestureStartPoint.y); + //SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].windowID, gestureStartPoint.x, gestureStartPoint.y); HW_click(); } @@ -230,14 +230,14 @@ CGFloat Xdiff = gestureStartPoint.x - currentPosition.x; CGFloat Ydiff = gestureStartPoint.y - currentPosition.y; CGFloat deltaX = fabsf(Xdiff); - CGFloat deltaY = fabsf(Ydiff); + CGFloat deltaY = fabsf(Ydiff); if (deltaX >= kMinimumGestureLength && deltaY <= kMaximumVariance) { NSLog(@"Horizontal swipe detected, begX:%f curX:%f", gestureStartPoint.x, currentPosition.x); if (Xdiff > 0) HW_walkLeft(); else HW_walkRight(); - } - else if (deltaY >= kMinimumGestureLength && deltaX <= kMaximumVariance){ + } + else if (deltaY >= kMinimumGestureLength && deltaX <= kMaximumVariance){ NSLog(@"Vertical swipe detected, begY:%f curY:%f", gestureStartPoint.y, currentPosition.y); if (Ydiff > 0) HW_aimUp(); else HW_aimDown(); @@ -249,7 +249,7 @@ UITouch *first = [twoTouches objectAtIndex:0]; UITouch *second = [twoTouches objectAtIndex:1]; CGFloat currentDistance = distanceBetweenPoints([first locationInView:self], [second locationInView:self]); - + if (0 == initialDistance) initialDistance = currentDistance; else if (currentDistance - initialDistance > kMinimumPinchDelta) { diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SchemeEditViewController.h --- a/cocoaTouch/SchemeEditViewController.h Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SchemeEditViewController.h Sat Jan 23 13:15:27 2010 +0000 @@ -9,8 +9,11 @@ #import -@interface SchemeEditViewController : UIViewController { - +@interface SchemeEditViewController : UIViewController { + UITableViewCell *cell0; + UITableView *table; } +@property (nonatomic, retain) IBOutlet UITableViewCell *cell0; +@property (nonatomic, retain) IBOutlet UITableView *table; @end diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SchemeEditViewController.m --- a/cocoaTouch/SchemeEditViewController.m Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SchemeEditViewController.m Sat Jan 23 13:15:27 2010 +0000 @@ -10,7 +10,7 @@ @implementation SchemeEditViewController - +@synthesize cell0, table; /* // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { @@ -21,12 +21,12 @@ } */ -/* // Implement viewDidLoad to do additional setup after loading the view, typically from a nib. - (void)viewDidLoad { + table.backgroundColor = [UIColor clearColor]; [super viewDidLoad]; } -*/ + /* // Override to allow orientations other than the default portrait orientation. @@ -52,6 +52,23 @@ - (void)dealloc { [super dealloc]; } +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + + + + return cell0; + + +} +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView{ + return 1; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ + return 1; +} + @end diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SchemeEditViewController.xib --- a/cocoaTouch/SchemeEditViewController.xib Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SchemeEditViewController.xib Sat Jan 23 13:15:27 2010 +0000 @@ -2,17 +2,17 @@ 784 - 10A394 - 732 - 1027.1 - 430.00 + 10C540 + 740 + 1038.25 + 458.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 60 + 62 YES - + YES @@ -35,10 +35,105 @@ IBFirstResponder - + 292 - {320, 460} + + YES + + + 292 + + YES + + + 256 + + YES + + + 292 + {{206, 8}, {94, 27}} + + NO + YES + YES + 0 + 0 + YES + + + + 292 + {{20, 11}, {42, 21}} + + NO + YES + NO + Label + + 1 + MCAwIDAAA + + + 1 + 10 + + + {320, 43} + + + 3 + MCAwAA + + NO + YES + 4 + YES + + + {{0, 208}, {320, 44}} + + + 1 + MSAxIDEAA + + NO + 1 + + + + + 292 + {{0, -6}, {320, 443}} + + NO + 4 + NO + + NSImage + Background.png + + + + + 274 + {320, 431} + + NO + YES + NO + NO + 1 + 1 + 0 + YES + 44 + 10 + 10 + + + {320, 431} 3 @@ -47,7 +142,8 @@ 2 - + NO + @@ -55,11 +151,43 @@ YES + cell0 + + + + 11 + + + view - + + + 14 + + + + delegate + + - 3 + 17 + + + + dataSource + + + + 18 + + + + table + + + + 19 @@ -72,11 +200,6 @@ - 1 - - - - -1 @@ -87,6 +210,47 @@ + + 13 + + + YES + + + + + + + + 7 + + + YES + + + + + + + 10 + + + + + 9 + + + + + 15 + + + + + 16 + + + @@ -95,14 +259,28 @@ YES -1.CustomClassName -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency + 10.IBPluginDependency + 13.IBEditorWindowLastContentRect + 13.IBPluginDependency + 15.IBPluginDependency + 16.IBEditorWindowLastContentRect + 16.IBPluginDependency + 7.IBEditorWindowLastContentRect + 7.IBPluginDependency + 9.IBPluginDependency YES SchemeEditViewController UIResponder - {{556, 412}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{465, 427}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{528, 253}, {320, 431}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{685, 423}, {320, 44}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -122,7 +300,7 @@ - 3 + 19 @@ -130,20 +308,287 @@ SchemeEditViewController UIViewController + + YES + + YES + cell0 + table + + + YES + UITableViewCell + UITableView + + IBProjectSource - SchemeEditViewController.h + ../../../hedge.build/trunk/cocoaTouch/SchemeEditViewController.h + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + + UIResponder + NSObject + + + + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UISwitch + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UISwitch.h + + + + UITableView + UIScrollView + + IBFrameworkSource + UIKit.framework/Headers/UITableView.h + + + + UITableViewCell + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITableViewCell.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h 0 + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 YES - + ../../../Documents/xcode/hwengine/hwengine.xcodeproj 3 3.1 diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SettingsViewController.h --- a/cocoaTouch/SettingsViewController.h Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SettingsViewController.h Sat Jan 23 13:15:27 2010 +0000 @@ -9,22 +9,26 @@ #import -@interface SettingsViewController : UIViewController { +@interface SettingsViewController : UIViewController { UITextField *username; UITextField *password; - UISwitch *musicOn; - UISwitch *effectsOn; - UISwitch *altDamageOn; + UISwitch *musicSwitch; + UISwitch *effectsSwitch; + UISwitch *altDamageSwitch; UISlider *volumeSlider; UILabel *volumeLabel; + UITableView *table; + UITableViewCell *volumeCell; } @property (nonatomic, retain) IBOutlet UITextField *username; @property (nonatomic, retain) IBOutlet UITextField *password; -@property (nonatomic, retain) IBOutlet UISwitch *musicOn; -@property (nonatomic, retain) IBOutlet UISwitch *effectsOn; -@property (nonatomic, retain) IBOutlet UISwitch *altDamageOn; +@property (nonatomic, retain) UISwitch *musicSwitch; +@property (nonatomic, retain) UISwitch *effectsSwitch; +@property (nonatomic, retain) UISwitch *altDamageSwitch; @property (nonatomic, retain) IBOutlet UISlider *volumeSlider; @property (nonatomic, retain) IBOutlet UILabel *volumeLabel; +@property (nonatomic, retain) IBOutlet UITableView *table; +@property (nonatomic, retain) IBOutlet UITableViewCell *volumeCell; -(IBAction) sliderChanged: (id)sender; -(IBAction) backgroundTap: (id)sender; diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SettingsViewController.m --- a/cocoaTouch/SettingsViewController.m Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SettingsViewController.m Sat Jan 23 13:15:27 2010 +0000 @@ -11,76 +11,86 @@ @implementation SettingsViewController -@synthesize username, password, musicOn, effectsOn, altDamageOn, volumeSlider, volumeLabel; +@synthesize username, password, musicSwitch, effectsSwitch, altDamageSwitch, volumeSlider, volumeLabel, table, volumeCell; + + +-(void) loadView { + self.musicSwitch = [[UISwitch alloc] init]; + self.effectsSwitch = [[UISwitch alloc] init]; + self.altDamageSwitch = [[UISwitch alloc] init]; + [super loadView]; +} -(void) viewDidLoad { NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"]; if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) { - NSUserDefaults *data = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath]; + NSMutableDictionary *data = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath]; username.text = [data objectForKey:@"username"]; password.text = [data objectForKey:@"password"]; if (1 == [[data objectForKey:@"music"] intValue]) { - musicOn.on = YES; + musicSwitch.on = YES; } else { - musicOn.on = NO; + musicSwitch.on = NO; } if (1 == [[data objectForKey:@"effects"] intValue]) { - effectsOn.on = YES; + effectsSwitch.on = YES; } else { - effectsOn.on = NO; + effectsSwitch.on = NO; } if (1 == [[data objectForKey:@"alternate"] intValue]) { - altDamageOn.on = YES; + altDamageSwitch.on = YES; } else { - altDamageOn.on = NO; + altDamageSwitch.on = NO; } [volumeSlider setValue:[[data objectForKey:@"volume"] intValue] animated:NO]; - - NSString *tmpVol = [[NSString alloc] initWithFormat:@"%d", (int) volumeSlider.value]; - volumeLabel.text = tmpVol; - [tmpVol release]; + [data release]; } else { [NSException raise:@"File NOT found" format:@"The file settings.plist was not found at %@", filePath]; } -/* - UIApplication *app = [UIApplication sharedApplication]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(applicationWillTerminate:) - name:UIApplicationWillTerminateNotification - object:app]; -*/ + + NSString *tmpVol = [[NSString alloc] initWithFormat:@"%d", (int) volumeSlider.value]; + volumeLabel.text = tmpVol; + [tmpVol release]; + + username.textColor = [UIColor grayColor]; + password.textColor = [UIColor grayColor]; + volumeLabel.textColor = [UIColor grayColor]; + table.backgroundColor = [UIColor clearColor]; + table.allowsSelection = NO; [super viewDidLoad]; } -(void) viewDidUnload { self.username = nil; self.password = nil; - self.musicOn = nil; - self.effectsOn = nil; - self.altDamageOn = nil; + self.musicSwitch = nil; + self.effectsSwitch = nil; + self.altDamageSwitch = nil; self.volumeLabel = nil; self.volumeSlider = nil; + self.table = nil; + self.volumeCell = nil; [super viewDidUnload]; } //- (void)applicationWillTerminate:(NSNotification *)notification { -(void) viewWillDisappear:(BOOL)animated { - NSMutableDictionary *saveArray = [[NSMutableDictionary alloc] init]; - NSString *tmpMus = (musicOn.on) ? @"1" : @"0"; - NSString *tmpEff = (effectsOn.on) ? @"1" : @"0"; - NSString *tmpAlt = (altDamageOn.on) ? @"1" : @"0"; + NSMutableDictionary *saveDict = [[NSMutableDictionary alloc] init]; + NSString *tmpMus = (musicSwitch.on) ? @"1" : @"0"; + NSString *tmpEff = (effectsSwitch.on) ? @"1" : @"0"; + NSString *tmpAlt = (altDamageSwitch.on) ? @"1" : @"0"; - [saveArray setObject:username.text forKey:@"username"]; - [saveArray setObject:password.text forKey:@"password"]; - [saveArray setObject:tmpMus forKey:@"music"]; - [saveArray setObject:tmpEff forKey:@"effects"]; - [saveArray setObject:tmpAlt forKey:@"alternate"]; - [saveArray setObject:volumeLabel.text forKey:@"volume"]; + [saveDict setObject:username.text forKey:@"username"]; + [saveDict setObject:password.text forKey:@"password"]; + [saveDict setObject:tmpMus forKey:@"music"]; + [saveDict setObject:tmpEff forKey:@"effects"]; + [saveDict setObject:tmpAlt forKey:@"alternate"]; + [saveDict setObject:volumeLabel.text forKey:@"volume"]; - [saveArray writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES]; - [saveArray release]; + [saveDict writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES]; + [saveDict release]; [super viewWillDisappear:animated]; } @@ -114,12 +124,139 @@ -(void) dealloc { [username release]; [password release]; - [musicOn release]; - [effectsOn release]; - [altDamageOn release]; + [musicSwitch release]; + [effectsSwitch release]; + [altDamageSwitch release]; [volumeLabel release]; [volumeSlider release]; - [super dealloc]; + [table release]; + [volumeCell release]; + [super dealloc]; +} + +#pragma mark - +#pragma mark TableView Methods +#define kNetworkFields 0 +#define kAudioFields 1 +#define kOtherFields 2 + +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { + return 3; +} + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + switch (section) { + case kNetworkFields: + return 2; + break; + case kAudioFields: + return 3; + break; + case kOtherFields: + return 1; + break; + default: + NSLog(@"Warning: unset case value for numberOfRowsInSection!"); + break; + } + return 0; +} + +-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *cellIdentifier = @"systemSettingsCell"; + + UITableViewCell *cell; + if ( !(kAudioFields == [indexPath section] && 2 == [indexPath row]) ){ + cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier]; + if (nil == cell) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:cellIdentifier] autorelease]; + } + } + + switch ([indexPath section]) { + case kNetworkFields: + switch ([indexPath row]) { + case 0: + cell.textLabel.text = NSLocalizedString(@"Nickname", @""); + cell.accessoryView = username; + break; + case 1: + cell.textLabel.text = NSLocalizedString(@"Password", @""); + cell.accessoryView = password; + break; + default: + NSLog(@"Warning: unset case value in kNetworkFields section!"); + break; + } + break; + case kAudioFields: + switch ([indexPath row]) { + case 0: + cell.accessoryView = musicSwitch; + cell.textLabel.text = NSLocalizedString(@"Music", @""); + break; + case 1: + cell.accessoryView = effectsSwitch; + cell.textLabel.text = NSLocalizedString(@"Sound Effects", @""); + break; + case 2: + cell = volumeCell; + break; + default: + NSLog(@"Warning: unset case value in kAudioFields section!"); + break; + } + break; + case kOtherFields: + cell.accessoryView = altDamageSwitch; + cell.textLabel.text = NSLocalizedString(@"Alternate Damage", @""); + break; + default: + break; + } + + return cell; +} + +-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + UIView *containerView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)] autorelease]; + UILabel *headerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(10, 20, 300, 40)] autorelease]; + headerLabel.textColor = [UIColor lightGrayColor]; + headerLabel.shadowColor = [UIColor blackColor]; + headerLabel.shadowOffset = CGSizeMake(0, 1); + headerLabel.font = [UIFont boldSystemFontOfSize:20]; + headerLabel.backgroundColor = [UIColor clearColor]; + + switch (section) { + case kNetworkFields: + headerLabel.text = NSLocalizedString(@"Network Configuration", @""); + break; + case kAudioFields: + headerLabel.text = NSLocalizedString(@"Audio Preferences", @""); + break; + case kOtherFields: + headerLabel.text = NSLocalizedString(@"Other Settings", @""); + break; + default: + NSLog(@"Warning: unset case value in titleForHeaderInSection!"); + headerLabel.text = @"!!!"; + break; + } + + [containerView addSubview:headerLabel]; + return containerView; +} + +-(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { + if (kAudioFields == [indexPath section] && 2 == [indexPath row]) + return volumeCell.frame.size.height; + else + return table.rowHeight; +} + +-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + return 57; } diff -r 726e4a230b48 -r 3a8560c00f78 cocoaTouch/SettingsViewController.xib --- a/cocoaTouch/SettingsViewController.xib Wed Jan 20 14:31:45 2010 +0000 +++ b/cocoaTouch/SettingsViewController.xib Sat Jan 23 13:15:27 2010 +0000 @@ -12,6 +12,7 @@ YES + @@ -56,22 +57,23 @@ 292 - {{130, 135}, {152, 31}} + {{100, 18}, {200, 31}} NO NO 0 - 3 username - 3 - MAA - - 2 - + 1 + MC40MDAwMDAwMDYgMC40MDAwMDAwMDYgMQA - YES + + Helvetica + 15 + 16 + + 2 YES 17 @@ -82,19 +84,22 @@ 292 - {{130, 174}, {152, 31}} + {{100, 50}, {200, 31}} NO NO 0 - 3 network password (if any) 3 MAA - + + 2 + + + 2 YES YES 17 @@ -104,72 +109,23 @@ YES - + - 292 - {{38, 373}, {243, 23}} - - NO - YES - YES - 0 - 0 - 100 - 100 - NO - - - - 292 - {{188, 224}, {94, 27}} - - NO - YES - YES - 0 - 0 - YES - - - - 292 - {{188, 279}, {94, 27}} + 274 + {{0, 98}, {320, 333}} NO YES - YES - 0 - 0 - YES - - - - 292 - {{56, 316}, {42, 21}} - - NO - YES - NO - - - 1 - MSAxIDEAA - - - 1 - 10 - - - - 292 - {{188, 330}, {94, 27}} - - NO - YES - YES - 0 - 0 - YES + NO + NO + NO + NO + 1 + 1 + 0 + 44 + 10 + 10 {320, 431} @@ -180,6 +136,93 @@ + + + 292 + + YES + + + 256 + + YES + + + 292 + {{10, 37}, {284, 23}} + + NO + YES + YES + 0 + 0 + 100 + 100 + NO + + + + 292 + {{250, 8}, {42, 21}} + + NO + YES + NO + + + 1 + MCAwLjUwMTk2MDgxNCAxAA + + + 1 + 10 + 2 + + + + 292 + {{12, 8}, {62, 21}} + + NO + YES + NO + Volume + + Helvetica-Bold + 17 + 16 + + + 1 + MCAwIDAAA + + + 1 + 10 + + + {320, 69} + + + 3 + MCAwAA + + NO + YES + 4 + YES + + + {320, 70} + + + 1 + MSAxIDEAA + + NO + 1 + + @@ -209,22 +252,6 @@ 14 - - musicOn - - - - 15 - - - - effectsOn - - - - 16 - - backgroundTap: @@ -253,14 +280,6 @@ - volumeLabel - - - - 21 - - - volumeSlider @@ -287,11 +306,43 @@ - altDamageOn + dataSource + + + + 31 + + + + delegate + + + + 32 + + + + table - + + + 34 + + + + volumeLabel + + - 28 + 36 + + + + volumeCell + + + + 39 @@ -309,13 +360,9 @@ YES - + - - - - - + @@ -336,39 +383,48 @@ - 5 - - - - 6 - 7 - + 30 + + + YES + - 8 - + 5 + - 9 - - + 37 + + + YES + + + + + - 20 - - + 7 + + - 27 - - + 35 + + + + + 38 + + @@ -381,14 +437,15 @@ 1.CustomClassName 1.IBEditorWindowLastContentRect 1.IBPluginDependency - 20.IBPluginDependency - 27.IBPluginDependency + 30.IBPluginDependency + 35.IBPluginDependency + 37.IBEditorWindowLastContentRect + 37.IBPluginDependency + 38.IBPluginDependency 4.IBPluginDependency 5.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency - 8.IBPluginDependency - 9.IBPluginDependency YES @@ -399,6 +456,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{564, 553}, {320, 70}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -423,7 +481,7 @@ - 28 + 40 @@ -450,21 +508,19 @@ YES YES - altDamageOn - effectsOn - musicOn password + table username + volumeCell volumeLabel volumeSlider YES - UISwitch - UISwitch - UISwitch UITextField + UITableView UITextField + UITableViewCell UILabel UISlider @@ -640,6 +696,14 @@ + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + + UISearchBar UIView @@ -664,11 +728,19 @@ - UISwitch - UIControl + UITableView + UIScrollView IBFrameworkSource - UIKit.framework/Headers/UISwitch.h + UIKit.framework/Headers/UITableView.h + + + + UITableViewCell + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITableViewCell.h diff -r 726e4a230b48 -r 3a8560c00f78 hedgewars/SDLh.pas --- a/hedgewars/SDLh.pas Wed Jan 20 14:31:45 2010 +0000 +++ b/hedgewars/SDLh.pas Sat Jan 23 13:15:27 2010 +0000 @@ -739,7 +739,9 @@ procedure IMG_Quit; cdecl; external SDL_ImageLibName; function IMG_Load(const _file: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName; +function IMG_Load_RW(rwop: PSDL_RWops; freesrc: LongInt): PSDL_Surface; cdecl; external SDL_ImageLibName; function IMG_LoadPNG_RW(rwop: PSDL_RWops): PSDL_Surface; cdecl; external SDL_ImageLibName; +function IMG_LoadTyped_RW(rwop: PSDL_RWops; freesrc: LongInt; _type: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName; (* SDL_net *) function SDLNet_Init: LongInt; cdecl; external SDL_NetLibName; diff -r 726e4a230b48 -r 3a8560c00f78 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Wed Jan 20 14:31:45 2010 +0000 +++ b/hedgewars/uStore.pas Sat Jan 23 13:15:27 2010 +0000 @@ -1108,7 +1108,7 @@ vendor:= LowerCase(string(pchar(glGetString(GL_VENDOR)))); {$IFDEF DEBUGFILE} - AddFileLog('OpenGL - Renderer: ' + string(pchar(glGetString(GL_RENDERER)))); + AddFileLog('OpenGL-- Renderer: ' + string(pchar(glGetString(GL_RENDERER)))); AddFileLog(' |----- Vendor: ' + vendor); AddFileLog(' |----- Version: ' + string(pchar(glGetString(GL_VERSION)))); AddFileLog(' \----- GL_MAX_TEXTURE_SIZE: ' + inttostr(MaxTextureSize));