# HG changeset patch # User koda # Date 1278362563 -7200 # Node ID 304c6d32383a54f5c0aa3470d1fdef98e691788c # Parent f14db208f2fac2c9fd1fb6c617927f4f157d86c8 button to open ammomenu loading screen that fits launch orientation further work on weapon selection more savings for older idevices diff -r f14db208f2fa -r 304c6d32383a hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Sun Jul 04 01:27:41 2010 +0200 +++ b/hedgewars/hwengine.pas Mon Jul 05 22:42:43 2010 +0200 @@ -198,6 +198,7 @@ /////////////// {$IFDEF HWLIBRARY} procedure Game(gameArgs: arrayofpchar); cdecl; export; +var tmp_quality: LongInt; {$ELSE} procedure Game; {$ENDIF} @@ -213,7 +214,11 @@ cVSyncInUse:= true; cTimerInterval:= 8; PathPrefix:= 'Data'; +{$IFDEF DEBUGFILE} cShowFPS:= true; +{$ELSE} + cShowFPS:= false; +{$ENDIF} cInitVolume:= 100; UserNick:= gameArgs[0]; @@ -226,15 +231,15 @@ val(gameArgs[7], cScreenWidth); recordFileName:= gameArgs[8]; - if (gameArgs[9] = '2') then - cReducedQuality:= rqLowRes or rqBlurryLand - else - if (gameArgs[9] = '1') then - cReducedQuality:= rqBlurryLand - else - cReducedQuality:= rqNone; + val(gameArgs[9], tmp_quality); + case tmp_quality of + 0: cReducedQuality:= rqNone; + 1: cReducedQuality:= rqBlurryLand; + 2: cReducedQuality:= rqBlurryLand or rqKillFlakes; + 3: cReducedQuality:= rqBlurryLand or rqKillFlakes or rqLowRes; + end; +{$ENDIF} -{$ENDIF} initEverything(true); WriteLnToConsole('Hedgewars ' + cVersionString + ' engine (network protocol: ' + inttostr(cNetProtoVersion) + ')'); {$IFDEF DEBUGFILE} diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Classes/GameSetup.m --- a/project_files/HedgewarsMobile/Classes/GameSetup.m Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Mon Jul 05 22:42:43 2010 +0200 @@ -379,13 +379,14 @@ if ([modelId hasPrefix:@"iPhone1"] || // = iPhone or iPhone 3G [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"]) // = iPod Touch or iPod Touch 2G - gameArgs[9] = "2"; // rqLowRes & rqBlurryLand + gameArgs[9] = "3"; // rqLowRes & rqBlurryLand & rqKillFlakes else if ([modelId hasPrefix:@"iPhone2"] || // = iPhone 3GS - [modelId hasPrefix:@"iPad1"] || // = iPad [modelId hasPrefix:@"iPod3"]) // = iPod Touch 3G - gameArgs[9] = "1"; // rqBlurryLand - else // = everything else - gameArgs[9] = "0"; // full quality + gameArgs[9] = "2"; // rqBlurryLand & rqKillFlakes + else if ([modelId hasPrefix:@"iPad1"]) // = iPad + gameArgs[9] = "1"; // rqBlurryLand + else // = everything else + gameArgs[9] = "0"; // full quality [modelId release]; diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Classes/OverlayViewController.m --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Jul 05 22:42:43 2010 +0200 @@ -228,6 +228,9 @@ case 10: [self showPopover]; break; + case 11: + HW_ammoMenu(); + break; default: NSLog(@"Nope"); break; @@ -327,13 +330,10 @@ case 1: DLog(@"X:%d Y:%d", HWX(currentPosition.x), HWY(currentPosition.y)); HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y)); + if (2 == [touch tapCount]) + HW_zoomReset(); break; - case 2: - if (2 == [touch tapCount]) { - HW_ammoMenu(); - //HW_zoomReset(); - } - + case 2: // pinching twoTouches = [touches allObjects]; UITouch *first = [twoTouches objectAtIndex:0]; diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h --- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h Mon Jul 05 22:42:43 2010 +0200 @@ -7,9 +7,9 @@ // #import - +#import "WeaponCellView.h" -@interface SingleWeaponViewController : UITableViewController { +@interface SingleWeaponViewController : UITableViewController { UIImage *ammoStoreImage; NSArray *ammoNames; diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Mon Jul 05 22:42:43 2010 +0200 @@ -160,6 +160,7 @@ WeaponCellView *cell = (WeaponCellView *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier]; if (cell == nil) { cell = [[[WeaponCellView alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; + cell.delegate = self; } int x = ((row*32)/1024)*32; @@ -168,11 +169,12 @@ UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, 32, 32)] makeRoundCornersOfSize:CGSizeMake(7, 7)]; cell.weaponIcon.image = img; cell.weaponName.text = [ammoNames objectAtIndex:row]; - - cell.initialQt.titleLabel.text = [NSString stringWithFormat:@"%c",quantity[row]]; + cell.tag = row; + + [cell.initialQt setTitle:[NSString stringWithFormat:@"%c",quantity[row]] forState:UIControlStateNormal]; cell.probability.titleLabel.text = [NSString stringWithFormat:@"%c",probability[row]]; cell.delay.titleLabel.text = [NSString stringWithFormat:@"%c",delay[row]]; - cell.initialQt.titleLabel.text = [NSString stringWithFormat:@"%c",crateness[row]]; + cell.crateQt.titleLabel.text = [NSString stringWithFormat:@"%c",crateness[row]]; return cell; } @@ -190,6 +192,12 @@ */ } +#pragma mark - +#pragma mark WeaponButtonControllerDelegate +-(void) buttonPressed:(id) sender { + UIButton *button = (UIButton *)sender; + DLog(@"%@ %d", button.titleLabel.text, button.tag); +} #pragma mark - #pragma mark Memory management diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Classes/WeaponCellView.h --- a/project_files/HedgewarsMobile/Classes/WeaponCellView.h Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.h Mon Jul 05 22:42:43 2010 +0200 @@ -8,8 +8,14 @@ #import +@protocol WeaponButtonControllerDelegate + +-(void) buttonPressed:(id) sender; + +@end @interface WeaponCellView : UITableViewCell { + id delegate; UILabel *weaponName; UIImageView *weaponIcon; @@ -19,6 +25,8 @@ UIButton *crateQt; } +@property (nonatomic,assign) id delegate; + @property (nonatomic,retain) UILabel *weaponName; @property (nonatomic,retain) UIImageView *weaponIcon; diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Classes/WeaponCellView.m --- a/project_files/HedgewarsMobile/Classes/WeaponCellView.m Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.m Mon Jul 05 22:42:43 2010 +0200 @@ -10,11 +10,12 @@ #import "CommodityFunctions.h" @implementation WeaponCellView -@synthesize weaponName, weaponIcon, initialQt, probability, delay, crateQt; +@synthesize delegate, weaponName, weaponIcon, initialQt, probability, delay, crateQt; -(id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) { - // Initialization code + delegate = nil; + weaponName = [[UILabel alloc] init]; weaponName.backgroundColor = [UIColor clearColor]; weaponName.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]]; @@ -23,20 +24,25 @@ NSString *imgStr; initialQt = [[UIButton alloc] init]; imgStr = [NSString stringWithFormat:@"%@/iconAmmo.png",BTN_DIRECTORY()]; + [initialQt setTitleColor:[UIColor blueColor] forState:UIControlStateNormal]; [initialQt setBackgroundImage:[UIImage imageWithContentsOfFile:imgStr] forState:UIControlStateNormal]; + [initialQt addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; probability = [[UIButton alloc] init]; imgStr = [NSString stringWithFormat:@"%@/iconDamage.png",BTN_DIRECTORY()]; [probability setBackgroundImage:[UIImage imageWithContentsOfFile:imgStr] forState:UIControlStateNormal]; - + [probability addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; + delay = [[UIButton alloc] init]; imgStr = [NSString stringWithFormat:@"%@/iconTime.png",BTN_DIRECTORY()]; [delay setBackgroundImage:[UIImage imageWithContentsOfFile:imgStr] forState:UIControlStateNormal]; - + [delay addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; + crateQt = [[UIButton alloc] init]; imgStr = [NSString stringWithFormat:@"%@/iconBox.png",BTN_DIRECTORY()]; [crateQt setBackgroundImage:[UIImage imageWithContentsOfFile:imgStr] forState:UIControlStateNormal]; - + [crateQt addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; + [self.contentView addSubview:weaponName]; [self.contentView addSubview:weaponIcon]; [self.contentView addSubview:initialQt]; @@ -54,10 +60,10 @@ CGFloat boundsX = contentRect.origin.x; CGRect frame; - frame = CGRectMake(boundsX+10, 5, 32, 32); + frame = CGRectMake(boundsX+5, 5, 32, 32); weaponIcon.frame = frame; - frame = CGRectMake(boundsX+50, 9, 200, 25); + frame = CGRectMake(boundsX+45, 8, 200, 25); weaponName.frame = frame; // second line @@ -81,6 +87,14 @@ } */ +-(void) buttonPressed:(id) sender { + if (self.delegate != nil) { + [(UIButton *)sender setTag:self.tag]; + [delegate buttonPressed:sender]; + } else + DLog(@"error - delegate = nil!"); +} + -(void) dealloc { [weaponName release]; [weaponIcon release]; diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Jul 05 22:42:43 2010 +0200 @@ -27,7 +27,6 @@ 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; }; 611E12FF117BBBDA0044B62F /* Entitlements-Development.plist in Resources */ = {isa = PBXBuildFile; fileRef = 611E12FE117BBBDA0044B62F /* Entitlements-Development.plist */; }; 611F4D4B11B27A9900F9759A /* uScript.pas in Sources */ = {isa = PBXBuildFile; fileRef = 611F4D4A11B27A9900F9759A /* uScript.pas */; }; - 6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; }; 61272334117DF764005B90CF /* libSDL_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272333117DF752005B90CF /* libSDL_image.a */; }; 61272339117DF778005B90CF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272338117DF778005B90CF /* MobileCoreServices.framework */; }; 61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */ = {isa = PBXBuildFile; fileRef = 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */; }; @@ -78,7 +77,6 @@ 6165925511CA9CB400D6E256 /* MapConfigViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */; }; 6165925611CA9CB400D6E256 /* MapConfigViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */; }; 6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165925011CA9CB400D6E256 /* OverlayViewController.xib */; }; - 6165927F11CA9D3200D6E256 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6165927B11CA9D3200D6E256 /* Default.png */; }; 6165928011CA9D3200D6E256 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6165927C11CA9D3200D6E256 /* Icon.png */; }; 6165929E11CA9E2F00D6E256 /* SDL_uikitappdelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */; }; 61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; }; @@ -138,6 +136,11 @@ 61EF921311DF57AC003441C4 /* joyButton_backjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */; }; 61EF921411DF57AC003441C4 /* joyButton_forwardjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */; }; 61EF921611DF57AC003441C4 /* menuCorner.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920D11DF57AC003441C4 /* menuCorner.png */; }; + 61F7A2FA11E270E70040BA66 /* Default-LandscapeLeft-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2F811E270E70040BA66 /* Default-LandscapeLeft-iphone.png */; }; + 61F7A2FB11E270E70040BA66 /* Default-LandscapeRight-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2F911E270E70040BA66 /* Default-LandscapeRight-iphone.png */; }; + 61F7A2FE11E270F00040BA66 /* Default-LandscapeLeft-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2FC11E270F00040BA66 /* Default-LandscapeLeft-ipad.png */; }; + 61F7A2FF11E270F00040BA66 /* Default-LandscapeRight-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A2FD11E270F00040BA66 /* Default-LandscapeRight-ipad.png */; }; + 61F7A30211E272280040BA66 /* lateralButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A30111E272280040BA66 /* lateralButton.png */; }; 61F903EF11DF58550068B24D /* backgroundBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E411DF58550068B24D /* backgroundBottom.png */; }; 61F903F011DF58550068B24D /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E511DF58550068B24D /* backgroundCenter.png */; }; 61F903F111DF58550068B24D /* backgroundLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E611DF58550068B24D /* backgroundLeft.png */; }; @@ -240,7 +243,6 @@ 611E12FE117BBBDA0044B62F /* Entitlements-Development.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Entitlements-Development.plist"; sourceTree = ""; }; 611F4D4A11B27A9900F9759A /* uScript.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uScript.pas; path = ../../hedgewars/uScript.pas; sourceTree = SOURCE_ROOT; }; 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HedgewarsTitle.png; path = ../../QTfrontend/res/HedgewarsTitle.png; sourceTree = SOURCE_ROOT; }; - 6122CD00116BECCA002648E9 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "Resources/Default-Landscape.png"; sourceTree = ""; }; 6127232E117DF752005B90CF /* SDL_image.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_image.xcodeproj; path = "../../../Library/SDL-1.3/SDL_image/Xcode_iPhone/SDL_image.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61272338117DF778005B90CF /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Entitlements-Distribution.plist"; sourceTree = ""; }; @@ -321,7 +323,6 @@ 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MapConfigViewController-iPad.xib"; path = "Resources/MapConfigViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MapConfigViewController-iPhone.xib"; path = "Resources/MapConfigViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; }; 6165925011CA9CB400D6E256 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = Resources/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; - 6165927B11CA9D3200D6E256 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Default.png; sourceTree = ""; }; 6165927C11CA9D3200D6E256 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icon.png; sourceTree = ""; }; 6165929C11CA9E2F00D6E256 /* SDL_uikitappdelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_uikitappdelegate.h; path = Classes/SDL_uikitappdelegate.h; sourceTree = ""; }; 6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_uikitappdelegate.m; path = Classes/SDL_uikitappdelegate.m; sourceTree = ""; }; @@ -388,6 +389,11 @@ 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_backjump.png; path = Resources/Overlay/joyButton_backjump.png; sourceTree = ""; }; 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_forwardjump.png; path = Resources/Overlay/joyButton_forwardjump.png; sourceTree = ""; }; 61EF920D11DF57AC003441C4 /* menuCorner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menuCorner.png; path = Resources/Overlay/menuCorner.png; sourceTree = ""; }; + 61F7A2F811E270E70040BA66 /* Default-LandscapeLeft-iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeLeft-iphone.png"; path = "Resources/Default-LandscapeLeft-iphone.png"; sourceTree = ""; }; + 61F7A2F911E270E70040BA66 /* Default-LandscapeRight-iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeRight-iphone.png"; path = "Resources/Default-LandscapeRight-iphone.png"; sourceTree = ""; }; + 61F7A2FC11E270F00040BA66 /* Default-LandscapeLeft-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeLeft-ipad.png"; path = "Resources/Default-LandscapeLeft-ipad.png"; sourceTree = ""; }; + 61F7A2FD11E270F00040BA66 /* Default-LandscapeRight-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-LandscapeRight-ipad.png"; path = "Resources/Default-LandscapeRight-ipad.png"; sourceTree = ""; }; + 61F7A30111E272280040BA66 /* lateralButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lateralButton.png; path = Resources/lateralButton.png; sourceTree = ""; }; 61F903E411DF58550068B24D /* backgroundBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundBottom.png; path = "Resources/Frontend-iPhone/backgroundBottom.png"; sourceTree = ""; }; 61F903E511DF58550068B24D /* backgroundCenter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundCenter.png; path = "Resources/Frontend-iPhone/backgroundCenter.png"; sourceTree = ""; }; 61F903E611DF58550068B24D /* backgroundLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundLeft.png; path = "Resources/Frontend-iPhone/backgroundLeft.png"; sourceTree = ""; }; @@ -518,7 +524,8 @@ 61F903E311DF584D0068B24D /* Frontend-iPhone */, 6179936611501D1E00BA94A9 /* Overlay */, 61798A5E114AE08600BA94A9 /* Data */, - 6165927B11CA9D3200D6E256 /* Default.png */, + 61F7A2F811E270E70040BA66 /* Default-LandscapeLeft-iphone.png */, + 61F7A2F911E270E70040BA66 /* Default-LandscapeRight-iphone.png */, 6165927C11CA9D3200D6E256 /* Icon.png */, 8D1107310486CEB800E47090 /* Info.plist */, 61F9040811DF58B00068B24D /* settingsButton.png */, @@ -553,7 +560,8 @@ isa = PBXGroup; children = ( 6151347D116C2803001F16D1 /* Icon-iPad.png */, - 6122CD00116BECCA002648E9 /* Default-Landscape.png */, + 61F7A2FC11E270F00040BA66 /* Default-LandscapeLeft-ipad.png */, + 61F7A2FD11E270F00040BA66 /* Default-LandscapeRight-ipad.png */, 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */, ); name = "Resources-iPad"; @@ -730,6 +738,7 @@ 6179936611501D1E00BA94A9 /* Overlay */ = { isa = PBXGroup; children = ( + 61F7A30111E272280040BA66 /* lateralButton.png */, 61EF920511DF57AC003441C4 /* arrowDown.png */, 61EF920611DF57AC003441C4 /* arrowLeft.png */, 61EF920711DF57AC003441C4 /* arrowRight.png */, @@ -986,7 +995,6 @@ 61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */, 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */, 61799289114AE08700BA94A9 /* Data in Resources */, - 6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */, 6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */, 61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */, 611E12FF117BBBDA0044B62F /* Entitlements-Development.plist in Resources */, @@ -995,7 +1003,6 @@ 6165925511CA9CB400D6E256 /* MapConfigViewController-iPad.xib in Resources */, 6165925611CA9CB400D6E256 /* MapConfigViewController-iPhone.xib in Resources */, 6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */, - 6165927F11CA9D3200D6E256 /* Default.png in Resources */, 6165928011CA9D3200D6E256 /* Icon.png in Resources */, 61EF920E11DF57AC003441C4 /* arrowDown.png in Resources */, 61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */, @@ -1024,6 +1031,11 @@ 61EBA62911DFF2BC0048B68A /* bricks.png in Resources */, 61EBA62A11DFF2BC0048B68A /* title.png in Resources */, 61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */, + 61F7A2FA11E270E70040BA66 /* Default-LandscapeLeft-iphone.png in Resources */, + 61F7A2FB11E270E70040BA66 /* Default-LandscapeRight-iphone.png in Resources */, + 61F7A2FE11E270F00040BA66 /* Default-LandscapeLeft-ipad.png in Resources */, + 61F7A2FF11E270F00040BA66 /* Default-LandscapeRight-ipad.png in Resources */, + 61F7A30211E272280040BA66 /* lateralButton.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/Default-Landscape.png Binary file project_files/HedgewarsMobile/Resources/Default-Landscape.png has changed diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-ipad.png Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-ipad.png has changed diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-iphone.png Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeLeft-iphone.png has changed diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/Default-LandscapeRight-ipad.png Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeRight-ipad.png has changed diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/Default-LandscapeRight-iphone.png Binary file project_files/HedgewarsMobile/Resources/Default-LandscapeRight-iphone.png has changed diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/Default.png Binary file project_files/HedgewarsMobile/Resources/Default.png has changed diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/OverlayViewController.xib --- a/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Sun Jul 04 01:27:41 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Mon Jul 05 22:42:43 2010 +0200 @@ -49,6 +49,7 @@ NO NO + YES IBCocoaTouchFramework 0 0 @@ -81,6 +82,7 @@ NO NO + YES 1 IBCocoaTouchFramework 0 @@ -104,6 +106,7 @@ NO NO + YES 5 IBCocoaTouchFramework 0 @@ -127,6 +130,7 @@ NO NO + YES 6 IBCocoaTouchFramework 0 @@ -150,6 +154,7 @@ NO NO + YES 4 IBCocoaTouchFramework 0 @@ -173,6 +178,7 @@ NO NO + YES 2 IBCocoaTouchFramework 0 @@ -196,6 +202,7 @@ NO NO + YES 3 IBCocoaTouchFramework 0 @@ -218,6 +225,7 @@ {{412, -6}, {72, 64}} NO + YES 10 IBCocoaTouchFramework 0 @@ -244,6 +252,29 @@ YES 0 + + + 289 + {{460, 33}, {20, 60}} + + NO + YES + 11 + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + lateralButton.png + + {480, 320} @@ -541,6 +572,15 @@ 64 + + + buttonPressed: + + + 7 + + 68 + @@ -565,6 +605,7 @@ + @@ -631,6 +672,11 @@ + + 67 + + + @@ -650,12 +696,14 @@ 53.IBPluginDependency 58.IBPluginDependency 63.IBPluginDependency + 67.IBPluginDependency YES OverlayViewController UIResponder - {{819, 369}, {480, 320}} + {{567, 304}, {480, 320}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -684,7 +732,7 @@ - 66 + 68 @@ -998,6 +1046,7 @@ joyButton_attack.png joyButton_backjump.png joyButton_forwardjump.png + lateralButton.png menuCorner.png @@ -1009,6 +1058,7 @@ {64, 64} {64, 64} {64, 64} + {20, 60} {64, 64} diff -r f14db208f2fa -r 304c6d32383a project_files/HedgewarsMobile/Resources/lateralButton.png Binary file project_files/HedgewarsMobile/Resources/lateralButton.png has changed