# HG changeset patch # User koda # Date 1277067911 -7200 # Node ID 1d7b056ff8663a8cf72f24fbe6cb96f3cbcc4a31 # Parent 6592fbb969daff01ccd9a9a0af63d31a2865d50a some memory caring code diff -r 6592fbb969da -r 1d7b056ff866 CMakeLists.txt --- a/CMakeLists.txt Sun Jun 20 18:35:59 2010 +0200 +++ b/CMakeLists.txt Sun Jun 20 23:05:11 2010 +0200 @@ -182,13 +182,13 @@ set(HAVE_NETSERVER false) endif(WITH_SERVER) +add_subdirectory(misc/liblua) add_subdirectory(hedgewars) if(NOT BUILD_ENGINE_LIBRARY) add_subdirectory(bin) add_subdirectory(QTfrontend) add_subdirectory(share) add_subdirectory(tools) - add_subdirectory(misc/liblua) endif() # CPack vars diff -r 6592fbb969da -r 1d7b056ff866 hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Sun Jun 20 18:35:59 2010 +0200 +++ b/hedgewars/hwengine.pas Sun Jun 20 23:05:11 2010 +0200 @@ -75,13 +75,13 @@ {$IFDEF HWLIBRARY} type arrayofpchar = array[0..8] of PChar; -procedure initEverything; -procedure freeEverything; +procedure initEverything(complete:boolean); +procedure freeEverything(complete:boolean); implementation {$ELSE} procedure OnDestroy; forward; -procedure freeEverything; forward; +procedure freeEverything(complete:boolean); forward; {$ENDIF} //////////////////////////////// @@ -243,7 +243,7 @@ s: shortstring; begin {$IFDEF HWLIBRARY} - initEverything(); + initEverything(true); cBits:= 32; cFullScreen:= false; @@ -331,81 +331,88 @@ MainLoop(); OnDestroy(); -{$IFDEF HWLIBRARY}freeEverything();{$ENDIF} +{$IFDEF HWLIBRARY}freeEverything(true);{$ENDIF} if alsoShutdownFrontend then halt; end; -procedure initEverything; +procedure initEverything (complete:boolean); begin Randomize(); uConsts.initModule; uMisc.initModule; uConsole.initModule; // MUST happen after uMisc - - uAI.initModule; - //uAIActions does not need initialization - //uAIAmmoTests does not need initialization - uAIMisc.initModule; - uAmmos.initModule; - uChat.initModule; - uCollisions.initModule; - //uFloat does not need initialization - //uGame does not need initialization - uGears.initModule; - uIO.initModule; - uKeys.initModule; + uLand.initModule; - //uLandGraphics does not need initialization - //uLandObjects does not need initialization - //uLandTemplates does not need initialization - //uLandTexture does not need initialization - //uLocale does not need initialization - uRandom.initModule; - //uSHA is initialized internally - uSound.initModule; - uStats.initModule; - uStore.initModule; - uTeams.initModule; - uVisualGears.initModule; - uWorld.initModule; - uScript.initModule; + uIO.initModule; + + if complete then + begin + uAI.initModule; + //uAIActions does not need initialization + //uAIAmmoTests does not need initialization + uAIMisc.initModule; + uAmmos.initModule; + uChat.initModule; + uCollisions.initModule; + //uFloat does not need initialization + //uGame does not need initialization + uGears.initModule; + uKeys.initModule; + //uLandGraphics does not need initialization + //uLandObjects does not need initialization + //uLandTemplates does not need initialization + //uLandTexture does not need initialization + //uLocale does not need initialization + uRandom.initModule; + //uSHA is initialized internally + uScript.initModule; + uSound.initModule; + uStats.initModule; + uStore.initModule; + uTeams.initModule; + uVisualGears.initModule; + uWorld.initModule; + end; end; -procedure freeEverything; +procedure freeEverything (complete:boolean); begin - uWorld.freeModule; - uVisualGears.freeModule; //stub - uTeams.freeModule; - uStore.freeModule; //stub - uStats.freeModule; //stub - uSound.freeModule; //stub - //uSHA does not need to be freed - uRandom.freeModule; //stub - //uLocale does not need to be freed - //uLandTemplates does not need to be freed - //uLandTexture does not need to be freed - //uLandObjects does not need to be freed - //uLandGraphics does not need to be freed + if complete then + begin + uWorld.freeModule; + uVisualGears.freeModule; //stub + uTeams.freeModule; + uStore.freeModule; //stub + uStats.freeModule; //stub + uSound.freeModule; //stub + uScript.freeModule; + //uSHA does not need to be freed + uRandom.freeModule; //stub + //uLocale does not need to be freed + //uLandTemplates does not need to be freed + //uLandTexture does not need to be freed + //uLandObjects does not need to be freed + //uLandGraphics does not need to be freed + uKeys.freeModule; //stub + uGears.freeModule; + //uGame does not need to be freed + //uFloat does not need to be freed + uCollisions.freeModule; //stub + uChat.freeModule; //stub + uAmmos.freeModule; + uAIMisc.freeModule; //stub + //uAIAmmoTests does not need to be freed + //uAIActions does not need to be freed + uAI.freeModule; //stub + end; + + uIO.freeModule; //stub uLand.freeModule; - uKeys.freeModule; //stub - uIO.freeModule; //stub - uGears.freeModule; - //uGame does not need to be freed - //uFloat does not need to be freed - uCollisions.freeModule; //stub - uChat.freeModule; //stub - uAmmos.freeModule; - uAIMisc.freeModule; //stub - //uAIAmmoTests does not need to be freed - //uAIActions does not need to be freed - uAI.freeModule; //stub uConsole.freeModule; + uMisc.freeModule; // uMisc closes the debug log. uConsts.freeModule; //stub - uScript.freeModule; - // uMisc closes the debug log. - uMisc.freeModule; end; ///////////////////////// @@ -413,7 +420,7 @@ var Preview: TPreview; begin {$IFDEF IPHONEOS} - initEverything(); + initEverything(false); WriteLnToConsole('Preview connecting on port ' + inttostr(port)); ipcPort:= port; {$ENDIF} @@ -428,7 +435,7 @@ WriteLnToConsole('Preview sent, disconnect'); CloseIPC(); {$IFDEF IPHONEOS} - freeEverything(); + freeEverything(false); {$ENDIF} end; @@ -596,7 +603,7 @@ /////////////////////////////// m a i n //////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// begin - initEverything(); + initEverything(true); WriteLnToConsole('Hedgewars ' + cVersionString + ' engine (network protocol: ' + inttostr(cNetProtoVersion) + ')'); GetParams(); @@ -605,7 +612,7 @@ else if GameType = gmtSyntax then DisplayUsage() else Game(); - freeEverything(); + freeEverything(true); if GameType = gmtSyntax then ExitCode:= 1 else diff -r 6592fbb969da -r 1d7b056ff866 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Sun Jun 20 18:35:59 2010 +0200 +++ b/hedgewars/uStore.pas Sun Jun 20 23:05:11 2010 +0200 @@ -1322,11 +1322,16 @@ end; - +{$IFDEF IPHONEOS} +procedure spinningWheelDone; cdecl; external; +{$ENDIF} procedure FinishProgress; begin WriteLnToConsole('Freeing progress surface... '); FreeTexture(ProgrTex); +{$IFDEF IPHONEOS} + spinningWheelDone(); +{$ENDIF} end; procedure flipSurface(Surface: PSDL_Surface; Vertical: Boolean); diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Jun 20 23:05:11 2010 +0200 @@ -131,6 +131,9 @@ } -(void) viewDidLoad { + CGRect screen = [[UIScreen mainScreen] bounds]; + self.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width); + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { if (mapConfigViewController == nil) mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil]; @@ -144,6 +147,12 @@ schemeWeaponConfigViewController.view.frame = CGRectMake(362, 224, 300, 500); schemeWeaponConfigViewController.view.backgroundColor = [UIColor clearColor]; [mapConfigViewController.view addSubview:schemeWeaponConfigViewController.view]; + for (UIView *oneView in self.view.subviews) { + if ([oneView isMemberOfClass:[UIToolbar class]]) { + [[oneView viewWithTag:12345] setHidden:YES]; + break; + } + } } else mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPhone" bundle:nil]; activeController = mapConfigViewController; diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Classes/MainMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sun Jun 20 23:05:11 2010 +0200 @@ -101,18 +101,13 @@ -(IBAction) switchViews:(id) sender { UIButton *button = (UIButton *)sender; UIAlertView *alert; - NSString *debugStr, *configNibName; + NSString *debugStr; switch (button.tag) { case 0: - // bug in UIModalTransitionStylePartialCurl, displays the controller awkwardly if it is not allocated every time - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) - configNibName = @"GameConfigViewController-iPad"; - else - configNibName = @"GameConfigViewController-iPhone"; - - gameConfigViewController = [[GameConfigViewController alloc] initWithNibName:configNibName bundle:nil]; + gameConfigViewController = [[GameConfigViewController alloc] initWithNibName:@"GameConfigViewController" bundle:nil]; #ifdef __IPHONE_3_2 + // bug in UIModalTransitionStylePartialCurl, displays the controller awkwardly if it is not allocated every time if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) gameConfigViewController.modalTransitionStyle = UIModalTransitionStylePartialCurl; #endif diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sun Jun 20 23:05:11 2010 +0200 @@ -118,9 +118,11 @@ CGImageRef previewCGImage = CGBitmapContextCreateImage(bitmapImage); UIImage *previewImage = [[UIImage alloc] initWithCGImage:previewCGImage]; CGImageRelease(previewCGImage); + previewCGImage = nil; // set the preview image (autoreleased) in the button and the maxhog label on the main thread to prevent a leak - [self performSelectorOnMainThread:@selector(setButtonImage:) withObject:[[previewImage retain] makeRoundCornersOfSize:CGSizeMake(12, 12)] waitUntilDone:NO]; + [self performSelectorOnMainThread:@selector(setButtonImage:) withObject:[previewImage makeRoundCornersOfSize:CGSizeMake(12, 12)] waitUntilDone:NO]; + [previewImage release]; [self performSelectorOnMainThread:@selector(setLabelText:) withObject:[NSString stringWithFormat:@"%d", maxHogs] waitUntilDone:NO]; // restore functionality of button and remove the spinning wheel on the main thread to prevent a leak @@ -194,7 +196,8 @@ UIImage *image = [[UIImage alloc] initWithContentsOfFile:fileImage]; [fileImage release]; [self.previewButton setImage:[image makeRoundCornersOfSize:CGSizeMake(12, 12)] forState:UIControlStateNormal]; - + [image release]; + // update label maxHogs = 18; NSString *fileCfg = [[NSString alloc] initWithFormat:@"%@/%@/map.cfg", MAPS_DIRECTORY(),[self.mapArray objectAtIndex:index]]; @@ -255,7 +258,7 @@ UIGraphicsPopContext(); UIImage *bkgImg = UIGraphicsGetImageFromCurrentImageContext(); UIGraphicsEndImageContext(); - [self.previewButton setBackgroundImage:[[bkgImg retain] makeRoundCornersOfSize:CGSizeMake(12, 12)] forState:UIControlStateNormal]; + [self.previewButton setBackgroundImage:[bkgImg makeRoundCornersOfSize:CGSizeMake(12, 12)] forState:UIControlStateNormal]; } #pragma mark - diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Classes/OverlayViewController.h --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Sun Jun 20 23:05:11 2010 +0200 @@ -24,11 +24,16 @@ CGFloat initialDistanceForPinching; CGPoint gestureStartPoint; + UIActivityIndicatorView *spinningWheel; } @property (nonatomic,retain) id popoverController; @property (nonatomic,retain) PopoverMenuViewController *popupMenu; @property (nonatomic,retain) UITextField *writeChatTextField; +@property (nonatomic,retain) IBOutlet UIActivityIndicatorView *spinningWheel; + +UIActivityIndicatorView *singleton; +BOOL canDim; -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Classes/OverlayViewController.m --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sun Jun 20 23:05:11 2010 +0200 @@ -20,8 +20,7 @@ @implementation OverlayViewController -@synthesize popoverController, popupMenu, writeChatTextField; - +@synthesize popoverController, popupMenu, writeChatTextField, spinningWheel; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { return rotationManager(interfaceOrientation); @@ -111,6 +110,8 @@ #pragma mark View Management -(void) viewDidLoad { isPopoverVisible = NO; + singleton = self.spinningWheel; + canDim = NO; self.view.alpha = 0; self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0); @@ -148,6 +149,7 @@ self.writeChatTextField = nil; self.popoverController = nil; self.popupMenu = nil; + self.spinningWheel = nil; [super viewDidUnload]; MSG_DIDUNLOAD(); } @@ -158,6 +160,7 @@ [popupMenu release]; [popoverController release]; // dimTimer is autoreleased + [spinningWheel release]; [super dealloc]; } @@ -171,10 +174,12 @@ // nice transition for dimming, should be called only by the timer himself -(void) dimOverlay { - [UIView beginAnimations:@"overlay dim" context:NULL]; - [UIView setAnimationDuration:0.6]; - self.view.alpha = 0.2; - [UIView commitAnimations]; + if (canDim) { + [UIView beginAnimations:@"overlay dim" context:NULL]; + [UIView setAnimationDuration:0.6]; + self.view.alpha = 0.2; + [UIView commitAnimations]; + } } // set the overlay visible and put off the timer for enough time @@ -298,6 +303,16 @@ [sender resignFirstResponder]; } +// this function is called by pascal FinishProgress and removes the spinning wheel when loading is done +void spinningWheelDone (void) { + [UIView beginAnimations:@"hiding spinning wheel" context:NULL]; + [UIView setAnimationDuration:0.7]; + singleton.alpha = 0; + [UIView commitAnimations]; + [singleton performSelector:@selector(stopAnimating) withObject:nil afterDelay:0.7]; + canDim = YES; +} + #pragma mark - #pragma mark Custom touch event handling -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Classes/otherSrc/UIImageExtra.m --- a/project_files/HedgewarsMobile/Classes/otherSrc/UIImageExtra.m Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/otherSrc/UIImageExtra.m Sun Jun 20 23:05:11 2010 +0200 @@ -153,8 +153,6 @@ -(UIImage *)makeRoundCornersOfSize:(CGSize) sizewh { UIImage * newImage = nil; - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; NSInteger cornerWidth = sizewh.width; NSInteger cornerHeight = sizewh.height; @@ -175,13 +173,10 @@ CGImageRef imageMasked = CGBitmapContextCreateImage(context); CGContextRelease(context); CGColorSpaceRelease(colorSpace); - [self release]; - newImage = [[UIImage imageWithCGImage:imageMasked] retain]; + newImage = [UIImage imageWithCGImage:imageMasked]; CGImageRelease(imageMasked); - - [pool release]; - + return newImage; } diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Jun 20 23:05:11 2010 +0200 @@ -32,6 +32,8 @@ 61272339117DF778005B90CF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61272338117DF778005B90CF /* MobileCoreServices.framework */; }; 61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */ = {isa = PBXBuildFile; fileRef = 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */; }; 6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6151347D116C2803001F16D1 /* Icon-iPad.png */; }; + 61536CCF11CE836E00D87A7E /* libfreetype_x86.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798917114AAF2100BA94A9 /* libfreetype_x86.a */; }; + 61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */; }; 6163EE7E11CC2600001C0453 /* SingleWeaponViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */; }; 6165920C11CA9BA200D6E256 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591DF11CA9BA200D6E256 /* DetailViewController.m */; }; 6165920D11CA9BA200D6E256 /* FlagsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E111CA9BA200D6E256 /* FlagsViewController.m */; }; @@ -71,13 +73,10 @@ 6165924411CA9C4600D6E256 /* openalbridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 6165923A11CA9C4600D6E256 /* openalbridge.h */; }; 6165924511CA9C4600D6E256 /* wrappers.c in Sources */ = {isa = PBXBuildFile; fileRef = 6165923B11CA9C4600D6E256 /* wrappers.c */; }; 6165924611CA9C4600D6E256 /* wrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 6165923C11CA9C4600D6E256 /* wrappers.h */; }; - 6165925111CA9CB400D6E256 /* GameConfigViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924911CA9CB400D6E256 /* GameConfigViewController-iPad.xib */; }; - 6165925211CA9CB400D6E256 /* GameConfigViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924A11CA9CB400D6E256 /* GameConfigViewController-iPhone.xib */; }; 6165925311CA9CB400D6E256 /* MainMenuViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */; }; 6165925411CA9CB400D6E256 /* MainMenuViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */; }; 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 */; }; - 6165925711CA9CB400D6E256 /* OverlayViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924F11CA9CB400D6E256 /* OverlayViewController-iPad.xib */; }; 6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165925011CA9CB400D6E256 /* OverlayViewController.xib */; }; 6165925E11CA9CD300D6E256 /* arrowDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 6165925911CA9CD300D6E256 /* arrowDown.png */; }; 6165925F11CA9CD300D6E256 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 6165925A11CA9CD300D6E256 /* arrowLeft.png */; }; @@ -135,7 +134,6 @@ 6179883D114AA34C00BA94A9 /* uWorld.pas in Sources */ = {isa = PBXBuildFile; fileRef = 6179880F114AA34C00BA94A9 /* uWorld.pas */; }; 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617988DA114AAA3900BA94A9 /* libSDLiPhoneOS.a */; }; 6179891B114AAF2100BA94A9 /* libfreetype_arm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798916114AAF2100BA94A9 /* libfreetype_arm.a */; }; - 6179891C114AAF2100BA94A9 /* libfreetype_x86.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798917114AAF2100BA94A9 /* libfreetype_x86.a */; }; 6179891F114AAF2100BA94A9 /* libvorbis_arm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6179891A114AAF2100BA94A9 /* libvorbis_arm.a */; }; 61798935114AB25F00BA94A9 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798934114AB25F00BA94A9 /* AudioToolbox.framework */; }; 61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798993114AB3FA00BA94A9 /* libSDL_mixer.a */; }; @@ -305,13 +303,11 @@ 6165923A11CA9C4600D6E256 /* openalbridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = openalbridge.h; path = ../../misc/libopenalbridge/openalbridge.h; sourceTree = SOURCE_ROOT; }; 6165923B11CA9C4600D6E256 /* wrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wrappers.c; path = ../../misc/libopenalbridge/wrappers.c; sourceTree = SOURCE_ROOT; }; 6165923C11CA9C4600D6E256 /* wrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wrappers.h; path = ../../misc/libopenalbridge/wrappers.h; sourceTree = SOURCE_ROOT; }; - 6165924911CA9CB400D6E256 /* GameConfigViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "GameConfigViewController-iPad.xib"; path = "Resources/GameConfigViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; - 6165924A11CA9CB400D6E256 /* GameConfigViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "GameConfigViewController-iPhone.xib"; path = "Resources/GameConfigViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; }; + 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = GameConfigViewController.xib; path = Resources/GameConfigViewController.xib; sourceTree = SOURCE_ROOT; }; 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPad.xib"; path = "Resources/MainMenuViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainMenuViewController-iPhone.xib"; path = "Resources/MainMenuViewController-iPhone.xib"; sourceTree = SOURCE_ROOT; }; 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; }; - 6165924F11CA9CB400D6E256 /* OverlayViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "OverlayViewController-iPad.xib"; path = "Resources/OverlayViewController-iPad.xib"; sourceTree = SOURCE_ROOT; }; 6165925011CA9CB400D6E256 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = Resources/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; 6165925911CA9CD300D6E256 /* arrowDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowDown.png; path = Resources/arrowDown.png; sourceTree = ""; }; 6165925A11CA9CD300D6E256 /* arrowLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowLeft.png; path = Resources/arrowLeft.png; sourceTree = ""; }; @@ -396,22 +392,22 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 61272334117DF764005B90CF /* libSDL_image.a in Frameworks */, - 61C325901179A732001E70B1 /* OpenAL.framework in Frameworks */, - 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */, 61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */, 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */, - 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */, + 61272334117DF764005B90CF /* libSDL_image.a in Frameworks */, 61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */, + 617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */, 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */, + 61536CCF11CE836E00D87A7E /* libfreetype_x86.a in Frameworks */, + 6179891B114AAF2100BA94A9 /* libfreetype_arm.a in Frameworks */, + 6179891F114AAF2100BA94A9 /* libvorbis_arm.a in Frameworks */, 61C325A31179A7AD001E70B1 /* libopenalbridge.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, + 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */, + 61C325901179A732001E70B1 /* OpenAL.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */, 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */, - 6179891B114AAF2100BA94A9 /* libfreetype_arm.a in Frameworks */, - 6179891C114AAF2100BA94A9 /* libfreetype_x86.a in Frameworks */, - 6179891F114AAF2100BA94A9 /* libvorbis_arm.a in Frameworks */, 61798935114AB25F00BA94A9 /* AudioToolbox.framework in Frameworks */, 61272339117DF778005B90CF /* MobileCoreServices.framework in Frameworks */, ); @@ -522,10 +518,10 @@ 28FD15070DC6FC5B0079059D /* QuartzCore.framework */, 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, 61C3255A1179A384001E70B1 /* OpenAL.framework */, + 61272338117DF778005B90CF /* MobileCoreServices.framework */, 61798916114AAF2100BA94A9 /* libfreetype_arm.a */, 61798917114AAF2100BA94A9 /* libfreetype_x86.a */, 6179891A114AAF2100BA94A9 /* libvorbis_arm.a */, - 61272338117DF778005B90CF /* MobileCoreServices.framework */, ); name = Frameworks; sourceTree = ""; @@ -546,13 +542,11 @@ 6100DB1711544E8400F455E0 /* XIB */ = { isa = PBXGroup; children = ( - 6165924911CA9CB400D6E256 /* GameConfigViewController-iPad.xib */, - 6165924A11CA9CB400D6E256 /* GameConfigViewController-iPhone.xib */, + 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */, 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */, 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */, 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */, 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */, - 6165924F11CA9CB400D6E256 /* OverlayViewController-iPad.xib */, 6165925011CA9CB400D6E256 /* OverlayViewController.xib */, ); name = XIB; @@ -590,10 +584,10 @@ 616591E511CA9BA200D6E256 /* GameConfigViewController.m */, 6165920411CA9BA200D6E256 /* TeamConfigViewController.h */, 6165920511CA9BA200D6E256 /* TeamConfigViewController.m */, + 616591FC11CA9BA200D6E256 /* SchemeWeaponConfigViewController.h */, + 616591FD11CA9BA200D6E256 /* SchemeWeaponConfigViewController.m */, 616591F211CA9BA200D6E256 /* MapConfigViewController.h */, 616591F311CA9BA200D6E256 /* MapConfigViewController.m */, - 616591FC11CA9BA200D6E256 /* SchemeWeaponConfigViewController.h */, - 616591FD11CA9BA200D6E256 /* SchemeWeaponConfigViewController.m */, ); name = "Game Config"; sourceTree = ""; @@ -958,6 +952,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */, 61A118D211683CD100359010 /* Background.png in Resources */, 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */, 61A118D411683CD100359010 /* Multiplayer.png in Resources */, @@ -967,13 +962,10 @@ 6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */, 61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */, 611E12FF117BBBDA0044B62F /* Entitlements-Development.plist in Resources */, - 6165925111CA9CB400D6E256 /* GameConfigViewController-iPad.xib in Resources */, - 6165925211CA9CB400D6E256 /* GameConfigViewController-iPhone.xib in Resources */, 6165925311CA9CB400D6E256 /* MainMenuViewController-iPad.xib in Resources */, 6165925411CA9CB400D6E256 /* MainMenuViewController-iPhone.xib in Resources */, 6165925511CA9CB400D6E256 /* MapConfigViewController-iPad.xib in Resources */, 6165925611CA9CB400D6E256 /* MapConfigViewController-iPhone.xib in Resources */, - 6165925711CA9CB400D6E256 /* OverlayViewController-iPad.xib in Resources */, 6165925811CA9CB400D6E256 /* OverlayViewController.xib in Resources */, 6165925E11CA9CD300D6E256 /* arrowDown.png in Resources */, 6165925F11CA9CD300D6E256 /* arrowLeft.png in Resources */, @@ -1161,6 +1153,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", + "\"$(SRCROOT)/../../../../Downloads/of_preRelease_v0061_iPhone_FAT-pre3/libs/freetype/lib/iphone\"", ); PRODUCT_NAME = Hedgewars; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1182,6 +1175,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", + "\"$(SRCROOT)/../../../../Downloads/of_preRelease_v0061_iPhone_FAT-pre3/libs/freetype/lib/iphone\"", ); PRODUCT_NAME = Hedgewars; PROVISIONING_PROFILE = ""; @@ -1245,6 +1239,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", + "\"$(SRCROOT)/../../../../Downloads/of_preRelease_v0061_iPhone_FAT-pre3/libs/freetype/lib/iphone\"", ); PRODUCT_NAME = Hedgewars; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -1358,6 +1353,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)\"", + "\"$(SRCROOT)/../../../../Downloads/of_preRelease_v0061_iPhone_FAT-pre3/libs/freetype/lib/iphone\"", ); PRODUCT_NAME = Hedgewars; TARGETED_DEVICE_FAMILY = "1,2"; diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Resources/GameConfigViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/GameConfigViewController-iPad.xib Sun Jun 20 18:35:59 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,489 +0,0 @@ - - - - 800 - 10D573 - 762 - 1038.29 - 460.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 292 - - YES - - - 266 - {{0, 724}, {1024, 44}} - - NO - NO - IBIPadFramework - - YES - - Back - IBIPadFramework - 1 - - - - IBIPadFramework - - 5 - - - 1 - Start Game - IBIPadFramework - 90 - 2 - - - - - - {1024, 768} - - 3 - MQA - - NO - - 3 - - IBIPadFramework - - - - - YES - - - view - - - - 3 - - - - buttonPressed: - - - - 17 - - - - buttonPressed: - - - - 23 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 2 - - - YES - - - - - - 15 - - - YES - - - - - - - - 16 - - - - - 18 - - - - - 22 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 15.IBPluginDependency - 16.IBPluginDependency - 18.IBPluginDependency - 2.IBEditorWindowLastContentRect - 2.IBPluginDependency - 22.IBPluginDependency - - - YES - GameConfigViewController - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{285, -28}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 29 - - - - YES - - GameConfigViewController - UIViewController - - YES - - YES - buttonPressed: - segmentPressed: - - - YES - id - id - - - - IBProjectSource - ../../cocoaTouch/GameConfigViewController.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 - - - - UIBarButtonItem - UIBarItem - - IBFrameworkSource - UIKit.framework/Headers/UIBarButtonItem.h - - - - UIBarItem - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIBarItem.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UIToolbar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIToolbar.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/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/Hedgewars.xcodeproj - 3 - 87 - - diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Resources/GameConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/GameConfigViewController-iPhone.xib Sun Jun 20 18:35:59 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,640 +0,0 @@ - - - - 800 - 10D573 - 762 - 1038.29 - 460.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 292 - - YES - - - 266 - - YES - - - 292 - {{97, 8}, {245, 30}} - - NO - IBCocoaTouchFramework - 2 - 3 - 0 - - YES - Map - Teams - Details - - - YES - - - - - - YES - - - - - - YES - {0, 0} - {0, 0} - {0, 0} - - - YES - - - - - - - {{0, 276}, {480, 44}} - - NO - NO - IBCocoaTouchFramework - - YES - - Back - IBCocoaTouchFramework - 1 - - - - IBCocoaTouchFramework - - 5 - - - IBCocoaTouchFramework - - - - - IBCocoaTouchFramework - - 5 - - - 1 - Start Game - IBCocoaTouchFramework - 90 - 2 - - - - - - {480, 320} - - - 3 - MQA - - NO - - 3 - - IBCocoaTouchFramework - - - - - YES - - - view - - - - 3 - - - - buttonPressed: - - - - 17 - - - - buttonPressed: - - - - 23 - - - - segmentPressed: - - - 13 - - 29 - - - - - YES - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 2 - - - YES - - - - - - 15 - - - YES - - - - - - - - - - 16 - - - - - 18 - - - - - 19 - - - - - 21 - - - YES - - - - - - 20 - - - - - 22 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 15.IBPluginDependency - 16.IBPluginDependency - 18.IBPluginDependency - 19.IBPluginDependency - 2.IBEditorWindowLastContentRect - 2.IBPluginDependency - 20.IBPluginDependency - 22.IBPluginDependency - - - YES - GameConfigViewController - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{639, 516}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 29 - - - - YES - - GameConfigViewController - UIViewController - - YES - - YES - buttonPressed: - segmentPressed: - - - YES - id - id - - - - YES - - YES - availableTeamsTableView - mapButton - randomButton - schemesButton - startButton - weaponsButton - - - YES - UITableView - UIButton - UIButton - UIButton - UIBarButtonItem - UIButton - - - - IBProjectSource - ../../cocoaTouch/GameConfigViewController.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 - - - - UIBarButtonItem - UIBarItem - - IBFrameworkSource - UIKit.framework/Headers/UIBarButtonItem.h - - - - UIBarItem - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIBarItem.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.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 - - - - UISegmentedControl - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISegmentedControl.h - - - - UITableView - UIScrollView - - IBFrameworkSource - UIKit.framework/Headers/UITableView.h - - - - UIToolbar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIToolbar.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/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - 87 - - diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Resources/GameConfigViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Sun Jun 20 23:05:11 2010 +0200 @@ -0,0 +1,596 @@ + + + + 800 + 10F569 + 762 + 1038.29 + 461.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 87 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + YES + + + 266 + + YES + + + 292 + {{97, 8}, {245, 30}} + + NO + 12345 + IBCocoaTouchFramework + 2 + 3 + 0 + + YES + Map + Teams + Details + + + YES + + + + + + YES + + + + + + YES + {0, 0} + {0, 0} + {0, 0} + + + YES + + + + + + + {{0, 276}, {480, 44}} + + NO + NO + IBCocoaTouchFramework + + YES + + Back + IBCocoaTouchFramework + 1 + + + + IBCocoaTouchFramework + + 5 + + + IBCocoaTouchFramework + + + + + IBCocoaTouchFramework + + 5 + + + 1 + Start Game + IBCocoaTouchFramework + 90 + 2 + + + + + + {480, 320} + + + 3 + MQA + + NO + + 3 + + IBCocoaTouchFramework + + + + + YES + + + view + + + + 3 + + + + buttonPressed: + + + + 17 + + + + buttonPressed: + + + + 23 + + + + segmentPressed: + + + 13 + + 29 + + + + + YES + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + YES + + + + + + 15 + + + YES + + + + + + + + + + 16 + + + + + 18 + + + + + 19 + + + + + 21 + + + YES + + + + + + 20 + + + + + 22 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 15.IBPluginDependency + 16.IBPluginDependency + 18.IBPluginDependency + 19.IBPluginDependency + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + 20.IBPluginDependency + 22.IBPluginDependency + + + YES + GameConfigViewController + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{639, 516}, {480, 320}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 29 + + + + YES + + GameConfigViewController + UIViewController + + YES + + YES + buttonPressed: + segmentPressed: + + + YES + id + id + + + + IBProjectSource + Classes/GameConfigViewController.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 + + + + UIBarButtonItem + UIBarItem + + IBFrameworkSource + UIKit.framework/Headers/UIBarButtonItem.h + + + + UIBarItem + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIBarItem.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UISegmentedControl + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UISegmentedControl.h + + + + UIToolbar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIToolbar.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/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 3 + 87 + + diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Sun Jun 20 23:05:11 2010 +0200 @@ -2,10 +2,10 @@ 800 - 10D573 + 10F569 762 1038.29 - 460.00 + 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin 87 @@ -86,7 +86,7 @@ 292 - {{121, 209}, {149, 23}} + {{121, 240}, {149, 23}} NO IBCocoaTouchFramework @@ -145,7 +145,7 @@ 292 - {{123, 239}, {145, 29}} + {{123, 203}, {145, 29}} NO YES @@ -320,9 +320,9 @@ - + - + @@ -463,7 +463,7 @@ IBProjectSource - ../../cocoaTouch/MapConfigViewController.h + Classes/MapConfigViewController.h diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Resources/OverlayViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/OverlayViewController-iPad.xib Sun Jun 20 18:35:59 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,945 +0,0 @@ - - - - 800 - 10D573 - 762 - 1038.29 - 460.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 87 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 292 - - YES - - - 292 - {{0, 675}, {39, 53}} - - NO - NO - IBIPadFramework - 0 - 0 - - Helvetica-Bold - 15 - 16 - - - 3 - MQA - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - 3 - MC41AA - - - NSImage - arrowLeft.png - - - - - 292 - {{90, 675}, {39, 54}} - - NO - NO - 1 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowRight.png - - - - - 292 - {{964, 690}, {64, 48}} - - NO - NO - 6 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - joyPush.png - - - - - 292 - {{919, 665}, {64, 50}} - - NO - NO - 5 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{908, 723}, {61, 45}} - - NO - NO - 4 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - 292 - {{37, 638}, {53, 39}} - - NO - NO - 2 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowUp.png - - - - - 292 - {{37, 729}, {53, 39}} - - NO - NO - 3 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - arrowDown.png - - - - - 292 - {{956, -5}, {72, 64}} - - NO - 10 - IBIPadFramework - 0 - 0 - - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - menuCorner.png - - - - {1024, 768} - - - 3 - MSAwAA - - NO - YES - - 3 - - IBIPadFramework - - - - - YES - - - view - - - - 3 - - - - buttonPressed: - - - 1 - - 8 - - - - buttonReleased: - - - 9 - - 9 - - - - buttonReleased: - - - 7 - - 10 - - - - buttonReleased: - - - 8 - - 11 - - - - buttonReleased: - - - 8 - - 13 - - - - buttonReleased: - - - 9 - - 14 - - - - buttonPressed: - - - 1 - - 15 - - - - buttonReleased: - - - 7 - - 16 - - - - buttonReleased: - - - 9 - - 18 - - - - buttonPressed: - - - 1 - - 19 - - - - buttonReleased: - - - 8 - - 20 - - - - buttonReleased: - - - 7 - - 21 - - - - buttonReleased: - - - 8 - - 23 - - - - buttonReleased: - - - 9 - - 24 - - - - buttonPressed: - - - 1 - - 25 - - - - buttonReleased: - - - 7 - - 26 - - - - buttonReleased: - - - 9 - - 44 - - - - buttonPressed: - - - 1 - - 45 - - - - buttonReleased: - - - 8 - - 46 - - - - buttonReleased: - - - 7 - - 47 - - - - buttonReleased: - - - 8 - - 49 - - - - buttonReleased: - - - 7 - - 50 - - - - buttonReleased: - - - 9 - - 51 - - - - buttonPressed: - - - 1 - - 52 - - - - buttonReleased: - - - 9 - - 54 - - - - buttonReleased: - - - 7 - - 55 - - - - buttonPressed: - - - 1 - - 56 - - - - buttonReleased: - - - 8 - - 57 - - - - buttonPressed: - - - 7 - - 60 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - left - - - 12 - - - right - - - 17 - - - up - - - 22 - - - down - - - 43 - - - push2 - - - 48 - - - push1 - - - 53 - - - push3 - - - 58 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 12.IBPluginDependency - 17.IBPluginDependency - 22.IBPluginDependency - 4.IBPluginDependency - 43.IBPluginDependency - 48.IBPluginDependency - 53.IBPluginDependency - 58.IBPluginDependency - - - YES - OverlayViewController - UIResponder - {{0, 273}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - YES - - - - - YES - - - YES - - - - 60 - - - - YES - - OverlayViewController - UIViewController - - YES - - YES - buttonPressed: - buttonReleased: - - - YES - id - id - - - - popoverController - id - - - IBProjectSource - ../../cocoaTouch/OverlayViewController.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 - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.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/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - ../../project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 3 - - YES - - YES - arrowDown.png - arrowLeft.png - arrowRight.png - arrowUp.png - joyPush.png - menuCorner.png - - - YES - {64, 64} - {64, 64} - {64, 64} - {64, 64} - {64, 64} - {64, 64} - - - 87 - - diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/Resources/OverlayViewController.xib --- a/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Sun Jun 20 18:35:59 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/OverlayViewController.xib Sun Jun 20 23:05:11 2010 +0200 @@ -2,10 +2,10 @@ 800 - 10D573 + 10F569 762 1038.29 - 460.00 + 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin 87 @@ -228,6 +228,16 @@ menuCorner.png + + + 269 + {{225, 245}, {37, 37}} + + NO + IBCocoaTouchFramework + YES + 0 + {480, 320} @@ -517,6 +527,14 @@ 60 + + + spinningWheel + + + + 64 + @@ -540,6 +558,7 @@ + @@ -601,6 +620,11 @@ + + 63 + + + @@ -619,6 +643,7 @@ 48.IBPluginDependency 53.IBPluginDependency 58.IBPluginDependency + 63.IBPluginDependency YES @@ -634,6 +659,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -652,7 +678,7 @@ - 62 + 64 @@ -674,12 +700,21 @@ - popoverController - id + YES + + YES + popoverController + spinningWheel + + + YES + id + UIActivityIndicatorView + IBProjectSource - ../../cocoaTouch/OverlayViewController.h + Classes/OverlayViewController.h @@ -819,6 +854,14 @@ + UIActivityIndicatorView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIActivityIndicatorView.h + + + UIButton UIControl @@ -919,7 +962,7 @@ YES - ../../project_files/HedgewarsMobile/Hedgewars.xcodeproj + ../Hedgewars.xcodeproj 3 YES diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/libpng_arm.a Binary file project_files/HedgewarsMobile/libpng_arm.a has changed diff -r 6592fbb969da -r 1d7b056ff866 project_files/HedgewarsMobile/libpng_x86.a Binary file project_files/HedgewarsMobile/libpng_x86.a has changed