can use latest sdlimage, work on setting panel and option when launching the game, minor fixes
--- a/cocoaTouch/GameSetup.h Wed Jan 13 09:41:35 2010 +0000
+++ b/cocoaTouch/GameSetup.h Thu Jan 14 16:38:43 2010 +0000
@@ -10,13 +10,14 @@
@interface GameSetup : NSObject {
- NSLocale *locale;
+ NSString *localeString;
+ NSDictionary *systemSettings;
BOOL engineProtocolStarted;
}
-@property (nonatomic, retain) NSLocale *locale;
-@property (nonatomic) BOOL engineProtocolStarted;
+@property (nonatomic, retain) NSString *localeString;
+@property (retain) NSDictionary *systemSettings;
-(void) setArgsForLocalPlay;
-(void) engineProtocol;
--- a/cocoaTouch/GameSetup.m Wed Jan 13 09:41:35 2010 +0000
+++ b/cocoaTouch/GameSetup.m Thu Jan 14 16:38:43 2010 +0000
@@ -11,13 +11,14 @@
#import "SDL_net.h"
#import "PascalImports.h"
-#define IPC_PORT 51342
-#define IPC_PORT_STR "51342"
+
#define BUFFER_SIZE 256
// they should go in the interface
TCPsocket sd, csd; /* Socket descriptor, Client socket descriptor */
+NSInteger ipcPort;
+
int sendToEngine (NSString * string) {
Uint8 length = [string length];
@@ -28,12 +29,14 @@
@implementation GameSetup
-@synthesize locale, engineProtocolStarted;
+@synthesize localeString, systemSettings;
-(id) init {
self = [super init];
- self.locale = [NSLocale currentLocale];
- self.engineProtocolStarted = NO;
+ self.localeString = [[[NSLocale currentLocale] localeIdentifier] stringByAppendingString:@".txt"];
+ self.systemSettings = nil;
+ engineProtocolStarted = NO;
+ ipcPort = 51342;
return self;
}
@@ -62,7 +65,7 @@
}
/* Resolving the host using NULL make network interface to listen */
- if (SDLNet_ResolveHost(&ip, NULL, IPC_PORT) < 0) {
+ if (SDLNet_ResolveHost(&ip, NULL, ipcPort) < 0) {
fprintf(stderr, "SDLNet_ResolveHost: %s\n", SDLNet_GetError());
exit(EXIT_FAILURE);
}
@@ -238,42 +241,47 @@
}
-(void) setArgsForLocalPlay {
- NSString *localeString = [[self.locale localeIdentifier] stringByAppendingString:@".txt"];
- NSLog(localeString);
+ NSString *portNumber = [[NSString alloc] initWithFormat:@"%d",ipcPort];
+ /*for (NSString *theString in [NSLocale ISOLanguageCodes]) {
+ NSLog(theString);
+ }*/
+
memset(forward_argv, 0, forward_argc);
forward_argc = 18;
forward_argv = (char **)realloc(forward_argv, forward_argc * sizeof(char *));
//forward_argv[i] = malloc( (strlen(argv[i])+1) * sizeof(char));
- forward_argv[ 1] = forward_argv[0]; // (UNUSED)
- forward_argv[ 2] = "320"; // cScreenWidth (NO EFFECT)
- forward_argv[ 3] = "480"; // cScreenHeight (NO EFFECT)
- forward_argv[ 4] = "32"; // cBitsStr
- forward_argv[ 5] = IPC_PORT_STR; // ipcPort;
- forward_argv[ 6] = "1"; // cFullScreen (NO EFFECT)
+ forward_argv[ 1] = forward_argv[0]; // (UNUSED)
+ forward_argv[ 2] = "320"; // cScreenWidth
+ forward_argv[ 3] = "480"; // cScreenHeight
+ forward_argv[ 4] = "16"; // cBitsStr
+ forward_argv[ 5] = [portNumber UTF8String]; // ipcPort;
+ forward_argv[ 6] = "1"; // cFullScreen (NO EFFECT)
forward_argv[ 7] = "0"; // isSoundEnabled (TOSET)
- forward_argv[ 8] = "1"; // cVSyncInUse (UNUSED)
+ forward_argv[ 8] = "1"; // cVSyncInUse (UNUSED)
forward_argv[ 9] = [localeString UTF8String]; // cLocaleFName
forward_argv[10] = "100"; // cInitVolume (TOSET)
- forward_argv[11] = "8"; // cTimerInterval
- forward_argv[12] = "Data"; // PathPrefix
+ forward_argv[11] = "8"; // cTimerInterval
+ forward_argv[12] = "Data"; // PathPrefix
forward_argv[13] = "1"; // cShowFPS (TOSET?)
forward_argv[14] = "0"; // cAltDamage (TOSET)
forward_argv[15] = "Koda"; // UserNick (DecodeBase64(ParamStr(15)) FTW) <- TODO
forward_argv[16] = "0"; // isMusicEnabled (TOSET)
- forward_argv[17] = "0"; // cReducedQuality
+ forward_argv[17] = "0"; // cReducedQuality
-fprintf(stderr, forward_argv[9]);
+ [portNumber release];
return;
}
-/*
- -(void) dealloc {
+
+-(void) dealloc {
+ [self.systemSettings release];
+ [self.localeString autorelease];
[super dealloc];
}
- */
+
@end
--- a/cocoaTouch/MainMenuViewController.m Wed Jan 13 09:41:35 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m Thu Jan 14 16:38:43 2010 +0000
@@ -26,7 +26,7 @@
// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-(void) viewDidLoad {
- self.versionLabel = @"Hedgewars version 0.9.13-dev";
+ self.versionLabel.text = @"Hedgewars version 0.9.13-dev";
[super viewDidLoad];
}
@@ -37,13 +37,14 @@
return (interfaceOrientation == UIInterfaceOrientationPortrait);
}
*/
-
+/*
- (void)didReceiveMemoryWarning {
// Releases the view if it doesn't have a superview.
[super didReceiveMemoryWarning];
// Release any cached data, images, etc that aren't in use.
}
+*/
- (void)viewDidUnload {
// Release any retained subviews of the main view.
@@ -61,9 +62,22 @@
[super dealloc];
}
+// disable the buttons when to prevent launching twice the game
+-(void) viewWillDisappear:(BOOL)animated {
+ passandplayButton.enabled = NO;
+ netplayButton.enabled = NO;
+ storeButton.enabled = NO;
+ [super viewWillDisappear:animated];
+}
+
+-(void) viewWillAppear:(BOOL)animated {
+ passandplayButton.enabled = YES;
+ netplayButton.enabled = YES;
+ storeButton.enabled = YES;
+ [super viewWillAppear:animated];
+}
+
-(IBAction) startPlaying {
- // TODO: support IPC and start a thread
-
[[SDLUIKitDelegate sharedAppDelegate] startSDLgame];
}
--- a/cocoaTouch/SDLOverrides/SDL_uikitview.m Wed Jan 13 09:41:35 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitview.m Thu Jan 14 16:38:43 2010 +0000
@@ -76,6 +76,7 @@
[menuButton addTarget:[self superclass] action:@selector(attackButtonPressed) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:menuButton];
+ [[SDLUIKitDelegate sharedAppDelegate].window makeKeyAndVisible];
self.multipleTouchEnabled = YES;
return self;
--- a/cocoaTouch/SettingsViewController.h Wed Jan 13 09:41:35 2010 +0000
+++ b/cocoaTouch/SettingsViewController.h Thu Jan 14 16:38:43 2010 +0000
@@ -10,7 +10,21 @@
@interface SettingsViewController : UIViewController {
-
+ UITextField *username;
+ UITextField *password;
+ UISwitch *musicOn;
+ UISwitch *effectsOn;
+ UISlider *volumeSlider;
+ UILabel *volumeLabel;
}
+@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 UISlider *volumeSlider;
+@property (nonatomic, retain) IBOutlet UILabel *volumeLabel;
+-(IBAction) sliderChanged: (id)sender;
+-(IBAction) backgroundTap: (id)sender;
+-(IBAction) textFieldDoneEditing: (id)sender;
@end
--- a/cocoaTouch/SettingsViewController.m Wed Jan 13 09:41:35 2010 +0000
+++ b/cocoaTouch/SettingsViewController.m Thu Jan 14 16:38:43 2010 +0000
@@ -11,23 +11,75 @@
@implementation SettingsViewController
-/*
- // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
- if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
- // Custom initialization
- }
- return self;
+@synthesize username, password, musicOn, effectsOn, volumeSlider, volumeLabel;
+
+-(NSString *)dataFilePath: (NSString *)fileName {
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+ NSString *documentsDirectory = [paths objectAtIndex:0];
+ return [documentsDirectory stringByAppendingPathComponent:fileName];
}
-*/
+
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
- [super viewDidLoad];
+-(void) viewDidLoad {
+ NSString *filePath = [self dataFilePath:@"settings.plist"];
+
+ if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
+ NSUserDefaults *data = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath];
+ username.text = [data objectForKey:@"username"];
+ password.text = [data objectForKey:@"password"];
+ if (1 == [[data objectForKey:@"music"] intValue]) {
+ musicOn.on = YES;
+ } else {
+ musicOn.on = NO;
+ }
+ if (1 == [[data objectForKey:@"effects"] intValue]) {
+ effectsOn.on = YES;
+ } else {
+ effectsOn.on = NO;
+ }
+ [volumeSlider setValue:[[data objectForKey:@"volume"] intValue] animated:NO];
+ NSString *tmpVol = [[NSString alloc] initWithFormat:@"%d", (int) volumeSlider.value];
+ volumeLabel.text = tmpVol;
+ [tmpVol release];
+ }
+
+
+/*
+ UIApplication *app = [UIApplication sharedApplication];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(applicationWillTerminate:)
+ name:UIApplicationWillTerminateNotification
+ object:app];
+*/ [super viewDidLoad];
}
-*/
+
+-(void) viewDidUnload {
+ self.username = nil;
+ self.password = nil;
+ self.musicOn = nil;
+ self.effectsOn = nil;
+ self.volumeLabel = nil;
+ self.volumeSlider = 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";
+
+ [saveArray setObject:username.text forKey:@"username"];
+ [saveArray setObject:password.text forKey:@"password"];
+ [saveArray setObject:tmpMus forKey:@"music"];
+ [saveArray setObject:tmpEff forKey:@"effects"];
+ [saveArray setObject:volumeLabel.text forKey:@"volume"];
+
+ [saveArray writeToFile:[self dataFilePath:@"settings.plist"] atomically:YES];
+ [saveArray release];
+ [super viewWillDisappear:animated];
+}
+
/*
// Override to allow orientations other than the default portrait orientation.
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
@@ -36,20 +88,30 @@
}
*/
-- (void)didReceiveMemoryWarning {
- // Releases the view if it doesn't have a superview.
- [super didReceiveMemoryWarning];
-
- // Release any cached data, images, etc that aren't in use.
+-(IBAction) backgroundTap: (id)sender {
+ [username resignFirstResponder];
+ [password resignFirstResponder];
+}
+
+-(IBAction) textFieldDoneEditing: (id)sender {
+ [sender resignFirstResponder];
}
-- (void)viewDidUnload {
- // Release any retained subviews of the main view.
- // e.g. self.myOutlet = nil;
+-(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];
}
-
-- (void)dealloc {
+-(void) dealloc {
+ [username release];
+ [password release];
+ [musicOn release];
+ [effectsOn release];
+ [volumeLabel release];
+ [volumeSlider release];
[super dealloc];
}
--- a/cocoaTouch/SettingsViewController.xib Wed Jan 13 09:41:35 2010 +0000
+++ b/cocoaTouch/SettingsViewController.xib Thu Jan 14 16:38:43 2010 +0000
@@ -2,13 +2,13 @@
<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>
@@ -38,16 +38,135 @@
<object class="IBUIView" id="191373211">
<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="IBUIImageView" id="239534914">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{320, 431}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <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="IBUITextField" id="64690547">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{130, 135}, {152, 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="679152831">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <bool key="IBUIClearsOnBeginEditing">YES</bool>
+ <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+ <float key="IBUIMinimumFontSize">17</float>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <int key="IBUIReturnKeyType">9</int>
+ </object>
+ </object>
+ <object class="IBUITextField" id="46077344">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{130, 174}, {152, 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="679152831"/>
+ </object>
+ <bool key="IBUIClearsOnBeginEditing">YES</bool>
+ <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+ <float key="IBUIMinimumFontSize">17</float>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <int key="IBUIReturnKeyType">9</int>
+ <bool key="IBUISecureTextEntry">YES</bool>
+ </object>
+ </object>
+ <object class="IBUISlider" id="229592816">
+ <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="1072985528">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{188, 242}, {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="750512698">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{188, 294}, {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="IBUILabel" id="811284943">
+ <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>
+ <string key="NSFrameSize">{320, 431}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace">
- <int key="NSID">2</int>
- </object>
</object>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -61,6 +180,99 @@
</object>
<int key="connectionID">3</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">username</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="64690547"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">password</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="46077344"/>
+ </object>
+ <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="1072985528"/>
+ </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="750512698"/>
+ </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"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">1</int>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">textFieldDoneEditing:</string>
+ <reference key="source" ref="64690547"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">20</int>
+ </object>
+ <int key="connectionID">18</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">textFieldDoneEditing:</string>
+ <reference key="source" ref="46077344"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">20</int>
+ </object>
+ <int key="connectionID">19</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">volumeLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="811284943"/>
+ </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="229592816"/>
+ </object>
+ <int key="connectionID">23</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">sliderChanged:</string>
+ <reference key="source" ref="229592816"/>
+ <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="229592816"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">4</int>
+ </object>
+ <int key="connectionID">26</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -74,6 +286,16 @@
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="239534914"/>
+ <reference ref="64690547"/>
+ <reference ref="46077344"/>
+ <reference ref="1072985528"/>
+ <reference ref="750512698"/>
+ <reference ref="229592816"/>
+ <reference ref="811284943"/>
+ </object>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
@@ -87,6 +309,41 @@
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="239534914"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="64690547"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="46077344"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="229592816"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="1072985528"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="750512698"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">20</int>
+ <reference key="object" ref="811284943"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -95,15 +352,31 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
+ <string>1.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
+ <string>20.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>
<string>SettingsViewController</string>
<string>UIResponder</string>
+ <string>UIControl</string>
<string>{{556, 412}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -122,7 +395,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">3</int>
+ <int key="maxID">26</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -130,20 +403,299 @@
<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>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>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>effectsOn</string>
+ <string>musicOn</string>
+ <string>password</string>
+ <string>username</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>UITextField</string>
+ <string>UITextField</string>
+ <string>UILabel</string>
+ <string>UISlider</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">SettingsViewController.h</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>
+ <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="582665975">
+ <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="582665975"/>
+ </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">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">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">UITextField</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="795297786">
+ <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="795297786"/>
+ </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/hedgewars/options.inc Wed Jan 13 09:41:35 2010 +0000
+++ b/hedgewars/options.inc Thu Jan 14 16:38:43 2010 +0000
@@ -27,7 +27,7 @@
{$DEFINE GLES11}
{$DEFINE TOUCHINPUT}
{$DEFINE LOWRES}
- {$UNDEF SDL_IMAGE_NEWER}
+ {$DEFINE SDL_IMAGE_NEWER}
{$ENDIF}
{$IFNDEF DARWIN}