--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Sat Jan 23 13:15:27 2010 +0000
@@ -63,7 +63,6 @@
}
-(IBAction) startSDLgame {
-
[setup startThread:@"engineProtocol"];
[setup loadSettingsFromFile:@"settings.plist" forKey:@"systemSettings"];
@@ -76,10 +75,13 @@
NSLog(@"Game is launching...");
+ NSAutoreleasePool *internal_pool = [[NSAutoreleasePool alloc] init];
+
// direct execution or thread? check the one that gives most fps
// library or call SDL_main? pascal quits at the end of the main
Game();
-
+
+ [internal_pool drain];
NSLog(@"Game is exting...");
[[window viewWithTag:54867] removeFromSuperview];
--- a/cocoaTouch/SDLOverrides/SDL_uikitview.m Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitview.m Sat Jan 23 13:15:27 2010 +0000
@@ -166,7 +166,7 @@
// one tap - single click
if (1 == [touch tapCount] ) {
- SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].windowID, gestureStartPoint.x, gestureStartPoint.y);
+ //SDL_WarpMouseInWindow([SDLUIKitDelegate sharedAppDelegate].windowID, gestureStartPoint.x, gestureStartPoint.y);
HW_click();
}
@@ -230,14 +230,14 @@
CGFloat Xdiff = gestureStartPoint.x - currentPosition.x;
CGFloat Ydiff = gestureStartPoint.y - currentPosition.y;
CGFloat deltaX = fabsf(Xdiff);
- CGFloat deltaY = fabsf(Ydiff);
+ CGFloat deltaY = fabsf(Ydiff);
if (deltaX >= kMinimumGestureLength && deltaY <= kMaximumVariance) {
NSLog(@"Horizontal swipe detected, begX:%f curX:%f", gestureStartPoint.x, currentPosition.x);
if (Xdiff > 0) HW_walkLeft();
else HW_walkRight();
- }
- else if (deltaY >= kMinimumGestureLength && deltaX <= kMaximumVariance){
+ }
+ else if (deltaY >= kMinimumGestureLength && deltaX <= kMaximumVariance){
NSLog(@"Vertical swipe detected, begY:%f curY:%f", gestureStartPoint.y, currentPosition.y);
if (Ydiff > 0) HW_aimUp();
else HW_aimDown();
@@ -249,7 +249,7 @@
UITouch *first = [twoTouches objectAtIndex:0];
UITouch *second = [twoTouches objectAtIndex:1];
CGFloat currentDistance = distanceBetweenPoints([first locationInView:self], [second locationInView:self]);
-
+
if (0 == initialDistance)
initialDistance = currentDistance;
else if (currentDistance - initialDistance > kMinimumPinchDelta) {
--- a/cocoaTouch/SchemeEditViewController.h Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SchemeEditViewController.h Sat Jan 23 13:15:27 2010 +0000
@@ -9,8 +9,11 @@
#import <UIKit/UIKit.h>
-@interface SchemeEditViewController : UIViewController {
-
+@interface SchemeEditViewController : UIViewController <UITableViewDelegate, UITableViewDataSource> {
+ UITableViewCell *cell0;
+ UITableView *table;
}
+@property (nonatomic, retain) IBOutlet UITableViewCell *cell0;
+@property (nonatomic, retain) IBOutlet UITableView *table;
@end
--- a/cocoaTouch/SchemeEditViewController.m Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SchemeEditViewController.m Sat Jan 23 13:15:27 2010 +0000
@@ -10,7 +10,7 @@
@implementation SchemeEditViewController
-
+@synthesize cell0, table;
/*
// The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
@@ -21,12 +21,12 @@
}
*/
-/*
// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
- (void)viewDidLoad {
+ table.backgroundColor = [UIColor clearColor];
[super viewDidLoad];
}
-*/
+
/*
// Override to allow orientations other than the default portrait orientation.
@@ -52,6 +52,23 @@
- (void)dealloc {
[super dealloc];
}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+
+
+
+ return cell0;
+
+
+}
+-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView{
+ return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+ return 1;
+}
+
@end
--- a/cocoaTouch/SchemeEditViewController.xib Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SchemeEditViewController.xib Sat Jan 23 13:15:27 2010 +0000
@@ -2,17 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">784</int>
- <string key="IBDocument.SystemVersion">10A394</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1027.1</string>
- <string key="IBDocument.HIToolboxVersion">430.00</string>
+ <string key="IBDocument.SystemVersion">10C540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.AppKitVersion">1038.25</string>
+ <string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">60</string>
+ <string key="NS.object.0">62</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
+ <integer value="16"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -35,10 +35,105 @@
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
</object>
- <object class="IBUIView" id="191373211">
+ <object class="IBUIView" id="774267795">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
- <string key="NSFrameSize">{320, 460}</string>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUITableViewCell" id="1022610692">
+ <reference key="NSNextResponder" ref="774267795"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIView" id="661185827">
+ <reference key="NSNextResponder" ref="1022610692"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISwitch" id="590075064">
+ <reference key="NSNextResponder" ref="661185827"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{206, 8}, {94, 27}}</string>
+ <reference key="NSSuperview" ref="661185827"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <bool key="IBUIOn">YES</bool>
+ </object>
+ <object class="IBUILabel" id="56472929">
+ <reference key="NSNextResponder" ref="661185827"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 11}, {42, 21}}</string>
+ <reference key="NSSuperview" ref="661185827"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <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, 43}</string>
+ <reference key="NSSuperview" ref="1022610692"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ </object>
+ </object>
+ <string key="NSFrame">{{0, 208}, {320, 44}}</string>
+ <reference key="NSSuperview" ref="774267795"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUISeparatorStyle">1</int>
+ <reference key="IBUIContentView" ref="661185827"/>
+ </object>
+ <object class="IBUIImageView" id="368425340">
+ <reference key="NSNextResponder" ref="774267795"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{0, -6}, {320, 443}}</string>
+ <reference key="NSSuperview" ref="774267795"/>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">Background.png</string>
+ </object>
+ </object>
+ <object class="IBUITableView" id="543517138">
+ <reference key="NSNextResponder" ref="774267795"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{320, 431}</string>
+ <reference key="NSSuperview" ref="774267795"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIBouncesZoom">NO</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">1</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 431}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@@ -47,7 +142,8 @@
<int key="NSID">2</int>
</object>
</object>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -55,11 +151,43 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">cell0</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="1022610692"/>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
+ <reference key="destination" ref="774267795"/>
+ </object>
+ <int key="connectionID">14</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="543517138"/>
+ <reference key="destination" ref="372490531"/>
</object>
- <int key="connectionID">3</int>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="543517138"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">18</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">table</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="543517138"/>
+ </object>
+ <int key="connectionID">19</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -72,11 +200,6 @@
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="0"/>
@@ -87,6 +210,47 @@
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">13</int>
+ <reference key="object" ref="774267795"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1022610692"/>
+ <reference ref="368425340"/>
+ <reference ref="543517138"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="1022610692"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="56472929"/>
+ <reference ref="590075064"/>
+ </object>
+ <reference key="parent" ref="774267795"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="56472929"/>
+ <reference key="parent" ref="1022610692"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="590075064"/>
+ <reference key="parent" ref="1022610692"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">15</int>
+ <reference key="object" ref="368425340"/>
+ <reference key="parent" ref="774267795"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">16</int>
+ <reference key="object" ref="543517138"/>
+ <reference key="parent" ref="774267795"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -95,14 +259,28 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
- <string>1.IBEditorWindowLastContentRect</string>
- <string>1.IBPluginDependency</string>
+ <string>10.IBPluginDependency</string>
+ <string>13.IBEditorWindowLastContentRect</string>
+ <string>13.IBPluginDependency</string>
+ <string>15.IBPluginDependency</string>
+ <string>16.IBEditorWindowLastContentRect</string>
+ <string>16.IBPluginDependency</string>
+ <string>7.IBEditorWindowLastContentRect</string>
+ <string>7.IBPluginDependency</string>
+ <string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>SchemeEditViewController</string>
<string>UIResponder</string>
- <string>{{556, 412}, {320, 480}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{465, 427}, {320, 480}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{528, 253}, {320, 431}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{685, 423}, {320, 44}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
@@ -122,7 +300,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">3</int>
+ <int key="maxID">19</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -130,20 +308,287 @@
<object class="IBPartialClassDescription">
<string key="className">SchemeEditViewController</string>
<string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cell0</string>
+ <string>table</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UITableViewCell</string>
+ <string>UITableView</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">SchemeEditViewController.h</string>
+ <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SchemeEditViewController.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/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>
+ <object class="IBPartialClassDescription">
+ <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>
+ <object class="IBPartialClassDescription">
+ <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>
+ <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">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>
+ <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="106704389">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.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="106704389"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </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">UISwitch</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISwitch.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableViewCell</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableViewCell.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/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>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="784" key="NS.object.0"/>
+ </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <nil key="IBDocument.LastKnownRelativeProjectPath"/>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../../../Documents/xcode/hwengine/hwengine.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">3.1</string>
</data>
--- a/cocoaTouch/SettingsViewController.h Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SettingsViewController.h Sat Jan 23 13:15:27 2010 +0000
@@ -9,22 +9,26 @@
#import <UIKit/UIKit.h>
-@interface SettingsViewController : UIViewController {
+@interface SettingsViewController : UIViewController <UITableViewDelegate, UITableViewDataSource> {
UITextField *username;
UITextField *password;
- UISwitch *musicOn;
- UISwitch *effectsOn;
- UISwitch *altDamageOn;
+ UISwitch *musicSwitch;
+ UISwitch *effectsSwitch;
+ UISwitch *altDamageSwitch;
UISlider *volumeSlider;
UILabel *volumeLabel;
+ UITableView *table;
+ UITableViewCell *volumeCell;
}
@property (nonatomic, retain) IBOutlet UITextField *username;
@property (nonatomic, retain) IBOutlet UITextField *password;
-@property (nonatomic, retain) IBOutlet UISwitch *musicOn;
-@property (nonatomic, retain) IBOutlet UISwitch *effectsOn;
-@property (nonatomic, retain) IBOutlet UISwitch *altDamageOn;
+@property (nonatomic, retain) UISwitch *musicSwitch;
+@property (nonatomic, retain) UISwitch *effectsSwitch;
+@property (nonatomic, retain) UISwitch *altDamageSwitch;
@property (nonatomic, retain) IBOutlet UISlider *volumeSlider;
@property (nonatomic, retain) IBOutlet UILabel *volumeLabel;
+@property (nonatomic, retain) IBOutlet UITableView *table;
+@property (nonatomic, retain) IBOutlet UITableViewCell *volumeCell;
-(IBAction) sliderChanged: (id)sender;
-(IBAction) backgroundTap: (id)sender;
--- a/cocoaTouch/SettingsViewController.m Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SettingsViewController.m Sat Jan 23 13:15:27 2010 +0000
@@ -11,76 +11,86 @@
@implementation SettingsViewController
-@synthesize username, password, musicOn, effectsOn, altDamageOn, volumeSlider, volumeLabel;
+@synthesize username, password, musicSwitch, effectsSwitch, altDamageSwitch, volumeSlider, volumeLabel, table, volumeCell;
+
+
+-(void) loadView {
+ self.musicSwitch = [[UISwitch alloc] init];
+ self.effectsSwitch = [[UISwitch alloc] init];
+ self.altDamageSwitch = [[UISwitch alloc] init];
+ [super loadView];
+}
-(void) viewDidLoad {
NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"];
if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
- NSUserDefaults *data = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath];
+ NSMutableDictionary *data = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath];
username.text = [data objectForKey:@"username"];
password.text = [data objectForKey:@"password"];
if (1 == [[data objectForKey:@"music"] intValue]) {
- musicOn.on = YES;
+ musicSwitch.on = YES;
} else {
- musicOn.on = NO;
+ musicSwitch.on = NO;
}
if (1 == [[data objectForKey:@"effects"] intValue]) {
- effectsOn.on = YES;
+ effectsSwitch.on = YES;
} else {
- effectsOn.on = NO;
+ effectsSwitch.on = NO;
}
if (1 == [[data objectForKey:@"alternate"] intValue]) {
- altDamageOn.on = YES;
+ altDamageSwitch.on = YES;
} else {
- altDamageOn.on = NO;
+ altDamageSwitch.on = NO;
}
[volumeSlider setValue:[[data objectForKey:@"volume"] intValue] animated:NO];
-
- NSString *tmpVol = [[NSString alloc] initWithFormat:@"%d", (int) volumeSlider.value];
- volumeLabel.text = tmpVol;
- [tmpVol release];
+ [data release];
} else {
[NSException raise:@"File NOT found" format:@"The file settings.plist was not found at %@", filePath];
}
-/*
- UIApplication *app = [UIApplication sharedApplication];
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(applicationWillTerminate:)
- name:UIApplicationWillTerminateNotification
- object:app];
-*/
+
+ NSString *tmpVol = [[NSString alloc] initWithFormat:@"%d", (int) volumeSlider.value];
+ volumeLabel.text = tmpVol;
+ [tmpVol release];
+
+ username.textColor = [UIColor grayColor];
+ password.textColor = [UIColor grayColor];
+ volumeLabel.textColor = [UIColor grayColor];
+ table.backgroundColor = [UIColor clearColor];
+ table.allowsSelection = NO;
[super viewDidLoad];
}
-(void) viewDidUnload {
self.username = nil;
self.password = nil;
- self.musicOn = nil;
- self.effectsOn = nil;
- self.altDamageOn = nil;
+ self.musicSwitch = nil;
+ self.effectsSwitch = nil;
+ self.altDamageSwitch = nil;
self.volumeLabel = nil;
self.volumeSlider = nil;
+ self.table = nil;
+ self.volumeCell = nil;
[super viewDidUnload];
}
//- (void)applicationWillTerminate:(NSNotification *)notification {
-(void) viewWillDisappear:(BOOL)animated {
- NSMutableDictionary *saveArray = [[NSMutableDictionary alloc] init];
- NSString *tmpMus = (musicOn.on) ? @"1" : @"0";
- NSString *tmpEff = (effectsOn.on) ? @"1" : @"0";
- NSString *tmpAlt = (altDamageOn.on) ? @"1" : @"0";
+ NSMutableDictionary *saveDict = [[NSMutableDictionary alloc] init];
+ NSString *tmpMus = (musicSwitch.on) ? @"1" : @"0";
+ NSString *tmpEff = (effectsSwitch.on) ? @"1" : @"0";
+ NSString *tmpAlt = (altDamageSwitch.on) ? @"1" : @"0";
- [saveArray setObject:username.text forKey:@"username"];
- [saveArray setObject:password.text forKey:@"password"];
- [saveArray setObject:tmpMus forKey:@"music"];
- [saveArray setObject:tmpEff forKey:@"effects"];
- [saveArray setObject:tmpAlt forKey:@"alternate"];
- [saveArray setObject:volumeLabel.text forKey:@"volume"];
+ [saveDict setObject:username.text forKey:@"username"];
+ [saveDict setObject:password.text forKey:@"password"];
+ [saveDict setObject:tmpMus forKey:@"music"];
+ [saveDict setObject:tmpEff forKey:@"effects"];
+ [saveDict setObject:tmpAlt forKey:@"alternate"];
+ [saveDict setObject:volumeLabel.text forKey:@"volume"];
- [saveArray writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES];
- [saveArray release];
+ [saveDict writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES];
+ [saveDict release];
[super viewWillDisappear:animated];
}
@@ -114,12 +124,139 @@
-(void) dealloc {
[username release];
[password release];
- [musicOn release];
- [effectsOn release];
- [altDamageOn release];
+ [musicSwitch release];
+ [effectsSwitch release];
+ [altDamageSwitch release];
[volumeLabel release];
[volumeSlider release];
- [super dealloc];
+ [table release];
+ [volumeCell release];
+ [super dealloc];
+}
+
+#pragma mark -
+#pragma mark TableView Methods
+#define kNetworkFields 0
+#define kAudioFields 1
+#define kOtherFields 2
+
+-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+ return 3;
+}
+
+-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ switch (section) {
+ case kNetworkFields:
+ return 2;
+ break;
+ case kAudioFields:
+ return 3;
+ break;
+ case kOtherFields:
+ return 1;
+ break;
+ default:
+ NSLog(@"Warning: unset case value for numberOfRowsInSection!");
+ break;
+ }
+ return 0;
+}
+
+-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString *cellIdentifier = @"systemSettingsCell";
+
+ UITableViewCell *cell;
+ if ( !(kAudioFields == [indexPath section] && 2 == [indexPath row]) ){
+ cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier];
+ if (nil == cell) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+ reuseIdentifier:cellIdentifier] autorelease];
+ }
+ }
+
+ switch ([indexPath section]) {
+ case kNetworkFields:
+ switch ([indexPath row]) {
+ case 0:
+ cell.textLabel.text = NSLocalizedString(@"Nickname", @"");
+ cell.accessoryView = username;
+ break;
+ case 1:
+ cell.textLabel.text = NSLocalizedString(@"Password", @"");
+ cell.accessoryView = password;
+ break;
+ default:
+ NSLog(@"Warning: unset case value in kNetworkFields section!");
+ break;
+ }
+ break;
+ case kAudioFields:
+ switch ([indexPath row]) {
+ case 0:
+ cell.accessoryView = musicSwitch;
+ cell.textLabel.text = NSLocalizedString(@"Music", @"");
+ break;
+ case 1:
+ cell.accessoryView = effectsSwitch;
+ cell.textLabel.text = NSLocalizedString(@"Sound Effects", @"");
+ break;
+ case 2:
+ cell = volumeCell;
+ break;
+ default:
+ NSLog(@"Warning: unset case value in kAudioFields section!");
+ break;
+ }
+ break;
+ case kOtherFields:
+ cell.accessoryView = altDamageSwitch;
+ cell.textLabel.text = NSLocalizedString(@"Alternate Damage", @"");
+ break;
+ default:
+ break;
+ }
+
+ return cell;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+ UIView *containerView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)] autorelease];
+ UILabel *headerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(10, 20, 300, 40)] autorelease];
+ headerLabel.textColor = [UIColor lightGrayColor];
+ headerLabel.shadowColor = [UIColor blackColor];
+ headerLabel.shadowOffset = CGSizeMake(0, 1);
+ headerLabel.font = [UIFont boldSystemFontOfSize:20];
+ headerLabel.backgroundColor = [UIColor clearColor];
+
+ switch (section) {
+ case kNetworkFields:
+ headerLabel.text = NSLocalizedString(@"Network Configuration", @"");
+ break;
+ case kAudioFields:
+ headerLabel.text = NSLocalizedString(@"Audio Preferences", @"");
+ break;
+ case kOtherFields:
+ headerLabel.text = NSLocalizedString(@"Other Settings", @"");
+ break;
+ default:
+ NSLog(@"Warning: unset case value in titleForHeaderInSection!");
+ headerLabel.text = @"!!!";
+ break;
+ }
+
+ [containerView addSubview:headerLabel];
+ return containerView;
+}
+
+-(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if (kAudioFields == [indexPath section] && 2 == [indexPath row])
+ return volumeCell.frame.size.height;
+ else
+ return table.rowHeight;
+}
+
+-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+ return 57;
}
--- a/cocoaTouch/SettingsViewController.xib Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SettingsViewController.xib Sat Jan 23 13:15:27 2010 +0000
@@ -12,6 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="37"/>
<integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -56,22 +57,23 @@
<object class="IBUITextField" id="52230916">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{130, 135}, {152, 31}}</string>
+ <string key="NSFrame">{{100, 18}, {200, 31}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUIContentVerticalAlignment">0</int>
<string key="IBUIText"/>
- <int key="IBUIBorderStyle">3</int>
<string key="IBUIPlaceholder">username</string>
<object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace" id="6220105">
- <int key="NSID">2</int>
- </object>
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC40MDAwMDAwMDYgMC40MDAwMDAwMDYgMQA</bytes>
</object>
- <bool key="IBUIClearsOnBeginEditing">YES</bool>
+ <object class="NSFont" key="IBUIFont" id="788314749">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <int key="IBUITextAlignment">2</int>
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
<float key="IBUIMinimumFontSize">17</float>
<object class="IBUITextInputTraits" key="IBUITextInputTraits">
@@ -82,19 +84,22 @@
<object class="IBUITextField" id="809344278">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{130, 174}, {152, 31}}</string>
+ <string key="NSFrame">{{100, 50}, {200, 31}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUIContentVerticalAlignment">0</int>
<string key="IBUIText"/>
- <int key="IBUIBorderStyle">3</int>
<string key="IBUIPlaceholder">network password (if any)</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
- <reference key="NSCustomColorSpace" ref="6220105"/>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
</object>
+ <reference key="IBUIFont" ref="788314749"/>
+ <int key="IBUITextAlignment">2</int>
<bool key="IBUIClearsOnBeginEditing">YES</bool>
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
<float key="IBUIMinimumFontSize">17</float>
@@ -104,72 +109,23 @@
<bool key="IBUISecureTextEntry">YES</bool>
</object>
</object>
- <object class="IBUISlider" id="1157528">
+ <object class="IBUITableView" id="179734732">
<reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{38, 373}, {243, 23}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <float key="IBUIValue">100</float>
- <float key="IBUIMaxValue">100</float>
- <bool key="IBUIContinuous">NO</bool>
- </object>
- <object class="IBUISwitch" id="846182137">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{188, 224}, {94, 27}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <bool key="IBUIOn">YES</bool>
- </object>
- <object class="IBUISwitch" id="101121478">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{188, 279}, {94, 27}}</string>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{0, 98}, {320, 333}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <bool key="IBUIOn">YES</bool>
- </object>
- <object class="IBUILabel" id="939351608">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{56, 316}, {42, 21}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="IBUIText"/>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUISwitch" id="140511032">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{188, 330}, {94, 27}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <bool key="IBUIOn">YES</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
+ <bool key="IBUICanCancelContentTouches">NO</bool>
+ <bool key="IBUIBouncesZoom">NO</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">1</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
</object>
</object>
<string key="NSFrameSize">{320, 431}</string>
@@ -180,6 +136,93 @@
</object>
<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
</object>
+ <object class="IBUITableViewCell" id="45589474">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIView" id="1008690992">
+ <reference key="NSNextResponder" ref="45589474"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISlider" id="1157528">
+ <reference key="NSNextResponder" ref="1008690992"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{10, 37}, {284, 23}}</string>
+ <reference key="NSSuperview" ref="1008690992"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <float key="IBUIValue">100</float>
+ <float key="IBUIMaxValue">100</float>
+ <bool key="IBUIContinuous">NO</bool>
+ </object>
+ <object class="IBUILabel" id="450734048">
+ <reference key="NSNextResponder" ref="1008690992"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{250, 8}, {42, 21}}</string>
+ <reference key="NSSuperview" ref="1008690992"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="IBUIText"/>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwLjUwMTk2MDgxNCAxAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="891605917">
+ <reference key="NSNextResponder" ref="1008690992"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{12, 8}, {62, 21}}</string>
+ <reference key="NSSuperview" ref="1008690992"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="IBUIText">Volume</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">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, 69}</string>
+ <reference key="NSSuperview" ref="45589474"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 70}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUISeparatorStyle">1</int>
+ <reference key="IBUIContentView" ref="1008690992"/>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -209,22 +252,6 @@
<int key="connectionID">14</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">musicOn</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="846182137"/>
- </object>
- <int key="connectionID">15</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">effectsOn</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="101121478"/>
- </object>
- <int key="connectionID">16</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">backgroundTap:</string>
<reference key="source" ref="191373211"/>
@@ -253,14 +280,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">volumeLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="939351608"/>
- </object>
- <int key="connectionID">21</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">volumeSlider</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="1157528"/>
@@ -287,11 +306,43 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">altDamageOn</string>
+ <string key="label">dataSource</string>
+ <reference key="source" ref="179734732"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">31</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="179734732"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">32</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">table</string>
<reference key="source" ref="372490531"/>
- <reference key="destination" ref="140511032"/>
+ <reference key="destination" ref="179734732"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">volumeLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="450734048"/>
</object>
- <int key="connectionID">28</int>
+ <int key="connectionID">36</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">volumeCell</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="45589474"/>
+ </object>
+ <int key="connectionID">39</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -309,13 +360,9 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="411150667"/>
- <reference ref="52230916"/>
+ <reference ref="179734732"/>
<reference ref="809344278"/>
- <reference ref="846182137"/>
- <reference ref="101121478"/>
- <reference ref="1157528"/>
- <reference ref="939351608"/>
- <reference ref="140511032"/>
+ <reference ref="52230916"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -336,39 +383,48 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="52230916"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="809344278"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="1157528"/>
+ <int key="objectID">30</int>
+ <reference key="object" ref="179734732"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="846182137"/>
+ <int key="objectID">5</int>
+ <reference key="object" ref="52230916"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="101121478"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">37</int>
+ <reference key="object" ref="45589474"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1157528"/>
+ <reference ref="891605917"/>
+ <reference ref="450734048"/>
+ </object>
+ <reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">20</int>
- <reference key="object" ref="939351608"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">7</int>
+ <reference key="object" ref="1157528"/>
+ <reference key="parent" ref="45589474"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="140511032"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">35</int>
+ <reference key="object" ref="450734048"/>
+ <reference key="parent" ref="45589474"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">38</int>
+ <reference key="object" ref="891605917"/>
+ <reference key="parent" ref="45589474"/>
</object>
</object>
</object>
@@ -381,14 +437,15 @@
<string>1.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
- <string>20.IBPluginDependency</string>
- <string>27.IBPluginDependency</string>
+ <string>30.IBPluginDependency</string>
+ <string>35.IBPluginDependency</string>
+ <string>37.IBEditorWindowLastContentRect</string>
+ <string>37.IBPluginDependency</string>
+ <string>38.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
- <string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -399,6 +456,7 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{564, 553}, {320, 70}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -423,7 +481,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">28</int>
+ <int key="maxID">40</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -450,21 +508,19 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>altDamageOn</string>
- <string>effectsOn</string>
- <string>musicOn</string>
<string>password</string>
+ <string>table</string>
<string>username</string>
+ <string>volumeCell</string>
<string>volumeLabel</string>
<string>volumeSlider</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>UISwitch</string>
- <string>UISwitch</string>
- <string>UISwitch</string>
<string>UITextField</string>
+ <string>UITableView</string>
<string>UITextField</string>
+ <string>UITableViewCell</string>
<string>UILabel</string>
<string>UISlider</string>
</object>
@@ -640,6 +696,14 @@
<reference key="sourceIdentifier" ref="311037604"/>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UISearchBar</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -664,11 +728,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UISwitch</string>
- <string key="superclassName">UIControl</string>
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISwitch.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableViewCell</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableViewCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
--- a/hedgewars/SDLh.pas Wed Jan 20 14:31:45 2010 +0000
+++ b/hedgewars/SDLh.pas Sat Jan 23 13:15:27 2010 +0000
@@ -739,7 +739,9 @@
procedure IMG_Quit; cdecl; external SDL_ImageLibName;
function IMG_Load(const _file: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName;
+function IMG_Load_RW(rwop: PSDL_RWops; freesrc: LongInt): PSDL_Surface; cdecl; external SDL_ImageLibName;
function IMG_LoadPNG_RW(rwop: PSDL_RWops): PSDL_Surface; cdecl; external SDL_ImageLibName;
+function IMG_LoadTyped_RW(rwop: PSDL_RWops; freesrc: LongInt; _type: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName;
(* SDL_net *)
function SDLNet_Init: LongInt; cdecl; external SDL_NetLibName;
--- a/hedgewars/uStore.pas Wed Jan 20 14:31:45 2010 +0000
+++ b/hedgewars/uStore.pas Sat Jan 23 13:15:27 2010 +0000
@@ -1108,7 +1108,7 @@
vendor:= LowerCase(string(pchar(glGetString(GL_VENDOR))));
{$IFDEF DEBUGFILE}
- AddFileLog('OpenGL - Renderer: ' + string(pchar(glGetString(GL_RENDERER))));
+ AddFileLog('OpenGL-- Renderer: ' + string(pchar(glGetString(GL_RENDERER))));
AddFileLog(' |----- Vendor: ' + vendor);
AddFileLog(' |----- Version: ' + string(pchar(glGetString(GL_VERSION))));
AddFileLog(' \----- GL_MAX_TEXTURE_SIZE: ' + inttostr(MaxTextureSize));