--- a/hedgewars/SDLh.pas Mon Aug 02 18:19:55 2010 +0200
+++ b/hedgewars/SDLh.pas Mon Aug 02 23:15:34 2010 +0200
@@ -718,6 +718,7 @@
function SDL_GetRelativeMouseState(x, y: PLongInt): Byte; cdecl; external SDLLibName;
function SDL_GetNumMice: LongInt; cdecl; external SDLLibName;
function SDL_PixelFormatEnumToMasks(format: TSDL_ArrayByteOrder; bpp: PLongInt; Rmask, Gmask, Bmask, Amask: PLongInt): boolean; cdecl; external SDLLibName;
+function SDL_RenderReadPixels(rect: PSDL_Rect; format: LongInt; pixels: pointer; pitch: LongInt): LongInt; cdecl; external SDLLibName;
{$ENDIF}
function SDL_GetKeyState(numkeys: PLongInt): PByteArray; cdecl; external SDLLibName {$IFDEF SDL13} name 'SDL_GetKeyboardState'{$ENDIF};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -0,0 +1,16 @@
+//
+// AboutViewController.h
+// Hedgewars
+//
+// Created by Vittorio on 01/08/10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+
+@interface AboutViewController : UIViewController {
+
+}
+
+@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -0,0 +1,42 @@
+ //
+// AboutViewController.m
+// Hedgewars
+//
+// Created by Vittorio on 01/08/10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "AboutViewController.h"
+#import "CommodityFunctions.h"
+
+@implementation AboutViewController
+
+
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
+ return rotationManager(interfaceOrientation);
+}
+
+-(void) viewDidLoad {
+ self.view.frame = CGRectMake(0, 0, 320, 480);
+ [super viewDidLoad];
+}
+
+-(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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.xib Mon Aug 02 23:15:34 2010 +0200
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">117</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="2"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="841351856">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBProxyObject" id="606714003">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <object class="IBUIView" id="766721923">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUILabel" id="712969491">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{88, 90}, {42, 21}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Label</string>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 480}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="766721923"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="841351856"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="606714003"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="766721923"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="712969491"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="712969491"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>2.IBEditorWindowLastContentRect</string>
+ <string>2.IBPluginDependency</string>
+ <string>4.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>AboutViewController</string>
+ <string>UIResponder</string>
+ <string>{{275, 444}, {320, 480}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">4</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">AboutViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/AboutViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="786211723">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="786211723"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">117</string>
+ </data>
+</archive>
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Mon Aug 02 23:15:34 2010 +0200
@@ -39,6 +39,9 @@
#define CURRENT_AMMOSIZE 46
+#define UICOLOR_HW_YELLOW_BODER [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xC0/255 blue:0 alpha:1]
+#define UICOLOR_HW_YELLOW_TEXT [UIColor colorWithRed:(CGFloat)0xF0/255 green:(CGFloat)0xD0/255 blue:0 alpha:1]
+
void createTeamNamed (NSString *nameWithoutExt);
void createWeaponNamed (NSString *nameWithoutExt);
void createSchemeNamed (NSString *nameWithoutExt);
--- a/project_files/HedgewarsMobile/Classes/DetailViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/DetailViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -15,7 +15,7 @@
@interface DetailViewController : UITableViewController <UISplitViewControllerDelegate, UIPopoverControllerDelegate> {
NSArray *controllerNames;
-
+
GeneralSettingsViewController *generalSettingsViewController;
TeamSettingsViewController *teamSettingsViewController;
WeaponSettingsViewController *weaponSettingsViewController;
@@ -26,7 +26,7 @@
// used in iphone version
-(IBAction) dismissSplitView;
-@property (nonatomic, retain) NSArray *controllerNames;
+@property (nonatomic,retain) NSArray *controllerNames;
@property (nonatomic,retain) UIPopoverController *popoverController;
@end
--- a/project_files/HedgewarsMobile/Classes/DetailViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/DetailViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -15,17 +15,13 @@
#import "CommodityFunctions.h"
@implementation DetailViewController
-@synthesize controllerNames,popoverController;
+@synthesize controllerNames, popoverController;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
return rotationManager(interfaceOrientation);
}
--(void) willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration{
- self.view.frame = CGRectMake(0, 0, 1024, 1024);
-}
-
-(void) viewDidLoad {
self.title = NSLocalizedString(@"Settings",@"");
--- a/project_files/HedgewarsMobile/Classes/EditableCellView.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/EditableCellView.h Mon Aug 02 23:15:34 2010 +0200
@@ -20,7 +20,7 @@
UILabel *titleLabel;
NSInteger minimumCharacters;
NSInteger maximumCharacters;
-
+
@private
NSString *oldValue;
}
--- a/project_files/HedgewarsMobile/Classes/FlagsViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/FlagsViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -12,7 +12,7 @@
@interface FlagsViewController : UITableViewController {
NSDictionary *teamDictionary;
- NSArray *flagArray;
+ NSArray *flagArray;
NSIndexPath *lastIndexPath;
}
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -7,12 +7,12 @@
//
#import <UIKit/UIKit.h>
+#import "MapConfigViewController.h"
@class TeamConfigViewController;
-@class MapConfigViewController;
@class SchemeWeaponConfigViewController;
-@interface GameConfigViewController : UIViewController {
+@interface GameConfigViewController : UIViewController <MapConfigDelegate> {
UIViewController *activeController;
MapConfigViewController *mapConfigViewController;
TeamConfigViewController *teamConfigViewController;
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -9,18 +9,10 @@
#import "GameConfigViewController.h"
#import "SDL_uikitappdelegate.h"
#import "CommodityFunctions.h"
-#import "MapConfigViewController.h"
#import "TeamConfigViewController.h"
#import "SchemeWeaponConfigViewController.h"
-// draw background image in uitoolbar
-/*@implementation UIToolbar (CustomImage)
--(void) drawRect:(CGRect)rect {
- UIImage *image = [UIImage imageWithContentsOfFile:@"toolbarBackground.png"];
- [image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)];
-}
-@end
-*/
+
@implementation GameConfigViewController
@@ -197,18 +189,19 @@
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
if (mapConfigViewController == nil)
mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil];
+ mapConfigViewController.delegate = self;
if (teamConfigViewController == nil)
- teamConfigViewController = [[TeamConfigViewController alloc] initWithStyle:UITableViewStylePlain];
- teamConfigViewController.view.frame = CGRectMake(3, 224, 300, 472);
+ teamConfigViewController = [[TeamConfigViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ teamConfigViewController.view.frame = CGRectMake(10, 70, 300, 600);
teamConfigViewController.view.backgroundColor = [UIColor clearColor];
[mapConfigViewController.view addSubview:teamConfigViewController.view];
if (schemeWeaponConfigViewController == nil)
schemeWeaponConfigViewController = [[SchemeWeaponConfigViewController alloc] initWithStyle:UITableViewStyleGrouped];
- schemeWeaponConfigViewController.view.frame = CGRectMake(362, 224, 300, 472);
+ schemeWeaponConfigViewController.view.frame = CGRectMake(362, 200, 300, 480);
[mapConfigViewController.view addSubview:schemeWeaponConfigViewController.view];
for (UIView *oneView in self.view.subviews) {
if ([oneView isMemberOfClass:[UIToolbar class]]) {
- [[oneView viewWithTag:12345] setHidden:YES];
+ [oneView setHidden:YES];
break;
}
}
--- a/project_files/HedgewarsMobile/Classes/GameSetup.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.h Mon Aug 02 23:15:34 2010 +0200
@@ -12,7 +12,7 @@
@interface GameSetup : NSObject {
NSDictionary *systemSettings;
NSDictionary *gameConfig;
-
+
NSInteger ipcPort; // Port on which engine will listen
TCPsocket csd; // Client socket descriptor
}
--- a/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -187,48 +187,6 @@
return cell;
}
-/*
--(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
- UIView *containerView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)] autorelease];
- UILabel *headerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(10, 20, 300, 40)] autorelease];
- headerLabel.textColor = [UIColor lightGrayColor];
- headerLabel.shadowColor = [UIColor blackColor];
- headerLabel.shadowOffset = CGSizeMake(0, 1);
- headerLabel.font = [UIFont boldSystemFontOfSize:20];
- headerLabel.backgroundColor = [UIColor clearColor];
-
- switch (section) {
- case kNetworkFields:
- headerLabel.text = NSLocalizedString(@"Network Configuration", @"");
- break;
- case kAudioFields:
- headerLabel.text = NSLocalizedString(@"Audio Preferences", @"");
- break;
- case kOtherFields:
- headerLabel.text = NSLocalizedString(@"Other Settings", @"");
- break;
- default:
- NSLog(@"Warning: unset case value in titleForHeaderInSection!");
- headerLabel.text = @"!";
- break;
- }
-
- [containerView addSubview:headerLabel];
- return containerView;
-}
-
--(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
- if (kAudioFields == [indexPath section] && 2 == [indexPath row])
- return volumeCell.frame.size.height;
- else
- return table.rowHeight;
-}
-
--(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
- return 57.0;
-}
-*/
-
#pragma mark -
#pragma mark Table view delegate
-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
--- a/project_files/HedgewarsMobile/Classes/GravesViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/GravesViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -11,7 +11,7 @@
@interface GravesViewController : UITableViewController {
NSMutableDictionary *teamDictionary;
-
+
NSArray *graveArray;
NSIndexPath *lastIndexPath;
}
--- a/project_files/HedgewarsMobile/Classes/HogHatViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/HogHatViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -12,7 +12,7 @@
@interface HogHatViewController : UITableViewController {
NSDictionary *teamDictionary;
NSInteger selectedHog;
-
+
NSArray *hatArray;
UIImage *normalHogSprite;
NSIndexPath *lastIndexPath;
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -27,7 +27,7 @@
-(void) viewDidLoad {
NSArray *array = [[NSArray alloc] initWithObjects:
- NSLocalizedString(@"Return to Game", @""),
+ NSLocalizedString(@"Show Help", @""),
NSLocalizedString(@"Chat", @""),
NSLocalizedString(@"End Game", @""),
nil];
--- a/project_files/HedgewarsMobile/Classes/LevelViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/LevelViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -11,7 +11,7 @@
@interface LevelViewController : UITableViewController {
NSDictionary *teamDictionary;
-
+
NSArray *levelArray;
NSArray *levelSprites;
NSIndexPath *lastIndexPath;
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -10,14 +10,20 @@
@class SplitViewRootController;
@class GameConfigViewController;
+@class AboutViewController;
@interface MainMenuViewController : UIViewController {
UILabel *versionLabel;
+ GameConfigViewController *gameConfigViewController;
SplitViewRootController *settingsViewController;
- GameConfigViewController *gameConfigViewController;
+ AboutViewController *aboutViewController;
}
@property (nonatomic,retain) IBOutlet UILabel *versionLabel;
+@property (nonatomic,retain) GameConfigViewController *gameConfigViewController;
+@property (nonatomic,retain) SplitViewRootController *settingsViewController;
+@property (nonatomic,retain) AboutViewController *aboutViewController;
-(IBAction) switchViews:(id)sender;
+
@end
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -7,15 +7,16 @@
//
#import "MainMenuViewController.h"
+#import "CommodityFunctions.h"
#import "SDL_uikitappdelegate.h"
+#import "SDL_mixer.h"
#import "PascalImports.h"
#import "GameConfigViewController.h"
#import "SplitViewRootController.h"
-#import "CommodityFunctions.h"
-#import "SDL_mixer.h"
+#import "AboutViewController.h"
@implementation MainMenuViewController
-@synthesize versionLabel;
+@synthesize versionLabel, gameConfigViewController, settingsViewController, aboutViewController;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
return rotationManager(interfaceOrientation);
@@ -24,10 +25,10 @@
- (void)didReceiveMemoryWarning {
// Releases the view if it doesn't have a superview.
[super didReceiveMemoryWarning];
- if (settingsViewController.view.superview == nil)
- settingsViewController = nil;
- if (gameConfigViewController.view.superview == nil)
- gameConfigViewController = nil;
+ if (self.settingsViewController.view.superview == nil)
+ self.settingsViewController = nil;
+ if (self.gameConfigViewController.view.superview == nil)
+ self.gameConfigViewController = nil;
MSG_MEMCLEAN();
}
@@ -118,19 +119,34 @@
switch (button.tag) {
case 0:
- gameConfigViewController = [[GameConfigViewController alloc] initWithNibName:@"GameConfigViewController" bundle:nil];
+ if (nil == self.gameConfigViewController) {
+ GameConfigViewController *gcvc = [[GameConfigViewController alloc] initWithNibName:@"GameConfigViewController" bundle:nil];
+ self.gameConfigViewController = gcvc;
+ [gcvc release];
+ }
- [self presentModalViewController:gameConfigViewController animated:YES];
+ [self presentModalViewController:self.gameConfigViewController animated:YES];
break;
case 2:
- if (nil == settingsViewController) {
- settingsViewController = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil];
- settingsViewController.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
+ if (nil == self.settingsViewController) {
+ SplitViewRootController *svrc = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil];
+ svrc.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
+ self.settingsViewController = svrc;
+ [svrc release];
}
- [self presentModalViewController:settingsViewController animated:YES];
+ [self presentModalViewController:self.settingsViewController animated:YES];
break;
case 3:
+ if (nil == self.aboutViewController) {
+ AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil];
+ about.modalTransitionStyle = UIModalPresentationFormSheet;
+ self.aboutViewController = about;
+ [about release];
+ }
+
+ [self presentModalViewController:self.aboutViewController animated:YES];
+ /*
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;
@@ -144,6 +160,7 @@
[scroll addSubview:btn];
[self.view addSubview:scroll];
[scroll release];
+ */
break;
default:
alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented"
@@ -162,11 +179,11 @@
[self dismissModalViewControllerAnimated:YES];
}
-
-(void) viewDidUnload {
self.versionLabel = nil;
- gameConfigViewController = nil;
- settingsViewController = nil;
+ self.gameConfigViewController = nil;
+ self.settingsViewController = nil;
+ self.aboutViewController = nil;
MSG_DIDUNLOAD();
[super viewDidUnload];
}
@@ -175,6 +192,7 @@
[versionLabel release];
[settingsViewController release];
[gameConfigViewController release];
+ [aboutViewController release];
[super dealloc];
}
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -9,12 +9,21 @@
#import <UIKit/UIKit.h>
#import "SDL_net.h"
+@protocol MapConfigDelegate <NSObject>
+
+-(void) buttonPressed:(id) sender;
+
+@end
+
+
@interface MapConfigViewController : UIViewController <UITableViewDelegate, UITableViewDataSource> {
+ id<MapConfigDelegate> delegate;
+
TCPsocket sd, csd;
NSInteger oldValue; //slider
NSInteger oldPage; //segmented control
BOOL busy;
-
+
// objects read (mostly) by parent view
NSInteger maxHogs;
NSString *seedCommand;
@@ -23,7 +32,7 @@
NSString *mazeSizeCommand;
NSString *themeCommand;
NSString *staticMapCommand;
-
+
// various widgets in the view
UIButton *previewButton;
UITableView *tableView;
@@ -31,13 +40,15 @@
UILabel *sizeLabel;
UISegmentedControl *segmentedControl;
UISlider *slider;
-
+
// internal objects
NSIndexPath *lastIndexPath;
NSArray *themeArray;
NSArray *mapArray;
}
+@property (nonatomic,retain) id<MapConfigDelegate> delegate;
+
@property (nonatomic) NSInteger maxHogs;
@property (nonatomic) BOOL busy;
@property (nonatomic,retain) NSString *seedCommand;
@@ -58,10 +69,13 @@
@property (nonatomic,retain) NSArray *themeArray;
@property (nonatomic,retain) NSArray *mapArray;
+-(IBAction) buttonPressed:(id) sender;
+
-(IBAction) updatePreview;
-(IBAction) sliderChanged:(id) sender;
-(IBAction) sliderEndedChanging:(id) sender;
-(IBAction) segmentedControlChanged:(id) sender;
+
-(void) turnOnWidgets;
-(void) turnOffWidgets;
-(void) setLabelText:(NSString *)str;
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -17,7 +17,7 @@
@implementation MapConfigViewController
@synthesize previewButton, maxHogs, seedCommand, templateFilterCommand, mapGenCommand, mazeSizeCommand, themeCommand, staticMapCommand,
- tableView, maxLabel, sizeLabel, segmentedControl, slider, lastIndexPath, themeArray, mapArray, busy;
+ tableView, maxLabel, sizeLabel, segmentedControl, slider, lastIndexPath, themeArray, mapArray, busy, delegate;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
@@ -297,7 +297,7 @@
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- cell.textLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1 ];
+ cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
}
if (self.segmentedControl.selectedSegmentIndex != 1) {
@@ -312,11 +312,14 @@
cell.imageView.image = nil;
}
- if (row == [self.lastIndexPath row])
- cell.accessoryType = UITableViewCellAccessoryCheckmark;
- else
- cell.accessoryType = UITableViewCellAccessoryNone;
+ if (row == [self.lastIndexPath row]) {
+ UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]];
+ cell.accessoryView = checkbox;
+ [checkbox release];
+ } else
+ cell.accessoryView = nil;
+ cell.backgroundColor = [UIColor blackColor];
return cell;
}
@@ -337,9 +340,11 @@
}
UITableViewCell *newCell = [aTableView cellForRowAtIndexPath:indexPath];
- newCell.accessoryType = UITableViewCellAccessoryCheckmark;
+ UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]];
+ newCell.accessoryView = checkbox;
+ [checkbox release];
UITableViewCell *oldCell = [aTableView cellForRowAtIndexPath:self.lastIndexPath];
- oldCell.accessoryType = UITableViewCellAccessoryNone;
+ oldCell.accessoryView = nil;
self.lastIndexPath = indexPath;
[aTableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
@@ -452,7 +457,7 @@
// dummy value, everything is set by -updatePreview -> -didSelectRowAtIndexPath -> -updatePreviewWithMap
staticmap = @"map Bamboo";
self.slider.enabled = NO;
- self.sizeLabel.text = @".";
+ self.sizeLabel.text = @"";
[self restoreBackgroundImage];
break;
@@ -515,7 +520,6 @@
[array release];
self.mapArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MAPS_DIRECTORY() error:NULL];
- self.tableView.rowHeight = 42;
busy = NO;
// draw a white background
@@ -527,7 +531,8 @@
// on slower device we show directly the static map
NSString *modelId = modelType();
- if ([modelId hasPrefix:@"iPhone1"] || [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"])
+ //if ([modelId hasPrefix:@"iPhone1"] || [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"])
+ if (1)
self.segmentedControl.selectedSegmentIndex = 1;
else
self.segmentedControl.selectedSegmentIndex = 0;
@@ -541,6 +546,14 @@
oldValue = 5;
oldPage = 0;
+
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ [self.tableView setBackgroundView:nil];
+ self.view.backgroundColor = [UIColor clearColor];
+ self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
+ self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ self.tableView.rowHeight = 45;
+ }
}
-(void) viewDidAppear:(BOOL) animated {
@@ -549,12 +562,21 @@
}
#pragma mark -
-#pragma mark memory
+#pragma mark delegate functions for iPad
+-(IBAction) buttonPressed:(id) sender {
+ if (self.delegate != nil && [delegate respondsToSelector:@selector(buttonPressed:)])
+ [self.delegate buttonPressed:(UIButton *)sender];
+}
+
+#pragma mark -
-(void) didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
+ //[previewButton setImage:nil forState:UIControlStateNormal];
}
-(void) viewDidUnload {
+ self.delegate = nil;
+
self.previewButton = nil;
self.seedCommand = nil;
self.templateFilterCommand = nil;
@@ -579,6 +601,8 @@
}
-(void) dealloc {
+ self.delegate = nil;
+
[seedCommand release];
[templateFilterCommand release];
[mapGenCommand release];
--- a/project_files/HedgewarsMobile/Classes/MasterViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MasterViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -16,7 +16,7 @@
@class SchemeSettingsViewController;
@interface MasterViewController : UITableViewController {
- DetailViewController *detailViewController;
+ MasterViewController *targetController;
NSArray *controllerNames;
NSIndexPath *lastIndexPath;
GeneralSettingsViewController *generalSettingsViewController;
@@ -25,7 +25,7 @@
SchemeSettingsViewController *schemeSettingsViewController;
}
-@property (nonatomic, retain) DetailViewController *detailViewController;
+@property (nonatomic, retain) MasterViewController *targetController;
@property (nonatomic, retain) NSArray *controllerNames;
@property (nonatomic, retain) NSIndexPath *lastIndexPath;
--- a/project_files/HedgewarsMobile/Classes/MasterViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MasterViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -15,7 +15,7 @@
#import "CommodityFunctions.h"
@implementation MasterViewController
-@synthesize detailViewController, controllerNames, lastIndexPath;
+@synthesize targetController, controllerNames, lastIndexPath;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
@@ -29,20 +29,29 @@
[super viewDidLoad];
// the list of selectable controllers
- controllerNames = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""),
- NSLocalizedString(@"Teams",@""),
- NSLocalizedString(@"Weapons",@""),
- NSLocalizedString(@"Schemes",@""),
- nil];
- // the "Done" button on top left
- self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
- target:self
- action:@selector(dismissSplitView)];
+ NSArray *array = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""),
+ NSLocalizedString(@"Teams",@""),
+ NSLocalizedString(@"Weapons",@""),
+ NSLocalizedString(@"Schemes",@""),
+ nil];
+ self.controllerNames = array;
+ [array release];
+
+ // targetControllers tells whether we're on the right or left side of the splitview -- on iphone we only use the right side
+ if (targetController == nil && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ if (nil == generalSettingsViewController)
+ generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ generalSettingsViewController.navigationItem.hidesBackButton = YES;
+ [self.navigationController pushViewController:generalSettingsViewController animated:NO];
+ } else {
+ self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+ target:self
+ action:@selector(dismissSplitView)];
+ }
}
#pragma mark -
#pragma mark Table view data source
-
-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
return 1;
}
@@ -58,9 +67,17 @@
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
if (cell == nil) {
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
- cell.textLabel.text = [controllerNames objectAtIndex:[indexPath row]];
}
+ cell.textLabel.text = [controllerNames objectAtIndex:[indexPath row]];
+ if (nil == targetController) {
+ UIImage *icon = [[UIImage alloc] initWithContentsOfFile:@"Icon-Small.png"];
+ cell.imageView.image = icon;
+ [icon release];
+ cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+ } else
+ cell.accessoryType = UITableViewCellAccessoryNone;
+
return cell;
}
@@ -73,7 +90,7 @@
if (newRow != oldRow) {
[self.tableView deselectRowAtIndexPath:lastIndexPath animated:YES];
- [detailViewController.navigationController popToRootViewControllerAnimated:NO];
+ [targetController.navigationController popToRootViewControllerAnimated:NO];
switch (newRow) {
case 0:
@@ -98,11 +115,17 @@
break;
}
- nextController.navigationItem.hidesBackButton = YES;
nextController.title = [controllerNames objectAtIndex:newRow];
- [detailViewController.navigationController pushViewController:nextController animated:NO];
self.lastIndexPath = indexPath;
[self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
+
+ if (nil == targetController) {
+ nextController.navigationItem.hidesBackButton = NO;
+ [self.navigationController pushViewController:nextController animated:YES];
+ } else {
+ nextController.navigationItem.hidesBackButton = YES;
+ [targetController.navigationController pushViewController:nextController animated:NO];
+ }
}
}
@@ -125,7 +148,7 @@
}
-(void) viewDidUnload {
- self.detailViewController = nil;
+ self.targetController = nil;
self.controllerNames = nil;
self.lastIndexPath = nil;
generalSettingsViewController = nil;
@@ -137,8 +160,8 @@
}
-(void) dealloc {
+ targetController = nil;
[controllerNames release];
- [detailViewController release];
[lastIndexPath release];
[generalSettingsViewController release];
[teamSettingsViewController release];
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -19,12 +19,12 @@
UIPopoverController *popoverController; // iPad only
InGameMenuViewController *popupMenu;
BOOL isPopoverVisible;
-
+
// ths touch section
CGFloat initialDistanceForPinching;
CGPoint startingPoint;
BOOL isSegmentVisible;
-
+
// the sdl window underneath
SDL_Window *sdlwindow;
}
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -128,6 +128,8 @@
SDL_VideoDevice *_this = SDL_GetVideoDevice();
SDL_VideoDisplay *display = &_this->displays[0];
sdlwindow = display->windows;
+
+ doDim();
}
-(void) viewDidUnload {
--- a/project_files/HedgewarsMobile/Classes/PascalImports.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/PascalImports.h Mon Aug 02 23:15:34 2010 +0200
@@ -13,7 +13,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-
+
/* add C declarations below for all exported Pascal functions/procedure
* that you want to use
*/
@@ -25,50 +25,50 @@
void HW_versionInfo(short int *netProto, char **versionStr);
void HW_click(void);
-
+
void HW_zoomIn(void);
void HW_zoomOut(void);
void HW_zoomReset(void);
void HW_ammoMenu(void);
-
+
void HW_walkingKeysUp(void);
void HW_otherKeysUp(void);
void HW_allKeysUp(void);
-
+
void HW_walkLeft(void);
void HW_walkRight(void);
void HW_aimUp(void);
void HW_aimDown(void);
void HW_preciseSet(BOOL status);
-
+
void HW_shoot(void);
void HW_jump(void);
void HW_backjump(void);
-
+
void HW_chat(void);
void HW_chatEnd(void);
void HW_tab(void);
void HW_pause(void);
-
+
void HW_terminate(BOOL andCloseFrontend);
-
+
void HW_setLandscape(BOOL rotate);
void HW_setCursor(int x, int y);
void HW_getCursor(int *x, int *y);
void HW_setPianoSound(int snd);
-
+
float HW_zoomFactor(void);
int HW_zoomLevel(void);
-
+
BOOL HW_isAmmoOpen(void);
BOOL HW_isPaused(void);
BOOL HW_isWeaponRequiringClick(void);
BOOL HW_isWeaponTimerable(void);
BOOL HW_isWeaponSwitch(void);
-
+
void HW_setGrenadeTime(int time);
-
+
#ifdef __cplusplus
}
#endif
--- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -12,7 +12,7 @@
@interface SchemeWeaponConfigViewController : UITableViewController {
NSArray *listOfSchemes;
NSArray *listOfWeapons;
-
+
NSIndexPath *lastIndexPath_sc;
NSIndexPath *lastIndexPath_we;
--- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -30,7 +30,7 @@
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[self.tableView setBackgroundView:nil];
self.view.backgroundColor = [UIColor clearColor];
- self.tableView.separatorColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1];
+ self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
}
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
}
@@ -77,23 +77,57 @@
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
}
- cell.accessoryType = UITableViewCellAccessoryNone;
+ cell.accessoryView = nil;
if ([indexPath section] == 0) {
cell.textLabel.text = [[self.listOfSchemes objectAtIndex:row] stringByDeletingPathExtension];
if ([[self.listOfSchemes objectAtIndex:row] isEqualToString:self.selectedScheme]) {
- cell.accessoryType = UITableViewCellAccessoryCheckmark;
+ UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]];
+ cell.accessoryView = checkbox;
+ [checkbox release];
self.lastIndexPath_sc = indexPath;
}
} else {
cell.textLabel.text = [[self.listOfWeapons objectAtIndex:row] stringByDeletingPathExtension];
if ([[self.listOfWeapons objectAtIndex:row] isEqualToString:self.selectedWeapon]) {
- cell.accessoryType = UITableViewCellAccessoryCheckmark;
+ UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]];
+ cell.accessoryView = checkbox;
+ [checkbox release];
self.lastIndexPath_we = indexPath;
}
}
+
+ cell.backgroundColor = [UIColor blackColor];
+ cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
return cell;
}
+-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 40.0;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+ NSString *fileToLoad;
+ if (section == 0)
+ fileToLoad = @"SchemesLabel.png";
+ else
+ fileToLoad = @"WeaponsLabel.png";
+
+ UIImage *img = [[UIImage alloc] initWithContentsOfFile:fileToLoad];
+ UIImageView *imgView = [[[UIImageView alloc] initWithImage:img] autorelease];
+ [img release];
+
+ return imgView;
+}
+
+/*
+-(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger) section {
+ if (section == 0) {
+ return NSLocalizedString(@"Schemes",@"");
+ } else {
+ return NSLocalizedString(@"Weapons",@"");;
+ }
+}
+*/
#pragma mark -
#pragma mark Table view delegate
@@ -110,9 +144,11 @@
if (newRow != oldRow) {
//TODO: this code works only for a single section table
UITableViewCell *newCell = [aTableView cellForRowAtIndexPath:indexPath];
- newCell.accessoryType = UITableViewCellAccessoryCheckmark;
+ UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]];
+ newCell.accessoryView = checkbox;
+ [checkbox release];
UITableViewCell *oldCell = [aTableView cellForRowAtIndexPath:lastIndexPath];
- oldCell.accessoryType = UITableViewCellAccessoryNone;
+ oldCell.accessoryView = nil;
if ([indexPath section] == 0) {
self.lastIndexPath_sc = indexPath;
@@ -127,14 +163,6 @@
[aTableView deselectRowAtIndexPath:indexPath animated:YES];
}
--(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger) section {
- if (section == 0) {
- return NSLocalizedString(@"Schemes",@"");
- } else {
- return NSLocalizedString(@"Weapons",@"");;
- }
-}
-
#pragma mark -
#pragma mark Memory management
-(void) didReceiveMemoryWarning {
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -11,7 +11,7 @@
@interface SingleSchemeViewController : UITableViewController <EditableCellViewDelegate> {
NSString *schemeName;
- NSMutableArray *schemeArray;
+ NSMutableArray *schemeArray;
NSArray *basicSettingList;
NSArray *gameModifierArray;
}
--- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -18,13 +18,13 @@
@interface SingleTeamViewController : UITableViewController <EditableCellViewDelegate> {
NSMutableDictionary *teamDictionary;
-
+
NSString *teamName;
UIImage *normalHogSprite;
-
+
NSArray *secondaryItems;
BOOL isWriteNeeded;
-
+
HogHatViewController *hogHatViewController;
GravesViewController *gravesViewController;
VoicesViewController *voicesViewController;
--- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -12,10 +12,10 @@
@interface SingleWeaponViewController : UITableViewController <EditableCellViewDelegate, WeaponButtonControllerDelegate> {
NSString *weaponName;
-
+
UIImage *ammoStoreImage;
NSArray *ammoNames;
-
+
char *quantity;
char *probability;
char *delay;
--- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -214,6 +214,22 @@
return 120;
}
+-(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section {
+ NSString *sectionTitle = nil;
+ switch (section) {
+ case 0:
+ sectionTitle = NSLocalizedString(@"Weaponset Name", @"");
+ break;
+ case 1:
+ sectionTitle = NSLocalizedString(@"Weapon Ammuntions", @"");
+ break;
+ default:
+ DLog(@"nope");
+ break;
+ }
+ return sectionTitle;
+}
+
#pragma mark -
#pragma mark Table view delegate
-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
--- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SplitViewRootController.h Mon Aug 02 23:15:34 2010 +0200
@@ -8,10 +8,12 @@
#import <UIKit/UIKit.h>
-@class DetailViewController;
+@class MasterViewController;
@interface SplitViewRootController: UIViewController {
- DetailViewController *detailViewController;
+ MasterViewController *activeController;
}
+@property (nonatomic,retain) MasterViewController *activeController;
+
@end
--- a/project_files/HedgewarsMobile/Classes/SplitViewRootController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SplitViewRootController.m Mon Aug 02 23:15:34 2010 +0200
@@ -12,7 +12,7 @@
#import "CommodityFunctions.h"
@implementation SplitViewRootController
-
+@synthesize activeController;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
return rotationManager(interfaceOrientation);
@@ -22,52 +22,56 @@
// Releases the view if it doesn't have a superview.
[super didReceiveMemoryWarning];
// Release any cached data, images, etc that aren't in use.
- if (detailViewController.view.superview == nil)
- detailViewController = nil;
+ if (self.activeController.view.superview == nil)
+ self.activeController = nil;
MSG_MEMCLEAN();
}
// load the view programmatically; we need a splitViewController that handles a MasterViewController
// (which is just a UITableViewController) and a DetailViewController where we present options
-(void) viewDidLoad {
- detailViewController = [[DetailViewController alloc] initWithStyle:UITableViewStyleGrouped];
- UINavigationController *detailedNavController = [[UINavigationController alloc] initWithRootViewController:detailViewController];
- [detailViewController release];
+ CGRect rect = [[UIScreen mainScreen] bounds];
+ self.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
- CGRect rect = [[UIScreen mainScreen] bounds];
+ if (self.activeController == nil) {
+ MasterViewController *rightController = [[MasterViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ rightController.targetController = nil;
+ self.activeController = rightController;
+ [rightController release];
+ }
+ UINavigationController *rightNavController = [[UINavigationController alloc] initWithRootViewController:self.activeController];
+
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- self.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
+ MasterViewController *leftController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain];
+ leftController.targetController = self.activeController;
+ UINavigationController *leftNavController = [[UINavigationController alloc] initWithRootViewController:leftController];
+ [leftController release];
UISplitViewController *splitViewRootController = [[UISplitViewController alloc] init];
+ splitViewRootController.delegate = nil;
splitViewRootController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
-
- MasterViewController *masterViewController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain];
- UINavigationController *mainNavController = [[UINavigationController alloc] initWithRootViewController:masterViewController];
- [masterViewController release];
-
- splitViewRootController.delegate = detailViewController;
- masterViewController.detailViewController = detailViewController;
- splitViewRootController.viewControllers = [NSArray arrayWithObjects: mainNavController, detailedNavController, nil];
- [mainNavController release];
- [detailedNavController release];
+ splitViewRootController.viewControllers = [NSArray arrayWithObjects: leftNavController, rightNavController, nil];
+ [leftNavController release];
+ [rightNavController release];
// add view to main controller
[self.view addSubview:splitViewRootController.view];
} else {
- [self.view addSubview:detailedNavController.view];
+ rightNavController.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
+ [self.view addSubview:rightNavController.view];
}
[super viewDidLoad];
}
-(void) viewDidUnload {
- detailViewController = nil;
+ self.activeController = nil;
MSG_DIDUNLOAD();
[super viewDidUnload];
}
-(void) dealloc {
- [detailViewController release];
+ [self.activeController release];
[super dealloc];
}
@@ -76,22 +80,22 @@
// see http://davidebenini.it/2009/01/03/viewwillappear-not-being-called-inside-a-uinavigationcontroller/
-(void) viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
- [detailViewController.navigationController viewWillAppear:animated];
+ [self.activeController.navigationController viewWillAppear:animated];
}
-(void) viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
- [detailViewController.navigationController viewWillDisappear:animated];
+ [self.activeController.navigationController viewWillDisappear:animated];
}
-(void) viewDidAppear:(BOOL)animated {
[super viewDidLoad];
- [detailViewController.navigationController viewDidAppear:animated];
+ [self.activeController.navigationController viewDidAppear:animated];
}
-(void) viewDidDisappear:(BOOL)animated {
[super viewDidUnload];
- [detailViewController.navigationController viewDidDisappear:animated];
+ [self.activeController.navigationController viewDidDisappear:animated];
}
--- a/project_files/HedgewarsMobile/Classes/SquareButtonView.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SquareButtonView.m Mon Aug 02 23:15:34 2010 +0200
@@ -37,6 +37,7 @@
[self.layer setCornerRadius:7.0f];
[self.layer setMasksToBounds:YES];
[self.layer setBorderWidth:2];
+ [self.layer setBorderColor:[UICOLOR_HW_YELLOW_BODER CGColor]];
// this changes the color at button press
[self addTarget:self action:@selector(nextColor) forControlEvents:UIControlEventTouchUpInside];
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Mon Aug 02 23:15:34 2010 +0200
@@ -26,6 +26,13 @@
CGSize screenSize = [[UIScreen mainScreen] bounds].size;
self.view.frame = CGRectMake(0, 0, screenSize.height, screenSize.width - 44);
isFirstLoad = YES;
+
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ [self.tableView setBackgroundView:nil];
+ self.view.backgroundColor = [UIColor clearColor];
+ self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
+ }
+ self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
}
-(void) viewWillAppear:(BOOL)animated {
@@ -74,13 +81,6 @@
return [listOfTeams count];
}
--(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section {
- if (section == 0)
- return NSLocalizedString(@"Playing Teams",@"");
- else
- return NSLocalizedString(@"Available Teams",@"");
-}
-
// Customize the appearance of table view cells.
-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
static NSString *CellIdentifier0 = @"Cell0";
@@ -106,7 +106,8 @@
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(12+88+7+36+7, 10, 250, 25)];
label.textAlignment = UITextAlignmentLeft;
label.backgroundColor = [UIColor clearColor];
- label.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize] + 2];
+ label.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
+ label.textColor = UICOLOR_HW_YELLOW_TEXT;
label.tag = LABEL_TAG;
[cell.contentView addSubview:label];
[label release];
@@ -124,23 +125,48 @@
SquareButtonView *squareButton = (SquareButtonView *)[cell viewWithTag:SQUAREBUTTON_TAG];
[squareButton selectColor:[[selectedRow objectForKey:@"color"] intValue]];
squareButton.ownerDictionary = selectedRow;
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- cellLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1];
- }
} else {
cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
if (cell == nil)
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease];
cell.textLabel.text = [[[listOfTeams objectAtIndex:[indexPath row]] objectForKey:@"team"] stringByDeletingPathExtension];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- cell.textLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1 ];
- }
}
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
+ cell.backgroundColor = [UIColor blackColor];
+ }
+
return cell;
}
+-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 40.0;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+ NSString *fileToLoad;
+ if (section == 0)
+ fileToLoad = @"PlayingTeamsLabel.png";
+ else
+ fileToLoad = @"AvailableTeamsLabel.png";
+
+ UIImage *img = [[UIImage alloc] initWithContentsOfFile:fileToLoad];
+ UIImageView *imgView = [[[UIImageView alloc] initWithImage:img] autorelease];
+ [img release];
+
+ return imgView;
+}
+
+/*
+-(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section {
+ if (section == 0)
+ return NSLocalizedString(@"Playing Teams",@"");
+ else
+ return NSLocalizedString(@"Available Teams",@"");
+}
+*/
#pragma mark -
#pragma mark Table view delegate
--- a/project_files/HedgewarsMobile/Classes/VoicesViewController.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/VoicesViewController.h Mon Aug 02 23:15:34 2010 +0200
@@ -11,7 +11,7 @@
@interface VoicesViewController : UITableViewController {
NSMutableDictionary *teamDictionary;
-
+
NSArray *voiceArray;
NSIndexPath *lastIndexPath;
--- a/project_files/HedgewarsMobile/Classes/WeaponCellView.h Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.h Mon Aug 02 23:15:34 2010 +0200
@@ -18,18 +18,18 @@
id<WeaponButtonControllerDelegate> delegate;
UILabel *weaponName;
UIImageView *weaponIcon;
-
+
UISlider *initialQt;
UISlider *probabilityQt;
UISlider *delayQt;
UISlider *crateQt;
-
+
@private
UIImageView *initialImg;
UIImageView *probabImg;
UIImageView *delayImg;
UIImageView *crateImg;
-
+
UILabel *initialLab;
UILabel *probLab;
UILabel *delLab;
@@ -40,7 +40,7 @@
@property (nonatomic,retain) UILabel *weaponName;
@property (nonatomic,retain) UIImageView *weaponIcon;
-
+
@property (nonatomic,retain) UISlider *initialQt;
@property (nonatomic,retain) UISlider *probabilityQt;
@property (nonatomic,retain) UISlider *delayQt;
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 02 23:15:34 2010 +0200
@@ -36,8 +36,10 @@
6129B9F711EFB04D0017E305 /* denied.png in Resources */ = {isa = PBXBuildFile; fileRef = 6129B9F611EFB04D0017E305 /* denied.png */; };
61370653117B1D50004EE44A /* Entitlements-Distribution.plist in Resources */ = {isa = PBXBuildFile; fileRef = 61370652117B1D50004EE44A /* Entitlements-Distribution.plist */; };
61536DF411CEAE7100D87A7E /* GameConfigViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924A11CA9CB400D6E256 /* GameConfigViewController.xib */; };
+ 615AD96212073B4D00F2FF04 /* startGameButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD96112073B4D00F2FF04 /* startGameButton.png */; };
+ 615AD9E9120764CA00F2FF04 /* backButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9E8120764CA00F2FF04 /* backButton.png */; };
+ 615AD9EB1207654E00F2FF04 /* helpButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9EA1207654E00F2FF04 /* helpButton.png */; };
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 */; };
6165920E11CA9BA200D6E256 /* FortsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E311CA9BA200D6E256 /* FortsViewController.m */; };
6165920F11CA9BA200D6E256 /* GameConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E511CA9BA200D6E256 /* GameConfigViewController.m */; };
@@ -115,7 +117,6 @@
61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; };
61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; };
61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; };
- 61C3255B1179A384001E70B1 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C3255A1179A384001E70B1 /* OpenAL.framework */; };
61E1F4F811D004240016A5AA /* adler32.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61E1F4F711D004240016A5AA /* adler32.pas */; };
61EBA62911DFF2BC0048B68A /* bricks.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62711DFF2BC0048B68A /* bricks.png */; };
61EBA62A11DFF2BC0048B68A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title.png */; };
@@ -127,6 +128,13 @@
61EF921211DF57AC003441C4 /* joyButton_attack.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920911DF57AC003441C4 /* joyButton_attack.png */; };
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 */; };
+ 61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */; };
+ 61F2E7CF1205EDE0005734F7 /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */; };
+ 61F2E7EC12060E31005734F7 /* checkbox.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7EB12060E31005734F7 /* checkbox.png */; };
+ 61F2E7FA12060FF6005734F7 /* SchemesLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7F812060FF6005734F7 /* SchemesLabel.png */; };
+ 61F2E7FB12060FF6005734F7 /* WeaponsLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7F912060FF6005734F7 /* WeaponsLabel.png */; };
+ 61F2E80D12061713005734F7 /* AvailableTeamsLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E80B12061713005734F7 /* AvailableTeamsLabel.png */; };
+ 61F2E80E12061713005734F7 /* PlayingTeamsLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E80C12061713005734F7 /* PlayingTeamsLabel.png */; };
61F7A35511E27D3C0040BA66 /* background-lobby.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A35411E27D3C0040BA66 /* background-lobby.png */; };
61F7A43811E290650040BA66 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43111E290650040BA66 /* Icon-72.png */; };
61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43211E290650040BA66 /* Icon-Small-50.png */; };
@@ -694,10 +702,11 @@
6129B9F611EFB04D0017E305 /* denied.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = denied.png; path = Resources/denied.png; sourceTree = "<group>"; };
61370652117B1D50004EE44A /* Entitlements-Distribution.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Entitlements-Distribution.plist"; sourceTree = "<group>"; };
614E333D11DE9A93009DBA4E /* VGSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = VGSHandlers.inc; path = ../../hedgewars/VGSHandlers.inc; sourceTree = SOURCE_ROOT; };
+ 615AD96112073B4D00F2FF04 /* startGameButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startGameButton.png; path = "Resources/Frontend-iPad/startGameButton.png"; sourceTree = "<group>"; };
+ 615AD9E8120764CA00F2FF04 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backButton.png; path = "Resources/Frontend-iPad/backButton.png"; sourceTree = "<group>"; };
+ 615AD9EA1207654E00F2FF04 /* helpButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpButton.png; path = "Resources/Frontend-iPad/helpButton.png"; sourceTree = "<group>"; };
6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = "<group>"; };
6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleWeaponViewController.m; sourceTree = "<group>"; };
- 616591DE11CA9BA200D6E256 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailViewController.h; sourceTree = "<group>"; };
- 616591DF11CA9BA200D6E256 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailViewController.m; sourceTree = "<group>"; };
616591E011CA9BA200D6E256 /* FlagsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagsViewController.h; sourceTree = "<group>"; };
616591E111CA9BA200D6E256 /* FlagsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FlagsViewController.m; sourceTree = "<group>"; };
616591E211CA9BA200D6E256 /* FortsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FortsViewController.h; sourceTree = "<group>"; };
@@ -812,7 +821,6 @@
61A117FE1168322700359010 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
61C079E211F35A300072BF46 /* EditableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditableCellView.h; sourceTree = "<group>"; };
61C079E311F35A300072BF46 /* EditableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditableCellView.m; sourceTree = "<group>"; };
- 61C3251D1179A300001E70B1 /* libopenalbridge.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenalbridge.a; sourceTree = BUILT_PRODUCTS_DIR; };
61C3255A1179A384001E70B1 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
61E1F4F711D004240016A5AA /* adler32.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = adler32.pas; path = ../../hedgewars/adler32.pas; sourceTree = SOURCE_ROOT; };
61EBA62711DFF2BC0048B68A /* bricks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bricks.png; path = "Resources/Frontend-iPad/bricks.png"; sourceTree = "<group>"; };
@@ -825,6 +833,14 @@
61EF920911DF57AC003441C4 /* joyButton_attack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_attack.png; path = Resources/Overlay/joyButton_attack.png; sourceTree = "<group>"; };
61EF920A11DF57AC003441C4 /* joyButton_backjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_backjump.png; path = Resources/Overlay/joyButton_backjump.png; sourceTree = "<group>"; };
61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_forwardjump.png; path = Resources/Overlay/joyButton_forwardjump.png; sourceTree = "<group>"; };
+ 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = "<group>"; };
+ 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; };
+ 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutViewController.xib; sourceTree = "<group>"; };
+ 61F2E7EB12060E31005734F7 /* checkbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = checkbox.png; path = Resources/checkbox.png; sourceTree = "<group>"; };
+ 61F2E7F812060FF6005734F7 /* SchemesLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SchemesLabel.png; path = "Resources/Frontend-iPad/SchemesLabel.png"; sourceTree = "<group>"; };
+ 61F2E7F912060FF6005734F7 /* WeaponsLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WeaponsLabel.png; path = "Resources/Frontend-iPad/WeaponsLabel.png"; sourceTree = "<group>"; };
+ 61F2E80B12061713005734F7 /* AvailableTeamsLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AvailableTeamsLabel.png; path = "Resources/Frontend-iPad/AvailableTeamsLabel.png"; sourceTree = "<group>"; };
+ 61F2E80C12061713005734F7 /* PlayingTeamsLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PlayingTeamsLabel.png; path = "Resources/Frontend-iPad/PlayingTeamsLabel.png"; sourceTree = "<group>"; };
61F7A35411E27D3C0040BA66 /* background-lobby.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background-lobby.png"; path = "Resources/Frontend-iPad/background-lobby.png"; sourceTree = "<group>"; };
61F7A43111E290650040BA66 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Resources/Icons/Icon-72.png"; sourceTree = "<group>"; };
61F7A43211E290650040BA66 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50.png"; path = "Resources/Icons/Icon-Small-50.png"; sourceTree = "<group>"; };
@@ -878,14 +894,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 61C3251B1179A300001E70B1 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 61C3255B1179A384001E70B1 /* OpenAL.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -910,7 +918,6 @@
children = (
1D6058910D05DD3D006BFB54 /* Hedgewars.app */,
928301170F10CAFC00CC5A3C /* libfpc.a */,
- 61C3251D1179A300001E70B1 /* libopenalbridge.a */,
);
name = Products;
sourceTree = "<group>";
@@ -955,6 +962,7 @@
isa = PBXGroup;
children = (
6129B9F611EFB04D0017E305 /* denied.png */,
+ 61F2E7EB12060E31005734F7 /* checkbox.png */,
61F7A42811E2905C0040BA66 /* Icons */,
61F903FA11DF58680068B24D /* Frontend-iPad */,
61F903E311DF584D0068B24D /* Frontend-iPhone */,
@@ -1083,8 +1091,6 @@
6165920311CA9BA200D6E256 /* SplitViewRootController.m */,
616591F411CA9BA200D6E256 /* MasterViewController.h */,
616591F511CA9BA200D6E256 /* MasterViewController.m */,
- 616591DE11CA9BA200D6E256 /* DetailViewController.h */,
- 616591DF11CA9BA200D6E256 /* DetailViewController.m */,
6163EE4E11CC248D001C0453 /* First Level */,
6163EE4F11CC2497001C0453 /* Second Level */,
6163EE5011CC24A1001C0453 /* Third Level */,
@@ -1169,6 +1175,9 @@
616591F611CA9BA200D6E256 /* OverlayViewController.h */,
616591F711CA9BA200D6E256 /* OverlayViewController.m */,
6165925011CA9CB400D6E256 /* OverlayViewController.xib */,
+ 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */,
+ 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */,
+ 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */,
);
name = Overlay;
sourceTree = "<group>";
@@ -1274,6 +1283,13 @@
61F903FA11DF58680068B24D /* Frontend-iPad */ = {
isa = PBXGroup;
children = (
+ 615AD96112073B4D00F2FF04 /* startGameButton.png */,
+ 61F2E7F812060FF6005734F7 /* SchemesLabel.png */,
+ 61F2E80B12061713005734F7 /* AvailableTeamsLabel.png */,
+ 615AD9EA1207654E00F2FF04 /* helpButton.png */,
+ 61F2E80C12061713005734F7 /* PlayingTeamsLabel.png */,
+ 61F2E7F912060FF6005734F7 /* WeaponsLabel.png */,
+ 615AD9E8120764CA00F2FF04 /* backButton.png */,
61F9043911DF64E20068B24D /* bluebox.png */,
61EBA62711DFF2BC0048B68A /* bricks.png */,
61EBA62811DFF2BC0048B68A /* title.png */,
@@ -1331,16 +1347,6 @@
};
/* End PBXGroup section */
-/* Begin PBXHeadersBuildPhase section */
- 61C325191179A300001E70B1 /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXHeadersBuildPhase section */
-
/* Begin PBXNativeTarget section */
1D6058900D05DD3D006BFB54 /* Hedgewars */ = {
isa = PBXNativeTarget;
@@ -1361,23 +1367,6 @@
productReference = 1D6058910D05DD3D006BFB54 /* Hedgewars.app */;
productType = "com.apple.product-type.application";
};
- 61C3251C1179A300001E70B1 /* openalbridge */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 61C325351179A314001E70B1 /* Build configuration list for PBXNativeTarget "openalbridge" */;
- buildPhases = (
- 61C325191179A300001E70B1 /* Headers */,
- 61C3251A1179A300001E70B1 /* Sources */,
- 61C3251B1179A300001E70B1 /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = openalbridge;
- productName = openalbridge;
- productReference = 61C3251D1179A300001E70B1 /* libopenalbridge.a */;
- productType = "com.apple.product-type.library.static";
- };
928301160F10CAFC00CC5A3C /* fpc */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9283011C0F10CB4B00CC5A3C /* Build configuration list for PBXNativeTarget "fpc" */;
@@ -1441,7 +1430,6 @@
targets = (
1D6058900D05DD3D006BFB54 /* Hedgewars */,
928301160F10CAFC00CC5A3C /* fpc */,
- 61C3251C1179A300001E70B1 /* openalbridge */,
6179928B114AE0C800BA94A9 /* UpdateDataFolder */,
);
};
@@ -2002,6 +1990,15 @@
6129B9F711EFB04D0017E305 /* denied.png in Resources */,
611E0EE711FB20610077A41E /* ammoButton.png in Resources */,
611E0EE811FB20610077A41E /* cornerButton.png in Resources */,
+ 61F2E7CF1205EDE0005734F7 /* AboutViewController.xib in Resources */,
+ 61F2E7EC12060E31005734F7 /* checkbox.png in Resources */,
+ 61F2E7FA12060FF6005734F7 /* SchemesLabel.png in Resources */,
+ 61F2E7FB12060FF6005734F7 /* WeaponsLabel.png in Resources */,
+ 61F2E80D12061713005734F7 /* AvailableTeamsLabel.png in Resources */,
+ 61F2E80E12061713005734F7 /* PlayingTeamsLabel.png in Resources */,
+ 615AD96212073B4D00F2FF04 /* startGameButton.png in Resources */,
+ 615AD9E9120764CA00F2FF04 /* backButton.png in Resources */,
+ 615AD9EB1207654E00F2FF04 /* helpButton.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2092,7 +2089,6 @@
6179883C114AA34C00BA94A9 /* uVisualGears.pas in Sources */,
6179883D114AA34C00BA94A9 /* uWorld.pas in Sources */,
611F4D4B11B27A9900F9759A /* uScript.pas in Sources */,
- 6165920C11CA9BA200D6E256 /* DetailViewController.m in Sources */,
6165920D11CA9BA200D6E256 /* FlagsViewController.m in Sources */,
6165920E11CA9BA200D6E256 /* FortsViewController.m in Sources */,
6165920F11CA9BA200D6E256 /* GameConfigViewController.m in Sources */,
@@ -2126,13 +2122,7 @@
61F904D711DF7DA30068B24D /* WeaponCellView.m in Sources */,
61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */,
61C079E411F35A300072BF46 /* EditableCellView.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- 61C3251A1179A300001E70B1 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
+ 61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2154,6 +2144,8 @@
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
+ GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+ GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Hedgewars_Prefix.pch;
@@ -2162,6 +2154,10 @@
"$(inherited)",
"\"$(SRCROOT)\"",
);
+ OTHER_LDFLAGS = (
+ "$(inherited)",
+ "-lgcov",
+ );
PRODUCT_NAME = Hedgewars;
TARGETED_DEVICE_FAMILY = "1,2";
};
@@ -2269,30 +2265,6 @@
};
name = Distribution;
};
- 6137064E117B1CB3004EE44A /* Distribution */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- HEADER_SEARCH_PATHS = (
- /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/System/Library/Frameworks/OpenAL.framework/Headers,
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/include\"/**",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/src\"/**",
- "\"$(SRCROOT)/../../../Library/lpng141\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_net\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer\"",
- "\"$(SRCROOT)/../../../Library/libvorbis-1.3.1/include\"",
- "\"$(SRCROOT)/../../../Library/libogg-1.2.0/include\"",
- );
- OTHER_LDFLAGS = "";
- PREBINDING = NO;
- PRODUCT_NAME = openalbridge;
- ZERO_LINK = NO;
- };
- name = Distribution;
- };
6137064F117B1CB3004EE44A /* Distribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -2383,29 +2355,6 @@
};
name = Valgrind;
};
- 616442A011B5CDE500B9A6F3 /* Valgrind */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- HEADER_SEARCH_PATHS = (
- /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/System/Library/Frameworks/OpenAL.framework/Headers,
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/include\"/**",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/src\"/**",
- "\"$(SRCROOT)/../../../Library/lpng141\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_net\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer\"",
- "\"$(SRCROOT)/../../../Library/libvorbis-1.3.1/include\"",
- "\"$(SRCROOT)/../../../Library/libogg-1.2.0/include\"",
- );
- OTHER_LDFLAGS = "";
- PREBINDING = NO;
- PRODUCT_NAME = openalbridge;
- };
- name = Valgrind;
- };
616442A111B5CDE500B9A6F3 /* Valgrind */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -2437,53 +2386,6 @@
};
name = Release;
};
- 61C3251E1179A300001E70B1 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- HEADER_SEARCH_PATHS = (
- /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/System/Library/Frameworks/OpenAL.framework/Headers,
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/include\"/**",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/src\"/**",
- "\"$(SRCROOT)/../../../Library/lpng141\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_net\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer\"",
- "\"$(SRCROOT)/../../../Library/libvorbis-1.3.1/include\"",
- "\"$(SRCROOT)/../../../Library/libogg-1.2.0/include\"",
- );
- OTHER_LDFLAGS = "";
- PREBINDING = NO;
- PRODUCT_NAME = openalbridge;
- };
- name = Debug;
- };
- 61C3251F1179A300001E70B1 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- HEADER_SEARCH_PATHS = (
- /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.2.sdk/System/Library/Frameworks/OpenAL.framework/Headers,
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/include\"/**",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL/src\"/**",
- "\"$(SRCROOT)/../../../Library/lpng141\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_net\"",
- "\"$(SRCROOT)/../../../Library/SDL-1.3/SDL_mixer\"",
- "\"$(SRCROOT)/../../../Library/libvorbis-1.3.1/include\"",
- "\"$(SRCROOT)/../../../Library/libogg-1.2.0/include\"",
- );
- OTHER_LDFLAGS = "";
- PREBINDING = NO;
- PRODUCT_NAME = openalbridge;
- ZERO_LINK = NO;
- };
- name = Release;
- };
928301180F10CAFD00CC5A3C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -2623,17 +2525,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 61C325351179A314001E70B1 /* Build configuration list for PBXNativeTarget "openalbridge" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 61C3251E1179A300001E70B1 /* Debug */,
- 61C3251F1179A300001E70B1 /* Release */,
- 6137064E117B1CB3004EE44A /* Distribution */,
- 616442A011B5CDE500B9A6F3 /* Valgrind */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
9283011C0F10CB4B00CC5A3C /* Build configuration list for PBXNativeTarget "fpc" */ = {
isa = XCConfigurationList;
buildConfigurations = (
--- a/project_files/HedgewarsMobile/Hedgewars_Prefix.pch Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars_Prefix.pch Mon Aug 02 23:15:34 2010 +0200
@@ -6,6 +6,13 @@
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <UIKit/UIKit.h>
+#import "PascalImports.h"
+#import "UIImageExtra.h"
+#import "CommodityFunctions.h"
+#import "SDL.h"
+#import "SDL_video.h"
+#import "SDL_net.h"
+#import "SDL_mixer.h"
#endif
// by http://www.cimgf.com/2010/05/02/my-current-prefix-pch-file/
@@ -19,7 +26,7 @@
#endif
#define ALog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
#endif
-
+
#define ZAssert(condition, ...) do { if (!(condition)) { ALog(__VA_ARGS__); }} while(0)
// by http://blog.coriolis.ch/2009/01/05/macros-for-xcode/
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/AvailableTeamsLabel.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/PlayingTeamsLabel.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/SchemesLabel.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/WeaponsLabel.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/backButton.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/helpButton.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/startGameButton.png has changed
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Mon Aug 02 23:15:34 2010 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">800</int>
+ <int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">10F569</string>
<string key="IBDocument.InterfaceBuilderVersion">788</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
@@ -57,7 +57,7 @@
<object class="IBUIButton" id="867308721">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{154, 417}, {258, 215}}</string>
+ <string key="NSFrame">{{383, 444}, {258, 215}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -92,7 +92,7 @@
</object>
<object class="IBUIButton" id="607338789">
<reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
+ <int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{611, 417}, {258, 215}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
@@ -140,7 +140,7 @@
<object class="IBUILabel" id="177360137">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{390, 345}, {243, 21}}</string>
+ <string key="NSFrame">{{376, 345}, {271, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -163,11 +163,12 @@
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
</object>
<object class="IBUIButton" id="898948205">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{476, 686}, {72, 62}}</string>
+ <string key="NSFrame">{{932, 686}, {72, 62}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">2</int>
@@ -271,10 +272,10 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="976741091"/>
<reference ref="177360137"/>
+ <reference ref="607338789"/>
+ <reference ref="95106947"/>
+ <reference ref="898948205"/>
<reference ref="867308721"/>
- <reference ref="607338789"/>
- <reference ref="898948205"/>
- <reference ref="95106947"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -445,13 +446,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
</object>
</object>
@@ -459,13 +453,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSPort.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
</object>
</object>
@@ -473,13 +460,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSStream.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
</object>
</object>
@@ -501,13 +481,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
</object>
</object>
@@ -649,7 +622,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="800" key="NS.object.0"/>
+ <integer value="1024" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
--- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Aug 02 18:19:55 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Mon Aug 02 23:15:34 2010 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">800</int>
+ <int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">10F569</string>
<string key="IBDocument.InterfaceBuilderVersion">788</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="7"/>
+ <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,19 +45,19 @@
<object class="IBUIImageView" id="420136851">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrameSize">{1024, 704}</string>
+ <string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">background-lobby.png</string>
+ <string key="NSResourceName">background.png</string>
</object>
</object>
<object class="IBUIImageView" id="553937568">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{1, 214}, {304, 490}}</string>
+ <string key="NSFrame">{{0, 60}, {320, 618}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -70,7 +70,7 @@
<object class="IBUIImageView" id="867832822">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{715, 214}, {309, 490}}</string>
+ <string key="NSFrame">{{704, 214}, {320, 464}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -80,27 +80,72 @@
<object class="IBUIImageView" id="438802257">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{357, 214}, {309, 490}}</string>
+ <string key="NSFrame">{{342, 187}, {340, 502}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="1034685562"/>
+ </object>
+ <object class="IBUIImageView" id="246022224">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{714, 14}, {300, 190}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIImage" ref="1034685562"/>
+ </object>
+ <object class="IBUIImageView" id="742028380">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{106, 707}, {320, 41}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUIImage" ref="1034685562"/>
</object>
- <object class="IBUIImageView" id="697924047">
+ <object class="IBUIImageView" id="696928530">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{17, 20}, {272, 162}}</string>
+ <string key="NSFrame">{{594, 707}, {320, 41}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUIImage" ref="1034685562"/>
</object>
+ <object class="IBUILabel" id="848132519">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{610, 713}, {145, 29}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Max Hogs:</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Oblique</string>
+ <double key="NSSize">18</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
<object class="IBUISegmentedControl" id="88728219">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{754, 169}, {240, 30}}</string>
+ <string key="NSFrame">{{744, 166}, {240, 30}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -139,13 +184,13 @@
</object>
<object class="NSColor" key="IBTintColor">
<int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwLjUwMTk2MDgxNCAwAA</bytes>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
</object>
<object class="IBUISlider" id="938256702">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{75, 138}, {149, 23}}</string>
+ <string key="NSFrame">{{263, 716}, {149, 23}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -157,7 +202,7 @@
<object class="IBUIButton" id="326163764">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{746, 20}, {256, 128}}</string>
+ <string key="NSFrame">{{736, 26}, {256, 128}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -188,7 +233,7 @@
<object class="IBUILabel" id="634417433">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{129, 41}, {42, 21}}</string>
+ <string key="NSFrame">{{778, 717}, {42, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -196,6 +241,11 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">...</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC45MTc2NDcxMjMzIDAuNjc0NTA5ODIzMyAwAA</bytes>
@@ -208,7 +258,7 @@
<object class="IBUILabel" id="743202682">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{77, 87}, {145, 29}}</string>
+ <string key="NSFrame">{{112, 713}, {145, 29}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -230,30 +280,10 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
</object>
- <object class="IBUITableView" id="565214171">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">265</int>
- <string key="NSFrame">{{719, 222}, {300, 474}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MSAwAA</bytes>
- </object>
- <bool key="IBUIClipsSubviews">YES</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIIndicatorStyle">2</int>
- <bool key="IBUIBouncesZoom">NO</bool>
- <int key="IBUISeparatorStyle">2</int>
- <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
- <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
- <float key="IBUIRowHeight">44</float>
- <float key="IBUISectionHeaderHeight">22</float>
- <float key="IBUISectionFooterHeight">22</float>
- </object>
<object class="IBUIButton" id="967260168">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483356</int>
- <string key="NSFrame">{{0, 219}, {300, 477}}</string>
+ <string key="NSFrame">{{10, 70}, {300, 600}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -272,7 +302,7 @@
<object class="IBUIButton" id="68378447">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483356</int>
- <string key="NSFrame">{{362, 218}, {300, 478}}</string>
+ <string key="NSFrame">{{362, 200}, {300, 480}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -291,7 +321,7 @@
<object class="IBUIImageView" id="920829014">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{357, 57}, {309, 165}}</string>
+ <string key="NSFrame">{{357, 30}, {309, 165}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -301,26 +331,97 @@
<string key="NSResourceName">title.png</string>
</object>
</object>
- <object class="IBUIImageView" id="12554882">
+ <object class="IBUITableView" id="394383001">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{714, 225}, {300, 485}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">45</float>
+ </object>
+ <object class="IBUIButton" id="550636851">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{0, 704}, {1024, 20}}</string>
+ <string key="NSFrame">{{441, 693}, {142, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">1</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="261639815"/>
+ <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">startGameButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="403581306">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{10, 693}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="261639815"/>
+ <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">bricks.png</string>
+ <string key="NSResourceName">backButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="1065439841">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{950, 693}, {64, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <int key="IBUITag">2</int>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="261639815"/>
+ <reference key="IBUIHighlightedTitleColor" ref="437070330"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="65043801"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">helpButton.png</string>
</object>
</object>
</object>
- <string key="NSFrameSize">{1024, 724}</string>
+ <string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC44MzkyMTU3NTU1IDAuODQ3MDU4ODkyMyAwLjg3MDU4ODMwMjYAA</bytes>
</object>
- <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="interfaceOrientation">3</int>
</object>
@@ -417,26 +518,53 @@
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
- <reference key="source" ref="565214171"/>
+ <reference key="source" ref="394383001"/>
<reference key="destination" ref="372490531"/>
</object>
- <int key="connectionID">26</int>
+ <int key="connectionID">67</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
- <reference key="source" ref="565214171"/>
+ <reference key="source" ref="394383001"/>
<reference key="destination" ref="372490531"/>
</object>
- <int key="connectionID">27</int>
+ <int key="connectionID">68</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">tableView</string>
<reference key="source" ref="372490531"/>
- <reference key="destination" ref="565214171"/>
+ <reference key="destination" ref="394383001"/>
+ </object>
+ <int key="connectionID">69</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="403581306"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
</object>
- <int key="connectionID">32</int>
+ <int key="connectionID">73</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="550636851"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">74</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="1065439841"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">77</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -453,21 +581,26 @@
<reference key="object" ref="191373211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="326163764"/>
- <reference ref="88728219"/>
- <reference ref="867832822"/>
- <reference ref="438802257"/>
<reference ref="553937568"/>
<reference ref="68378447"/>
- <reference ref="967260168"/>
+ <reference ref="420136851"/>
+ <reference ref="438802257"/>
+ <reference ref="867832822"/>
+ <reference ref="246022224"/>
+ <reference ref="88728219"/>
+ <reference ref="326163764"/>
+ <reference ref="394383001"/>
+ <reference ref="550636851"/>
+ <reference ref="403581306"/>
+ <reference ref="1065439841"/>
<reference ref="920829014"/>
- <reference ref="12554882"/>
- <reference ref="565214171"/>
- <reference ref="420136851"/>
- <reference ref="697924047"/>
- <reference ref="634417433"/>
+ <reference ref="967260168"/>
<reference ref="743202682"/>
<reference ref="938256702"/>
+ <reference ref="634417433"/>
+ <reference ref="742028380"/>
+ <reference ref="696928530"/>
+ <reference ref="848132519"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -543,19 +676,43 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="12554882"/>
+ <int key="objectID">61</int>
+ <reference key="object" ref="246022224"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">66</int>
+ <reference key="object" ref="394383001"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">70</int>
+ <reference key="object" ref="550636851"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="565214171"/>
+ <int key="objectID">72</int>
+ <reference key="object" ref="403581306"/>
<reference key="parent" ref="191373211"/>
- <string key="objectName">Table View (Themes)</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">75</int>
+ <reference key="object" ref="1065439841"/>
+ <reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">59</int>
- <reference key="object" ref="697924047"/>
+ <int key="objectID">78</int>
+ <reference key="object" ref="848132519"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">79</int>
+ <reference key="object" ref="742028380"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">80</int>
+ <reference key="object" ref="696928530"/>
<reference key="parent" ref="191373211"/>
</object>
</object>
@@ -570,7 +727,6 @@
<string>1.IBPluginDependency</string>
<string>11.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
- <string>25.IBPluginDependency</string>
<string>39.IBPluginDependency</string>
<string>50.IBPluginDependency</string>
<string>51.IBPluginDependency</string>
@@ -578,17 +734,28 @@
<string>54.IBPluginDependency</string>
<string>55.IBPluginDependency</string>
<string>57.IBPluginDependency</string>
- <string>58.IBPluginDependency</string>
- <string>59.IBPluginDependency</string>
+ <string>61.IBPluginDependency</string>
+ <string>66.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
+ <string>70.IBPluginDependency</string>
+ <string>72.IBPluginDependency</string>
+ <string>75.IBPluginDependency</string>
+ <string>78.IBPluginDependency</string>
+ <string>79.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
+ <string>80.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MapConfigViewController</string>
<string>UIResponder</string>
- <string>{{72, 265}, {1024, 768}}</string>
+ <string>{{82, 256}, {1024, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -623,7 +790,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">60</int>
+ <int key="maxID">80</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -635,6 +802,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
<string>segmentedControlChanged:</string>
<string>sliderChanged:</string>
<string>sliderEndedChanging:</string>
@@ -646,12 +814,14 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonPressed:</string>
<string>segmentedControlChanged:</string>
<string>sliderChanged:</string>
<string>sliderEndedChanging:</string>
@@ -660,6 +830,10 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">segmentedControlChanged:</string>
<string key="candidateClassName">id</string>
</object>
@@ -681,6 +855,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>delegate</string>
<string>maxLabel</string>
<string>previewButton</string>
<string>segmentedControl</string>
@@ -690,6 +865,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
<string>UILabel</string>
<string>UIButton</string>
<string>UISegmentedControl</string>
@@ -702,6 +878,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>delegate</string>
<string>maxLabel</string>
<string>previewButton</string>
<string>segmentedControl</string>
@@ -712,6 +889,10 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">maxLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
@@ -784,13 +965,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
</object>
</object>
@@ -798,13 +972,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSPort.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
</object>
</object>
@@ -812,13 +979,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSStream.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
</object>
</object>
@@ -840,13 +1000,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
</object>
</object>
@@ -1020,7 +1173,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="800" key="NS.object.0"/>
+ <integer value="1024" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -1033,16 +1186,20 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>background-lobby.png</string>
+ <string>backButton.png</string>
+ <string>background.png</string>
<string>bluebox.png</string>
- <string>bricks.png</string>
+ <string>helpButton.png</string>
+ <string>startGameButton.png</string>
<string>title.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>{1024, 704}</string>
+ <string>{64, 64}</string>
+ <string>{1024, 768}</string>
<string>{512, 512}</string>
- <string>{1024, 20}</string>
+ <string>{64, 64}</string>
+ <string>{142, 64}</string>
<string>{273, 151}</string>
</object>
</object>
Binary file project_files/HedgewarsMobile/Resources/checkbox.png has changed