# HG changeset patch # User koda # Date 1285114935 -7200 # Node ID 568bfd0834658b49de3736fbb2ef7af5207b830f # Parent f8f0d0ceb19ce9829fee6df9526a5c6e8c5cebc6 allow more flexibility between viewcontrollers, also added stub pages for saved games diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Wed Sep 22 02:22:15 2010 +0200 @@ -192,17 +192,9 @@ DLog(@"sending config %@", gameDictionary); if ([[gameDictionary allKeys] count] == 9) { - UIView *black = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.height, self.view.frame.size.width)]; - black.opaque = YES; - black.backgroundColor = [UIColor blackColor]; - [self.view addSubview:black]; - [[SDLUIKitDelegate sharedAppDelegate] startSDLgame:gameDictionary]; - [UIView beginAnimations:@"fading in from ingame" context:NULL]; - [UIView setAnimationDuration:1]; - black.alpha = 0; - [UIView commitAnimations]; - [black performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1]; - [black performSelector:@selector(release) withObject:nil afterDelay:1]; + NSDictionary *allDataNecessary = [NSDictionary dictionaryWithObjectsAndKeys:gameDictionary,@"game_dictionary", @"",@"savefile", + [NSNumber numberWithBool:NO],@"netgame", nil]; + [[SDLUIKitDelegate sharedAppDelegate] startSDLgame:allDataNecessary]; } else { DLog(@"gameconfig data not complete!!\nmapConfigViewController = %@\nteamConfigViewController = %@\nschemeWeaponConfigViewController = %@\n", mapConfigViewController, teamConfigViewController, schemeWeaponConfigViewController); diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/GameSetup.h --- a/project_files/HedgewarsMobile/Classes/GameSetup.h Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameSetup.h Wed Sep 22 02:22:15 2010 +0200 @@ -30,6 +30,7 @@ TCPsocket csd; // Client socket descriptor NSString *savePath; + BOOL isNetGame; } @property (nonatomic, retain) NSDictionary *systemSettings; @@ -45,6 +46,6 @@ -(void) provideAmmoData:(NSString *)ammostoreName forPlayingTeams:(NSInteger) numberOfTeams; -(NSInteger) provideScheme:(NSString *)schemeName; --(const char **)getSettings; +-(const char **)getSettings:(NSString *)recordFile; @end diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/GameSetup.m --- a/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Sep 22 02:22:15 2010 +0200 @@ -40,8 +40,14 @@ self.systemSettings = dictSett; [dictSett release]; - self.gameConfig = gameDictionary; - self.savePath = [SAVES_DIRECTORY() stringByAppendingFormat:@"%@.hws", [[NSDate date] description]]; + self.gameConfig = [gameDictionary objectForKey:@"game_dictionary"]; + isNetGame = [[gameDictionary objectForKey:@"netgame"] boolValue]; + NSString *path = [gameDictionary objectForKey:@"savefile"]; + // if path is empty it means i have to create a new file, otherwise i read from that file + if ([path isEqualToString:@""] == YES) + self.savePath = [SAVES_DIRECTORY() stringByAppendingFormat:@"%@.hws", [[NSDate date] description]]; + else + self.savePath = [SAVES_DIRECTORY() stringByAppendingString:path]; } return self; } @@ -305,8 +311,10 @@ case 'C': DLog(@"sending game config...\n%@",self.gameConfig); - // local game - [self sendToEngineNoSave:@"TL"]; + if (isNetGame == YES) + [self sendToEngineNoSave:@"TN"]; + else + [self sendToEngineNoSave:@"TL"]; NSString *saveHeader = @"TS"; [[NSString stringWithFormat:@"%c%@",[saveHeader length], saveHeader] appendToFile:savePath]; @@ -397,7 +405,7 @@ #pragma mark - #pragma mark Setting methods // returns an array of c-strings that are read by engine at startup --(const char **)getSettings { +-(const char **)getSettings: (NSString *)recordFile { NSString *ipcString = [[NSString alloc] initWithFormat:@"%d", ipcPort]; NSString *localeString = [[NSString alloc] initWithFormat:@"%@.txt", [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]]; CGRect screenBounds = [[UIScreen mainScreen] bounds]; @@ -438,8 +446,7 @@ gameArgs[ 7] = [[[self.systemSettings objectForKey:@"music"] stringValue] UTF8String]; //isMusicEnabled gameArgs[ 8] = [[[self.systemSettings objectForKey:@"alternate"] stringValue] UTF8String]; //cAltDamage gameArgs[ 9] = NULL; //unused - gameArgs[10] = NULL; //recordFileName - //[[SAVES_DIRECTORY() stringByAppendingString:@"/2010-09-21 23/30/10 +0200.hws"] UTF8String]; //recordFileName + gameArgs[10] = [recordFile UTF8String]; //recordFileName [wSize release]; [hSize release]; diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/MainMenuViewController.h --- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Wed Sep 22 02:22:15 2010 +0200 @@ -24,18 +24,21 @@ @class SplitViewRootController; @class GameConfigViewController; @class AboutViewController; +@class SavedGamesViewController; @interface MainMenuViewController : UIViewController { UILabel *versionLabel; GameConfigViewController *gameConfigViewController; SplitViewRootController *settingsViewController; AboutViewController *aboutViewController; + SavedGamesViewController *savedGamesViewController; } @property (nonatomic,retain) IBOutlet UILabel *versionLabel; @property (nonatomic,retain) GameConfigViewController *gameConfigViewController; @property (nonatomic,retain) SplitViewRootController *settingsViewController; @property (nonatomic,retain) AboutViewController *aboutViewController; +@property (nonatomic,retain) SavedGamesViewController *savedGamesViewController; -(IBAction) switchViews:(id)sender; diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/MainMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Wed Sep 22 02:22:15 2010 +0200 @@ -27,9 +27,10 @@ #import "GameConfigViewController.h" #import "SplitViewRootController.h" #import "AboutViewController.h" +#import "SavedGamesViewController.h" @implementation MainMenuViewController -@synthesize versionLabel, gameConfigViewController, settingsViewController, aboutViewController; +@synthesize versionLabel, gameConfigViewController, settingsViewController, aboutViewController, savedGamesViewController; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { return rotationManager(interfaceOrientation); @@ -230,7 +231,8 @@ -(IBAction) switchViews:(id) sender { UIButton *button = (UIButton *)sender; UIAlertView *alert; - NSString *xib; + NSString *xib = nil; + NSString *debugStr = nil; playSound(@"clickSound"); switch (button.tag) { @@ -260,16 +262,7 @@ [self presentModalViewController:self.settingsViewController animated:YES]; break; case 3: - if (nil == self.aboutViewController) { - AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil]; - about.modalTransitionStyle = UIModalTransitionStyleCoverVertical; - about.modalPresentationStyle = UIModalPresentationFormSheet; - self.aboutViewController = about; - [about release]; - } - - [self presentModalViewController:self.aboutViewController animated:YES]; - /* +#ifdef DEBUG debugStr = [[NSString alloc] initWithContentsOfFile:DEBUG_FILE()]; UITextView *scroll = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.height, self.view.frame.size.width)]; scroll.text = debugStr; @@ -283,7 +276,28 @@ [scroll addSubview:btn]; [self.view addSubview:scroll]; [scroll release]; - */ +#else + if (nil == self.aboutViewController) { + AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil]; + about.modalTransitionStyle = UIModalTransitionStyleCoverVertical; + about.modalPresentationStyle = UIModalPresentationFormSheet; + self.aboutViewController = about; + [about release]; + } + + [self presentModalViewController:self.aboutViewController animated:YES]; +#endif + break; + case 4: + if (nil == self.savedGamesViewController) { + SavedGamesViewController *savedgames = [[SavedGamesViewController alloc] initWithNibName:@"SavedGamesViewController" bundle:nil]; + savedgames.modalTransitionStyle = UIModalTransitionStyleCoverVertical; + savedgames.modalPresentationStyle = UIModalPresentationFormSheet; + self.savedGamesViewController = savedgames; + [savedgames release]; + } + + [self presentModalViewController:self.savedGamesViewController animated:YES]; break; default: alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented" @@ -308,6 +322,7 @@ self.gameConfigViewController = nil; self.settingsViewController = nil; self.aboutViewController = nil; + self.savedGamesViewController = nil; MSG_DIDUNLOAD(); [super viewDidUnload]; } @@ -317,6 +332,7 @@ [settingsViewController release]; [gameConfigViewController release]; [aboutViewController release]; + [savedGamesViewController release]; [super dealloc]; } diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m --- a/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SDL_uikitappdelegate.m Wed Sep 22 02:22:15 2010 +0200 @@ -78,16 +78,23 @@ } // main routine for calling the actual game engine --(IBAction) startSDLgame: (NSDictionary *)gameDictionary { +-(void) startSDLgame:(NSDictionary *)gameDictionary { + UIView *blackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.height, self.view.frame.size.width)]; + blackView.opaque = YES; + blackView.backgroundColor = [UIColor blackColor]; + [self.view addSubview:blackView]; + // pull out useful configuration info from various files GameSetup *setup = [[GameSetup alloc] initWithDictionary:gameDictionary]; - - [setup startThread:@"engineProtocol"]; - const char **gameArgs = [setup getSettings]; + NSNumber *isNetGameNum = [gameDictionary objectForKey:@"netgame"]; + + if ([isNetGameNum boolValue] == NO) + [setup startThread:@"engineProtocol"]; + const char **gameArgs = [setup getSettings:[gameDictionary objectForKey:@"savefile"]]; [setup release]; // since the sdlwindow is not yet created, we add the overlayController with a delay - [self performSelector:@selector(displayOverlayLater) withObject:nil afterDelay:0.1]; + [self performSelector:@selector(displayOverlayLater:) withObject:isNetGameNum afterDelay:0.1]; // this is the pascal fuction that starts the game (wrapped around isInGame) isInGame = YES; @@ -95,15 +102,16 @@ isInGame = NO; free(gameArgs); - // bring the uiwindow below in front - UIWindow *aWin = [[[UIApplication sharedApplication] windows] objectAtIndex:0]; - [aWin makeKeyAndVisible]; - - // notice that in the simulator this reports 2 windows - DLog(@"%@",[[UIApplication sharedApplication] windows]); + UIWindow *aWin = [[[UIApplication sharedApplication] windows] objectAtIndex:0]; [aWin makeKeyAndVisible]; + [UIView beginAnimations:@"fading in from ingame" context:NULL]; + [UIView setAnimationDuration:1]; + blackView.alpha = 0; + [UIView commitAnimations]; + [blackView performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1]; + [blackView performSelector:@selector(release) withObject:nil afterDelay:1]; } --(void) displayOverlayLater { +-(void) displayOverlayLater:(NSNumber *)isNetGame { // overlay with controls, become visible later, with a transparency effect OverlayViewController *overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController" bundle:nil]; diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/SavedGamesViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.h Wed Sep 22 02:22:15 2010 +0200 @@ -0,0 +1,29 @@ +/* + * Hedgewars-iOS, a Hedgewars port for iOS devices + * Copyright (c) 2009-2010 Vittorio Giovara + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * File created on 22/09/2010. + */ + + +#import + + +@interface SavedGamesViewController : UIViewController { + +} + +@end diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/SavedGamesViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Wed Sep 22 02:22:15 2010 +0200 @@ -0,0 +1,71 @@ +/* + * Hedgewars-iOS, a Hedgewars port for iOS devices + * Copyright (c) 2009-2010 Vittorio Giovara + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * File created on 22/09/2010. + */ + + +#import "SavedGamesViewController.h" + + +@implementation SavedGamesViewController + +/* + // 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 { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} +*/ + + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Overriden to allow any orientation. + return YES; +} + + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + + +- (void)viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Classes/SavedGamesViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.xib Wed Sep 22 02:22:15 2010 +0200 @@ -0,0 +1,452 @@ + + + + 800 + 10C540 + 759 + 1038.25 + 458.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 77 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + {1024, 748} + + + 3 + MQA + + 2 + + + NO + + 2 + + IBIPadFramework + + + + + YES + + + view + + + + 3 + + + + + YES + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + + + YES + SavedGamesViewController + UIResponder + {{353, 156}, {1024, 768}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 3 + + + + YES + + NSObject + + IBProjectSource + IBCocoaTouchTool/IBCocoaTouchToolIntegration.h + + + + NSObject + + IBProjectSource + IBInternalHeaders/IBAppKitAdditions.h + + + + NSObject + + IBProjectSource + IBInternalHeaders/IBConnection.h + + + + NSObject + + IBProjectSource + IBInternalHeaders/IBFieldEditor.h + + + + NSObject + + IBProjectSource + IBInternalHeaders/IBFoundationAdditions.h + + + + NSObject + + IBProjectSource + IBInternalHeaders/IBObjectContainer.h + + + + NSObject + + IBProjectSource + IBInternalHeaders/IBObjectIntegrationInternal.h + + + + NSObject + + IBProjectSource + IBInternalHeaders/IBWindowController.h + + + + NSObject + + IBProjectSource + IBPlugin/CustomViews/IBWindowRotationAnimation.h + + + + NSObject + + IBProjectSource + IBPlugin/Utilities/IBObjectMarshalling.h + + + + NSObject + + IBProjectSource + IBPlugin/Utilities/IBValueMarshallers.h + + + + NSObject + + IBProjectSource + IBPlugin/WidgetIntegration/Accessibility/IBUIAccessibilityIntegration.h + + + + NSObject + + IBProjectSource + IBPlugin/WidgetIntegration/IBUIObjectIntegration.h + + + + NSObject + + IBProjectSource + IBPlugin/WidgetIntegration/IBUIViewController/IBUIViewControllerEditorPlaceholderView.h + + + + NSObject + + IBProjectSource + IBPlugin/WidgetIntegration/IBUIViewController/IBUIViewControllerEditorView.h + + + + + YES + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + DevToolsKit.framework/Headers/DTAssetLibrary.h + + + + NSObject + + IBFrameworkSource + DevToolsKit.framework/Headers/DTDragManager.h + + + + NSObject + + IBFrameworkSource + DevToolsKit.framework/Headers/DTTemplateChooserViewController.h + + + + NSObject + + IBFrameworkSource + DevToolsKit.framework/Headers/DTTypeCompletionHandler.h + + + + NSObject + + IBFrameworkSource + InterfaceBuilderKit.framework/Headers/IBObjectIntegration.h + + + + NSObject + + IBFrameworkSource + PrintCore.framework/Headers/PDEPluginInterface.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIResponder + NSObject + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../../../IBCocoaTouchPlugin.xcodeproj + 3 + 77 + + + diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Sep 22 02:22:15 2010 +0200 @@ -26,6 +26,8 @@ 28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; }; 28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 611D9B12124949D000008271 /* NSStringExtra.m in Sources */ = {isa = PBXBuildFile; fileRef = 611D9B11124949D000008271 /* NSStringExtra.m */; }; + 611D9BFB12497E9800008271 /* SavedGamesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611D9BF912497E9800008271 /* SavedGamesViewController.m */; }; + 611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */; }; 611E03E711FA747C0077A41E /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 611E037C11FA74590077A41E /* libvorbis.a */; }; 611E0E5111FA92170077A41E /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 611E0E5011FA92130077A41E /* libfreetype.a */; }; 611E0EE711FB20610077A41E /* ammoButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 611E0EE511FB20610077A41E /* ammoButton.png */; }; @@ -695,6 +697,9 @@ 32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hedgewars_Prefix.pch; sourceTree = ""; }; 611D9B10124949D000008271 /* NSStringExtra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSStringExtra.h; path = Classes/NSStringExtra.h; sourceTree = ""; }; 611D9B11124949D000008271 /* NSStringExtra.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSStringExtra.m; path = Classes/NSStringExtra.m; sourceTree = ""; }; + 611D9BF812497E9800008271 /* SavedGamesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SavedGamesViewController.h; sourceTree = ""; }; + 611D9BF912497E9800008271 /* SavedGamesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SavedGamesViewController.m; sourceTree = ""; }; + 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SavedGamesViewController.xib; sourceTree = ""; }; 611E02EC11FA74580077A41E /* cocos2d-iphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "cocos2d-iphone.xcodeproj"; path = "../../../Library/cocos2d/cocos2d-iphone.xcodeproj"; sourceTree = SOURCE_ROOT; }; 611E0E4B11FA92130077A41E /* freetype.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = freetype.xcodeproj; path = "../../../Library/freetype/Xcode-iPhoneOS/freetype.xcodeproj"; sourceTree = SOURCE_ROOT; }; 611E0EE511FB20610077A41E /* ammoButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ammoButton.png; path = Resources/Overlay/ammoButton.png; sourceTree = ""; }; @@ -923,6 +928,7 @@ children = ( 6163EE4D11CC247D001C0453 /* Game Config */, 6163EE4C11CC2478001C0453 /* Settings Pages */, + 611D9BF312497B7700008271 /* Other Controllers */, 6163EE6C11CC253F001C0453 /* Overlay */, 616591F011CA9BA200D6E256 /* MainMenuViewController.h */, 616591F111CA9BA200D6E256 /* MainMenuViewController.m */, @@ -1032,6 +1038,19 @@ name = Frameworks; sourceTree = ""; }; + 611D9BF312497B7700008271 /* Other Controllers */ = { + isa = PBXGroup; + children = ( + 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */, + 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */, + 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */, + 611D9BF812497E9800008271 /* SavedGamesViewController.h */, + 611D9BF912497E9800008271 /* SavedGamesViewController.m */, + 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */, + ); + name = "Other Controllers"; + sourceTree = ""; + }; 611E02ED11FA74580077A41E /* Products */ = { isa = PBXGroup; children = ( @@ -1213,9 +1232,6 @@ 616591F611CA9BA200D6E256 /* OverlayViewController.h */, 616591F711CA9BA200D6E256 /* OverlayViewController.m */, 6165925011CA9CB400D6E256 /* OverlayViewController.xib */, - 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */, - 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */, - 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */, 611EEAEB122B2A4D00DF6938 /* HelpPageViewController.h */, 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */, 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */, @@ -2034,6 +2050,7 @@ 61842B40122B66280096E335 /* helpleft.png in Resources */, 6199E83A124647DE00DADF8C /* SupportViewController.xib in Resources */, 6199E86D12464A8E00DADF8C /* surpise.png in Resources */, + 611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2161,6 +2178,7 @@ 611EEAEE122B2A4D00DF6938 /* HelpPageViewController.m in Sources */, 6199E839124647DE00DADF8C /* SupportViewController.m in Sources */, 611D9B12124949D000008271 /* NSStringExtra.m in Sources */, + 611D9BFB12497E9800008271 /* SavedGamesViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -r f8f0d0ceb19c -r 568bfd083465 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Wed Sep 22 01:10:20 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Wed Sep 22 02:22:15 2010 +0200 @@ -120,7 +120,7 @@ 292 - {{20, 729}, {18, 19}} + {{20, 19}, {18, 19}} NO 3 @@ -182,11 +182,30 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + NSImage settingsButton.png + + + 292 + {{20, 686}, {72, 62}} + + NO + 4 + IBIPadFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + {1024, 768} @@ -255,6 +274,15 @@ 54 + + + switchViews: + + + 7 + + 89 + @@ -273,9 +301,10 @@ - + + @@ -322,6 +351,11 @@ + + 88 + + + @@ -338,6 +372,7 @@ 45.IBPluginDependency 50.IBPluginDependency 52.IBPluginDependency + 88.IBPluginDependency YES @@ -351,6 +386,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -369,7 +405,7 @@ - 87 + 89