--- a/cocoaTouch/GameSetup.m Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/GameSetup.m Wed Feb 03 23:36:42 2010 +0000
@@ -247,7 +247,7 @@
#pragma mark -
#pragma mark Setting methods
-(const char **)getSettings {
- const char **gameArgs = (const char**) malloc(sizeof(char*) * 7);
+ const char **gameArgs = (const char**) malloc(sizeof(char*) * 6);
NSString *ipcString = [[NSString alloc] initWithFormat:@"%d", ipcPort];
NSString *localeString = [[NSString alloc] initWithFormat:@"%@.txt", [[NSLocale currentLocale] localeIdentifier]];
@@ -256,8 +256,7 @@
gameArgs[2] = [[systemSettings objectForKey:@"sounds"] UTF8String]; //isSoundEnabled
gameArgs[3] = [[systemSettings objectForKey:@"music"] UTF8String]; //isMusicEnabled
gameArgs[4] = [localeString UTF8String]; //cLocaleFName
- gameArgs[5] = [[systemSettings objectForKey:@"volume"] UTF8String]; //cInitVolume
- gameArgs[6] = [[systemSettings objectForKey:@"alternate"] UTF8String]; //cAltDamage
+ gameArgs[5] = [[systemSettings objectForKey:@"alternate"] UTF8String]; //cAltDamage
[localeString release];
[ipcString release];
--- a/cocoaTouch/MainMenuViewController.h Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.h Wed Feb 03 23:36:42 2010 +0000
@@ -11,10 +11,12 @@
@interface MainMenuViewController : UIViewController {
UILabel *versionLabel;
+ UIView *mainView;
SettingsViewController *settingsViewController;
}
@property (nonatomic, retain) IBOutlet UILabel *versionLabel;
+@property (nonatomic, retain) IBOutlet UIView *mainView;
@property (nonatomic, retain) SettingsViewController *settingsViewController;
-(IBAction) startPlaying;
--- a/cocoaTouch/MainMenuViewController.m Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m Wed Feb 03 23:36:42 2010 +0000
@@ -11,7 +11,7 @@
@implementation MainMenuViewController
-@synthesize versionLabel, settingsViewController;
+@synthesize versionLabel, settingsViewController, mainView;
/*
// The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
@@ -58,13 +58,13 @@
// disable the buttons when to prevent launching twice the game
-(void) viewWillDisappear:(BOOL)animated {
- self.view.userInteractionEnabled = NO;
+ self.mainView.userInteractionEnabled = NO;
[super viewWillDisappear:animated];
}
--(void) viewWillAppear:(BOOL)animated {
- self.view.userInteractionEnabled = YES;
- [super viewWillAppear:animated];
+-(void) viewDidAppear:(BOOL)animated {
+ self.mainView.userInteractionEnabled = YES;
+ [super viewDidAppear:animated];
}
#pragma mark -
@@ -92,16 +92,17 @@
SettingsViewController *controller = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController"
bundle:nil];
self.settingsViewController = controller;
+ self.settingsViewController.parentView = self.mainView;
[controller release];
}
- self.settingsViewController.view.frame = CGRectMake(0, -480, 480, 320);
+ self.settingsViewController.view.frame = CGRectMake(0, -320, 480, 320);
[UIView beginAnimations:@"View Switch" context:NULL];
[UIView setAnimationDuration:3];
[UIView setAnimationDuration:UIViewAnimationCurveEaseOut];
self.settingsViewController.view.frame = CGRectMake(0, 0, 480, 320);
+ self.mainView.frame = CGRectMake(0, 320, 480, 320);
- // we have the new controller, let's switch
[self.view addSubview:settingsViewController.view];
[UIView commitAnimations];
}
--- a/cocoaTouch/MainMenuViewController.xib Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.xib Wed Feb 03 23:36:42 2010 +0000
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
+ <integer value="21"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -40,168 +40,182 @@
<int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIImageView" id="478425539">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
- </object>
- <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="IBUIImageView" id="91331182">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 20}, {240, 94}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <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">title.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="685977989">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{240, 145}, {220, 52}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont" id="917635782">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor" id="112471976">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">playButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="1049354127">
+ <object class="IBUIView" id="167221315">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{240, 241}, {220, 52}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">networkButton.png</string>
- </object>
- </object>
- <object class="IBUIButton" id="995155642">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{28, 194}, {220, 52}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor" id="111038951">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="249993817">
+ <reference key="NSNextResponder" ref="167221315"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview" ref="167221315"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <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="IBUIImageView" id="171108356">
+ <reference key="NSNextResponder" ref="167221315"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 20}, {240, 94}}</string>
+ <reference key="NSSuperview" ref="167221315"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <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">title.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="124270424">
+ <reference key="NSNextResponder" ref="167221315"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{234, 140}, {220, 52}}</string>
+ <reference key="NSSuperview" ref="167221315"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont" id="917635782">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor" id="112471976">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">playButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="745970938">
+ <reference key="NSNextResponder" ref="167221315"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{234, 240}, {220, 52}}</string>
+ <reference key="NSSuperview" ref="167221315"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">networkButton.png</string>
+ </object>
+ </object>
+ <object class="IBUIButton" id="836337039">
+ <reference key="NSNextResponder" ref="167221315"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{40, 195}, {220, 52}}</string>
+ <reference key="NSSuperview" ref="167221315"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor" id="111038951">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="111038951"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">storeButton.png</string>
+ </object>
+ </object>
+ <object class="IBUILabel" id="533529472">
+ <reference key="NSNextResponder" ref="167221315"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 133}, {145, 21}}</string>
+ <reference key="NSSuperview" ref="167221315"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="IBUIText"/>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Oblique</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">MSAxIDEAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUIButton" id="753723574">
+ <reference key="NSNextResponder" ref="167221315"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{335, 66}, {59, 52}}</string>
+ <reference key="NSSuperview" ref="167221315"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="917635782"/>
+ <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">settingsButton.png</string>
+ </object>
+ </object>
</object>
- <reference key="IBUINormalTitleShadowColor" ref="111038951"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">storeButton.png</string>
- </object>
- </object>
- <object class="IBUILabel" id="168836711">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{268, 26}, {199, 21}}</string>
+ <string key="NSFrameSize">{480, 320}</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="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
- <double key="NSSize">17</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
+ <object class="NSColor" key="IBUIBackgroundColor" id="186611269">
<int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">2</int>
- </object>
- <object class="IBUIButton" id="295111341">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{352, 55}, {59, 52}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- <object class="NSCustomResource" key="IBUINormalImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">settingsButton.png</string>
- </object>
</object>
</object>
<string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview"/>
- <reference key="IBUIBackgroundColor" ref="918890028"/>
+ <reference key="IBUIBackgroundColor" ref="186611269"/>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -217,47 +231,47 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">startPlaying</string>
- <reference key="source" ref="685977989"/>
+ <string key="label">notYetImplemented</string>
+ <reference key="source" ref="745970938"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
- <int key="connectionID">12</int>
+ <int key="connectionID">29</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">notYetImplemented</string>
- <reference key="source" ref="1049354127"/>
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="753723574"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
- <int key="connectionID">15</int>
+ <int key="connectionID">30</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">notYetImplemented</string>
- <reference key="source" ref="995155642"/>
+ <reference key="source" ref="836337039"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
- <int key="connectionID">16</int>
+ <int key="connectionID">31</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">startPlaying</string>
+ <reference key="source" ref="124270424"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">32</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">versionLabel</string>
+ <string key="label">mainView</string>
<reference key="source" ref="372490531"/>
- <reference key="destination" ref="168836711"/>
+ <reference key="destination" ref="167221315"/>
</object>
- <int key="connectionID">17</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
- <reference key="source" ref="295111341"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">20</int>
+ <int key="connectionID">33</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -274,13 +288,7 @@
<reference key="object" ref="191373211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="478425539"/>
- <reference ref="1049354127"/>
- <reference ref="995155642"/>
- <reference ref="91331182"/>
- <reference ref="685977989"/>
- <reference ref="168836711"/>
- <reference ref="295111341"/>
+ <reference ref="167221315"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -296,39 +304,54 @@
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object" ref="478425539"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="685977989"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="1049354127"/>
+ <int key="objectID">21</int>
+ <reference key="object" ref="167221315"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="249993817"/>
+ <reference ref="745970938"/>
+ <reference ref="171108356"/>
+ <reference ref="836337039"/>
+ <reference ref="124270424"/>
+ <reference ref="753723574"/>
+ <reference ref="533529472"/>
+ </object>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="995155642"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">22</int>
+ <reference key="object" ref="249993817"/>
+ <reference key="parent" ref="167221315"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="171108356"/>
+ <reference key="parent" ref="167221315"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">24</int>
+ <reference key="object" ref="124270424"/>
+ <reference key="parent" ref="167221315"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">13</int>
- <reference key="object" ref="168836711"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">25</int>
+ <reference key="object" ref="745970938"/>
+ <reference key="parent" ref="167221315"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="91331182"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">26</int>
+ <reference key="object" ref="836337039"/>
+ <reference key="parent" ref="167221315"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="295111341"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">27</int>
+ <reference key="object" ref="533529472"/>
+ <reference key="parent" ref="167221315"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">28</int>
+ <reference key="object" ref="753723574"/>
+ <reference key="parent" ref="167221315"/>
</object>
</object>
</object>
@@ -340,19 +363,21 @@
<string>-2.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
- <string>13.IBPluginDependency</string>
- <string>18.IBPluginDependency</string>
- <string>19.IBPluginDependency</string>
- <string>4.IBPluginDependency</string>
- <string>5.IBPluginDependency</string>
- <string>7.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
+ <string>21.IBPluginDependency</string>
+ <string>22.IBPluginDependency</string>
+ <string>23.IBPluginDependency</string>
+ <string>24.IBPluginDependency</string>
+ <string>25.IBPluginDependency</string>
+ <string>26.IBPluginDependency</string>
+ <string>27.IBPluginDependency</string>
+ <string>28.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MainMenuViewController</string>
<string>UIResponder</string>
- <string>{{577, 514}, {480, 320}}</string>
+ <string>{{619, 293}, {480, 320}}</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>
@@ -379,7 +404,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">20</int>
+ <int key="maxID">33</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -406,12 +431,12 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>settingsViewController</string>
+ <string>mainView</string>
<string>versionLabel</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>SettingsViewController</string>
+ <string>UIView</string>
<string>UILabel</string>
</object>
</object>
@@ -420,54 +445,6 @@
<string key="minorKey">../../../hedge.build/trunk/cocoaTouch/MainMenuViewController.h</string>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">SettingsViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>backgroundTap:</string>
- <string>deleteData:</string>
- <string>sliderChanged:</string>
- <string>textFieldDoneEditing:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonContainer</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>UIView</string>
- <string>UITextField</string>
- <string>UITableView</string>
- <string>UITextField</string>
- <string>UITableViewCell</string>
- <string>UILabel</string>
- <string>UISlider</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SettingsViewController.h</string>
- </object>
- </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -642,14 +619,6 @@
<reference key="sourceIdentifier" ref="238583711"/>
</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">
@@ -666,43 +635,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UISlider</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITableView</string>
- <string key="superclassName">UIScrollView</string>
+ <string key="className">UIView</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">UITextField</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="533623865">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIView</string>
- <reference key="sourceIdentifier" ref="533623865"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
<string key="superclassName">UIResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Feb 03 23:36:42 2010 +0000
@@ -80,7 +80,7 @@
// remove the current view to free resources
[UIView beginAnimations:@"removing main controller" context:NULL];
[UIView setAnimationDuration:1];
- self.viewController.view.alpha = 0;
+ self.viewController.mainView.alpha = 0;
[UIView commitAnimations];
NSLog(@"Game is launching...");
@@ -100,7 +100,7 @@
[UIView beginAnimations:@"inserting main controller" context:NULL];
[UIView setAnimationDuration:1];
- self.viewController.view.alpha = 1;
+ self.viewController.mainView.alpha = 1;
[UIView commitAnimations];
[internal_pool release];
@@ -122,7 +122,6 @@
[saveDict setObject:@"1" forKey:@"music"];
[saveDict setObject:@"1" forKey:@"sounds"];
[saveDict setObject:@"0" forKey:@"alternate"];
- [saveDict setObject:@"100" forKey:@"volume"];
[saveDict writeToFile:filePath atomically:YES];
[saveDict release];
--- a/cocoaTouch/SettingsViewController.h Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/SettingsViewController.h Wed Feb 03 23:36:42 2010 +0000
@@ -16,11 +16,10 @@
UISwitch *musicSwitch;
UISwitch *soundsSwitch;
UISwitch *altDamageSwitch;
- UISlider *volumeSlider;
- UILabel *volumeLabel;
- UITableView *table;
+ UITableView *settingsTable;
UITableViewCell *volumeCell;
UIView *buttonContainer;
+ UIView *parentView;
BOOL needsReset;
}
@@ -29,13 +28,10 @@
@property (nonatomic, retain) UISwitch *musicSwitch;
@property (nonatomic, retain) UISwitch *soundsSwitch;
@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;
+@property (nonatomic, retain) IBOutlet UITableView *settingsTable;
@property (nonatomic, retain) IBOutlet UIView *buttonContainer;
+@property (nonatomic, retain) UIView *parentView;
--(IBAction) sliderChanged: (id)sender;
-(IBAction) backgroundTap: (id)sender;
-(IBAction) textFieldDoneEditing: (id)sender;
-(IBAction) deleteData: (id)sender;
--- a/cocoaTouch/SettingsViewController.m Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/SettingsViewController.m Wed Feb 03 23:36:42 2010 +0000
@@ -12,7 +12,7 @@
@implementation SettingsViewController
@synthesize username, password, musicSwitch, soundsSwitch, altDamageSwitch,
- volumeSlider, volumeLabel, table, volumeCell, buttonContainer;
+ settingsTable, buttonContainer, parentView;
-(void) loadView {
@@ -48,24 +48,18 @@
} else {
altDamageSwitch.on = NO;
}
-
- [volumeSlider setValue:[[data objectForKey:@"volume"] intValue] animated:NO];
[data release];
} else {
[NSException raise:@"File NOT found" format:@"The file settings.plist was not found at %@", filePath];
}
- 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;
+ settingsTable.backgroundColor = [UIColor clearColor];
+ settingsTable.allowsSelection = NO;
buttonContainer.backgroundColor = [UIColor clearColor];
- table.tableFooterView = buttonContainer;
+ settingsTable.tableFooterView = buttonContainer;
[super viewDidLoad];
}
@@ -76,10 +70,7 @@
self.musicSwitch = nil;
self.soundsSwitch = nil;
self.altDamageSwitch = nil;
- self.volumeLabel = nil;
- self.volumeSlider = nil;
- self.table = nil;
- self.volumeCell = nil;
+ self.settingsTable = nil;
self.buttonContainer = nil;
[super viewDidUnload];
}
@@ -97,7 +88,6 @@
[saveDict setObject:tmpMus forKey:@"music"];
[saveDict setObject:tmpEff forKey:@"sounds"];
[saveDict setObject:tmpAlt forKey:@"alternate"];
- [saveDict setObject:volumeLabel.text forKey:@"volume"];
[saveDict writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES];
[saveDict release];
@@ -111,10 +101,7 @@
[musicSwitch release];
[soundsSwitch release];
[altDamageSwitch release];
- [volumeLabel release];
- [volumeSlider release];
- [table release];
- [volumeCell release];
+ [settingsTable release];
[buttonContainer release];
[super dealloc];
}
@@ -137,15 +124,6 @@
[sender resignFirstResponder];
}
-// update the value of the label when slider is updated
--(IBAction) sliderChanged: (id) sender {
- UISlider *slider = (UISlider *)sender;
- int progress = slider.value;
- NSString *newLabel = [[NSString alloc] initWithFormat:@"%d",progress];
- self.volumeLabel.text = newLabel;
- [newLabel release];
-}
-
// set music off when sound is turned off
-(void) sameValueSwitch {
if (YES == self.musicSwitch.on) {
@@ -176,10 +154,12 @@
[UIView setAnimationDuration:3];
[UIView setAnimationDuration:UIViewAnimationCurveEaseOut];
- self.view.frame = CGRectMake(0, -480, 480, 320);
+ self.view.frame = CGRectMake(0, -320, 480, 320);
+ self.parentView.frame = CGRectMake(0, 0, 480, 320);
[UIView commitAnimations];
-
+
[self.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:2];
+ self.parentView = nil;
}
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
@@ -227,7 +207,7 @@
return 2;
break;
case kAudioFields:
- return 3;
+ return 2;
break;
case kOtherFields:
return 1;
@@ -277,9 +257,6 @@
cell.accessoryView = musicSwitch;
cell.textLabel.text = NSLocalizedString(@"Music", @"");
break;
- case 2:
- cell = volumeCell;
- break;
default:
NSLog(@"Warning: unset case value in kAudioFields section!");
break;
@@ -325,12 +302,14 @@
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;
--- a/cocoaTouch/SettingsViewController.xib Wed Feb 03 13:02:28 2010 +0000
+++ b/cocoaTouch/SettingsViewController.xib Wed Feb 03 23:36:42 2010 +0000
@@ -128,94 +128,11 @@
</object>
<string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor" id="771941710">
+ <object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
</object>
- <object class="IBUITableViewCell" id="45589474">
- <nil 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>
- <reference key="IBUITextColor" ref="771941710"/>
- <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>
- <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 class="IBUIView" id="399248671">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
@@ -320,32 +237,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">volumeSlider</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="1157528"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">sliderChanged:</string>
- <reference key="source" ref="1157528"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">3</int>
- </object>
- <int key="connectionID">25</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">sliderChanged:</string>
- <reference key="source" ref="1157528"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">4</int>
- </object>
- <int key="connectionID">26</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
<reference key="source" ref="179734732"/>
<reference key="destination" ref="372490531"/>
@@ -361,30 +252,6 @@
<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="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">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 class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">deleteData:</string>
<reference key="source" ref="227113826"/>
@@ -401,6 +268,14 @@
</object>
<int key="connectionID">46</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">settingsTable</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="179734732"/>
+ </object>
+ <int key="connectionID">47</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -438,32 +313,6 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <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="450734048"/>
- <reference ref="891605917"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="1157528"/>
- <reference key="parent" ref="45589474"/>
- </object>
- <object class="IBObjectRecord">
- <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 class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="52230916"/>
<reference key="parent" ref="0"/>
@@ -504,10 +353,6 @@
<string>1.IBEditorWindowLastContentRect</string>
<string>1.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>41.IBEditorWindowLastContentRect</string>
<string>41.IBPluginDependency</string>
@@ -515,7 +360,6 @@
<string>44.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
- <string>7.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -526,17 +370,12 @@
<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>
<string>{{1352, 334}, {220, 50}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>{{476, 500}, {480, 100}}</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>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -555,7 +394,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">46</int>
+ <int key="maxID">47</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -586,11 +425,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>buttonContainer</string>
<string>password</string>
- <string>table</string>
+ <string>settingsTable</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>
@@ -598,9 +434,6 @@
<string>UITextField</string>
<string>UITableView</string>
<string>UITextField</string>
- <string>UITableViewCell</string>
- <string>UILabel</string>
- <string>UISlider</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -769,14 +602,6 @@
</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="311037604"/>
@@ -806,14 +631,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UISlider</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">UITableView</string>
<string key="superclassName">UIScrollView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -822,14 +639,6 @@
</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">UITextField</string>
<string key="superclassName">UIControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="915667891">
Binary file cocoaTouch/resources/settingsButton.png has changed
--- a/hedgewars/hwengine.pas Wed Feb 03 13:02:28 2010 +0000
+++ b/hedgewars/hwengine.pas Wed Feb 03 23:36:42 2010 +0000
@@ -69,7 +69,7 @@
// proto.inc
{$IFDEF IPHONEOS}
-type arrayofpchar = array[0..6] of PChar;
+type arrayofpchar = array[0..5] of PChar;
procedure DoTimer(Lag: LongInt);
procedure OnDestroy;
procedure MainLoop;
@@ -232,26 +232,25 @@
initEverything();
Randomize();
- val('480', cScreenWidth);
- val('320', cScreenHeight);
+ cScreenWidth:= 480;
+ cScreenHeight:= 320;
cInitWidth:= cScreenWidth;
cInitHeight:= cScreenHeight;
- cBitsStr:= '32';
- val(cBitsStr, cBits);
+ cBits:= 32;
cFullScreen:= false;
cVSyncInUse:= true;
- val('8', cTimerInterval);
+ cTimerInterval:= 8;
PathPrefix:= 'Data';
cReducedQuality:= false;
cShowFPS:= true;
+ cInitVolume:= 100;
UserNick:= gameArgs[0];
val(gameArgs[1], ipcPort);
isSoundEnabled:= gameArgs[2] = '1';
isMusicEnabled:= gameArgs[3] = '1';
cLocaleFName:= gameArgs[4];
- val(gameArgs[5], cInitVolume);
- cAltDamage:= gameArgs[6] = '1';
+ cAltDamage:= gameArgs[5] = '1';
{$ENDIF}
for p:= Succ(Low(TPathType)) to High(TPathType) do
