--- a/hedgewars/CCHandlers.inc Sun Nov 28 01:58:43 2010 +0100
+++ b/hedgewars/CCHandlers.inc Sun Nov 28 23:49:09 2010 +0100
@@ -464,7 +464,6 @@
{$IFDEF DEBUGFILE}
AddFileLog('Doing SwitchHedgehog: time '+inttostr(GameTicks));
{$ENDIF}
- perfExt_NewTurnBeginning();
end;
procedure chSay(var s: shortstring);
--- a/hedgewars/uConsole.pas Sun Nov 28 01:58:43 2010 +0100
+++ b/hedgewars/uConsole.pas Sun Nov 28 23:49:09 2010 +0100
@@ -37,7 +37,7 @@
procedure doPut(putX, putY: LongInt; fromAI: boolean);
implementation
-uses uMisc, uStore, Types, uConsts, uGears, uTeams, uIO, uKeys, uWorld, uMobile,
+uses uMisc, uStore, Types, uConsts, uGears, uTeams, uIO, uKeys, uWorld,
uRandom, uAmmos, uStats, uChat, SDLh, uSound, uVisualGears, uScript;
const cLineWidth: LongInt = 0;
--- a/hedgewars/uMobile.pas Sun Nov 28 01:58:43 2010 +0100
+++ b/hedgewars/uMobile.pas Sun Nov 28 23:49:09 2010 +0100
@@ -77,7 +77,9 @@
procedure perfExt_AmmoUpdate; // don't inline
begin
{$IFDEF IPHONEOS}
- if (CurrentTeam^.ExtDriven) or (CurrentTeam^.Hedgehogs[0].BotLevel <> 0) then
+ if (CurrentTeam = nil) or
+ (CurrentTeam^.ExtDriven) or
+ (CurrentTeam^.Hedgehogs[0].BotLevel <> 0) then
exit(); // the other way around throws a compiler error
updateVisualsNewTurn();
{$ENDIF}
--- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Sun Nov 28 23:49:09 2010 +0100
@@ -40,11 +40,6 @@
#pragma mark -
#pragma mark view handling
-(void) viewDidLoad {
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(updateAmmoVisuals)
- name:@"updateAmmoVisuals"
- object:nil];
-
self.view.frame = CGRectMake(0, 0, 480, 320);
self.view.backgroundColor = [UIColor blackColor];
self.view.layer.borderColor = [[UIColor whiteColor] CGColor];
@@ -344,7 +339,6 @@
}
-(void) viewDidUnload {
- [[NSNotificationCenter defaultCenter] removeObserver:self];
self.imagesArray = nil;
self.buttonsArray = nil;
self.nameLabel = nil;
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Nov 28 23:49:09 2010 +0100
@@ -38,12 +38,7 @@
}
-(IBAction) buttonPressed:(id) sender {
- // works even if it's not actually a button
- UIButton *theButton;
- if (IS_IPAD())
- theButton = [[(NSNotification *)sender userInfo] objectForKey:@"sender"];
- else
- theButton = (UIButton *)sender;
+ UIButton *theButton = (UIButton *)sender;
switch (theButton.tag) {
case 0:
@@ -171,7 +166,7 @@
// play if there aren't too many teams
if ([self.teamConfigViewController.listOfSelectedTeams count] > HW_getMaxNumberOfTeams()) {
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Too many teams",@"")
- message:NSLocalizedString(@"Max six teams are allowed in the same game",@"")
+ message:NSLocalizedString(@"You exceeded the maximum number of tems allowed in a game",@"")
delegate:nil
cancelButtonTitle:NSLocalizedString(@"Ok, got it",@"")
otherButtonTitles:nil];
@@ -234,38 +229,17 @@
// finally launch game and remove this controller
DLog(@"sending config %@", gameDictionary);
- if ([[gameDictionary allKeys] count] == 11) {
- NSDictionary *allDataNecessary = [NSDictionary dictionaryWithObjectsAndKeys:gameDictionary,@"game_dictionary", @"",@"savefile",
- [NSNumber numberWithBool:NO],@"netgame", nil];
- // let's hide all the views while the game is on
+ NSDictionary *allDataNecessary = [NSDictionary dictionaryWithObjectsAndKeys:gameDictionary,@"game_dictionary", @"",@"savefile",
+ [NSNumber numberWithBool:NO],@"netgame", nil];
+ if (IS_IPAD())
+ [[SDLUIKitDelegate sharedAppDelegate] startSDLgame:allDataNecessary];
+ else {
+ // this causes a sporadic crash on the ipad but without this rotation doesn't work on iphone
UIViewController *dummy = [[UIViewController alloc] init];
[self presentModalViewController:dummy animated:NO];
[[SDLUIKitDelegate sharedAppDelegate] startSDLgame:allDataNecessary];
[self dismissModalViewControllerAnimated:NO];
[dummy release];
- } else {
- DLog(@"gameconfig data not complete!!");
- [self.parentViewController dismissModalViewControllerAnimated:YES];
-
- // present an alert to the user, with an image on the ipad (too big for the iphone)
- NSString *msg = NSLocalizedString(@"Something went wrong with your configuration. Please try again.",@"");
- if (IS_IPAD())
- msg = [msg stringByAppendingString:@"\n\n\n\n\n\n\n\n"]; // this makes space for the image
-
- UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Whoops"
- message:msg
- delegate:nil
- cancelButtonTitle:@"Ok"
- otherButtonTitles:nil];
-
- if (IS_IPAD()) {
- UIImageView *deniedImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"denied.png"]];
- deniedImg.frame = CGRectMake(25, 80, 240, 160);
- [alert addSubview:deniedImg];
- [deniedImg release];
- }
- [alert show];
- [alert release];
}
}
@@ -311,12 +285,6 @@
self.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width);
if (IS_IPAD()) {
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(buttonPressed:)
- name:@"buttonPressed"
- object:nil];
- srandom(time(NULL));
-
// load other controllers
if (self.mapConfigViewController == nil)
self.mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil];
@@ -357,6 +325,7 @@
self.teamConfigViewController.view.frame = CGRectMake(348, 200, 328, 480);
self.schemeWeaponConfigViewController.view.frame = CGRectMake(10, 70, 300, 600);
+ self.mapConfigViewController.parentController = self;
} else {
// this is the visible controller
if (self.mapConfigViewController == nil)
@@ -420,7 +389,6 @@
}
-(void) viewDidUnload {
- [[NSNotificationCenter defaultCenter] removeObserver:self];
self.imgContainer = nil;
self.mapConfigViewController = nil;
self.teamConfigViewController = nil;
--- a/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Sun Nov 28 23:49:09 2010 +0100
@@ -47,11 +47,6 @@
[super viewDidLoad];
}
-
--(void) scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView *)view {
- [self.view removeFromSuperview];
-}
-
-(void) viewDidUnload {
[super viewDidUnload];
self.scrollView = nil;
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Sun Nov 28 23:49:09 2010 +0100
@@ -23,6 +23,7 @@
#import "MapPreviewButtonView.h"
@class SchemeWeaponConfigViewController;
+@class GameConfigViewController;
@interface MapConfigViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, MapPreviewViewDelegate> {
NSInteger oldValue; // for the slider
@@ -53,6 +54,7 @@
// controller for mission state
SchemeWeaponConfigViewController *externalController;
+ GameConfigViewController *parentController;
}
@@ -77,6 +79,7 @@
@property (nonatomic,retain) NSArray *dataSourceArray;
@property (nonatomic,assign) SchemeWeaponConfigViewController *externalController;
+@property (nonatomic,assign) GameConfigViewController *parentController;
-(IBAction) buttonPressed:(id) sender;
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sun Nov 28 23:49:09 2010 +0100
@@ -24,13 +24,15 @@
#import "CommodityFunctions.h"
#import "UIImageExtra.h"
#import "SchemeWeaponConfigViewController.h"
+#import "GameConfigViewController.h"
#define scIndex self.segmentedControl.selectedSegmentIndex
#define isRandomness() (segmentedControl.selectedSegmentIndex == 0 || segmentedControl.selectedSegmentIndex == 2)
@implementation MapConfigViewController
@synthesize previewButton, maxHogs, seedCommand, templateFilterCommand, mapGenCommand, mazeSizeCommand, themeCommand, staticMapCommand,
- missionCommand, tableView, maxLabel, sizeLabel, segmentedControl, slider, lastIndexPath, dataSourceArray, busy, externalController;
+ missionCommand, tableView, maxLabel, sizeLabel, segmentedControl, slider, lastIndexPath, dataSourceArray, busy,
+ externalController, parentController;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
@@ -369,9 +371,7 @@
}
-(IBAction) buttonPressed:(id) sender {
- [[NSNotificationCenter defaultCenter] postNotificationName:@"buttonPressed"
- object:nil
- userInfo:[NSDictionary dictionaryWithObject:sender forKey:@"sender"]];
+ [self.parentController buttonPressed:sender];
}
#pragma mark -
@@ -392,7 +392,7 @@
// remove images that are too big for certain devices
if (IS_NOT_POWERFUL() && imgSize.height > 1024.0f)
continue;
- if ([modelType() hasPrefix:@"iPad1"] && [[[UIDevice currentDevice] systemVersion] intValue] < 4 && imgSize.height > 1280.0f)
+ if ([modelType() hasPrefix:@"iPad1"] && imgSize.height > 1280.0f)
continue;
[mapArray addObject:str];
}
@@ -404,7 +404,7 @@
// remove images that are too big for certain devices
if (IS_NOT_POWERFUL() && imgSize.height > 1024.0f)
continue;
- if ([modelType() hasPrefix:@"iPad1"] && [[[UIDevice currentDevice] systemVersion] intValue] < 4 && imgSize.height > 1280.0f)
+ if ([modelType() hasPrefix:@"iPad1"] && imgSize.height > 1280.0f)
continue;
[missionArray addObject:str];
}
--- a/project_files/HedgewarsMobile/Classes/ObjcExports.h Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/ObjcExports.h Sun Nov 28 23:49:09 2010 +0100
@@ -25,8 +25,11 @@
#define REPLAYBLACKVIEW_TAG 9955
#define ACTIVITYINDICATOR_TAG 987654
+@class AmmoMenuViewController;
+
void objcExportsInit();
BOOL isGameRunning();
void setGameRunning(BOOL value);
NSInteger cachedGrenadeTime();
void setGrenadeTime(NSInteger value);
+void setAmmoMenuInstance(AmmoMenuViewController *instance);
--- a/project_files/HedgewarsMobile/Classes/ObjcExports.m Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/ObjcExports.m Sun Nov 28 23:49:09 2010 +0100
@@ -20,6 +20,7 @@
#import "ObjcExports.h"
+#import "AmmoMenuViewController.h"
#pragma mark -
#pragma mark internal variables
@@ -29,6 +30,8 @@
BOOL savedGame;
// cache the grenade time
NSInteger grenadeTime;
+// the reference to the newMenu instance
+AmmoMenuViewController *amvc_instance;
#pragma mark -
#pragma mark functions called like oop
@@ -54,6 +57,10 @@
grenadeTime = value;
}
+void inline setAmmoMenuInstance(AmmoMenuViewController *instance) {
+ amvc_instance = instance;
+}
+
#pragma mark -
#pragma mark functions called by pascal code
void startSpinning() {
@@ -141,5 +148,6 @@
}
void updateVisualsNewTurn(void) {
- [[NSNotificationCenter defaultCenter] postNotificationName:@"updateAmmoVisuals" object:nil];
+ DLog(@"updating visuals");
+ [amvc_instance updateAmmoVisuals];
}
--- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Sun Nov 28 23:49:09 2010 +0100
@@ -410,7 +410,7 @@
if (IS_DUALHEAD() || self.useClassicMenu == NO) {
if (self.amvc == nil)
self.amvc = [[AmmoMenuViewController alloc] init];
-
+ setAmmoMenuInstance(amvc);
if (self.amvc.isVisible) {
doDim();
[self.amvc disappear];
@@ -421,6 +421,7 @@
}
}
} else {
+ setAmmoMenuInstance(nil);
HW_ammoMenu();
}
break;
--- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sun Nov 28 23:49:09 2010 +0100
@@ -111,7 +111,11 @@
cancelButtonTitle:cancelStr
destructiveButtonTitle:confirmStr
otherButtonTitles:nil];
- [actionSheet showInView:self.view];
+
+ if (IS_IPAD())
+ [actionSheet showFromBarButtonItem:(UIBarButtonItem *)sender animated:YES];
+ else
+ [actionSheet showInView:self.view];
[actionSheet release];
}
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Nov 28 23:49:09 2010 +0100
@@ -56,6 +56,8 @@
615AD96212073B4D00F2FF04 /* startGameButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD96112073B4D00F2FF04 /* startGameButton.png */; };
615AD9E9120764CA00F2FF04 /* backButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9E8120764CA00F2FF04 /* backButton.png */; };
615AD9EB1207654E00F2FF04 /* helpButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 615AD9EA1207654E00F2FF04 /* helpButton.png */; };
+ 615FEAE212A2A6640098EE92 /* localplayButton~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */; };
+ 615FEAE312A2A6640098EE92 /* localplayButton~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */; };
6163EE7E11CC2600001C0453 /* SingleWeaponViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */; };
6165920D11CA9BA200D6E256 /* FlagsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E111CA9BA200D6E256 /* FlagsViewController.m */; };
6165920E11CA9BA200D6E256 /* FortsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 616591E311CA9BA200D6E256 /* FortsViewController.m */; };
@@ -126,7 +128,6 @@
617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617988DA114AAA3900BA94A9 /* libSDLiPhoneOS.a */; };
61798935114AB25F00BA94A9 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798934114AB25F00BA94A9 /* AudioToolbox.framework */; };
61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798993114AB3FA00BA94A9 /* libSDL_mixer.a */; };
- 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617989BB114AB47500BA94A9 /* libSDL_net.a */; };
61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798A13114AB65600BA94A9 /* libSDL_ttf.a */; };
61799289114AE08700BA94A9 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; };
61808A5D128C930A005D0E2F /* backSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D7122AA10A00DF6938 /* backSound.wav */; };
@@ -135,6 +136,7 @@
61842B40122B66280096E335 /* helpleft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3F122B66280096E335 /* helpleft.png */; };
6187AEBD120781B900B31A27 /* Settings in Resources */ = {isa = PBXBuildFile; fileRef = 6187AEA5120781B900B31A27 /* Settings */; };
61889985129995B500D55FD6 /* title~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61889984129995B500D55FD6 /* title~ipad.png */; };
+ 618E27BC12A2C32600C20EF0 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 618E27BB12A2C30700C20EF0 /* libSDL_net.a */; };
6199E81612463EA800DADF8C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6199E81512463EA800DADF8C /* CFNetwork.framework */; };
6199E81A12463EC400DADF8C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6199E81912463EC400DADF8C /* SystemConfiguration.framework */; };
6199E839124647DE00DADF8C /* SupportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6199E837124647DE00DADF8C /* SupportViewController.m */; };
@@ -174,7 +176,6 @@
61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43711E290650040BA66 /* iTunesArtwork.png */; };
61F9040911DF58B00068B24D /* settingsButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040811DF58B00068B24D /* settingsButton.png */; };
61F9040B11DF59370068B24D /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040A11DF59370068B24D /* background.png */; };
- 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040C11DF59D10068B24D /* localplayButton.png */; };
61F904D711DF7DA30068B24D /* WeaponCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F904D611DF7DA30068B24D /* WeaponCellView.m */; };
922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; };
/* End PBXBuildFile section */
@@ -669,13 +670,6 @@
remoteGlobalIDString = BE1FA95407AF96B2004B6283;
remoteInfo = "Static Library";
};
- 617989BA114AB47500BA94A9 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA;
- remoteInfo = "Static Library";
- };
61798A12114AB65600BA94A9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */;
@@ -690,6 +684,13 @@
remoteGlobalIDString = 006E982211955059001DE610;
remoteInfo = testsdl;
};
+ 618E27BA12A2C30700C20EF0 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = BE48FF6F07AFA9A900BB41DA /* libSDL_net.a */;
+ remoteInfo = "Static Library";
+ };
619C5AC9124F7DDF00D041AE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 619C5AC0124F7DDF00D041AE /* Lua.xcodeproj */;
@@ -772,6 +773,10 @@
615AD96112073B4D00F2FF04 /* startGameButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startGameButton.png; path = Resources/Frontend/startGameButton.png; sourceTree = "<group>"; };
615AD9E8120764CA00F2FF04 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backButton.png; path = Resources/Frontend/backButton.png; sourceTree = "<group>"; };
615AD9EA1207654E00F2FF04 /* helpButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpButton.png; path = Resources/Frontend/helpButton.png; sourceTree = "<group>"; };
+ 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "checkbox@2x.png"; path = "Resources/Icons/checkbox@2x.png"; sourceTree = "<group>"; };
+ 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton@2x~iphone.png"; path = "Resources/Frontend/localplayButton@2x~iphone.png"; sourceTree = "<group>"; };
+ 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~ipad.png"; path = "Resources/Frontend/localplayButton~ipad.png"; sourceTree = "<group>"; };
+ 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~iphone.png"; path = "Resources/Frontend/localplayButton~iphone.png"; sourceTree = "<group>"; };
6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = "<group>"; };
6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SingleWeaponViewController.m; sourceTree = "<group>"; };
616591E011CA9BA200D6E256 /* FlagsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagsViewController.h; sourceTree = "<group>"; };
@@ -888,7 +893,6 @@
617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLiPhoneOS.xcodeproj; path = "../../../Library/SDL-1.3/SDL/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj"; sourceTree = SOURCE_ROOT; };
61798934114AB25F00BA94A9 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_mixer.xcodeproj; path = "../../../Library/SDL-1.3/SDL_mixer/Xcode-iPhoneOS/SDL_mixer.xcodeproj"; sourceTree = SOURCE_ROOT; };
- 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL-1.3/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; };
61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_ttf.xcodeproj; path = "../../../Library/SDL-1.3/SDL_ttf/Xcode-iPhoneOS/SDL_ttf.xcodeproj"; sourceTree = SOURCE_ROOT; };
61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = "<group>"; };
6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-ipad-Landscape.png"; path = "Resources/Icons/Default-ipad-Landscape.png"; sourceTree = "<group>"; };
@@ -900,6 +904,7 @@
6187AEA5120781B900B31A27 /* Settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Settings; path = Resources/Settings; sourceTree = "<group>"; };
618899811299516000D55FD6 /* title@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x.png"; path = "Resources/Frontend/title@2x.png"; sourceTree = "<group>"; };
61889984129995B500D55FD6 /* title~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~ipad.png"; path = "Resources/Frontend/title~ipad.png"; sourceTree = "<group>"; };
+ 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL-1.3/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; };
6199E81512463EA800DADF8C /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
6199E81912463EC400DADF8C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
6199E836124647DE00DADF8C /* SupportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SupportViewController.h; sourceTree = "<group>"; };
@@ -943,7 +948,6 @@
61F7A43711E290650040BA66 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = Resources/Icons/iTunesArtwork.png; sourceTree = "<group>"; };
61F9040811DF58B00068B24D /* settingsButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settingsButton.png; path = Resources/Frontend/settingsButton.png; sourceTree = "<group>"; };
61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = Resources/Frontend/background.png; sourceTree = "<group>"; };
- 61F9040C11DF59D10068B24D /* localplayButton.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = localplayButton.png; path = Resources/Frontend/localplayButton.png; sourceTree = "<group>"; };
61F9040D11DF59D10068B24D /* netplayButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = netplayButton.png; path = Resources/Frontend/netplayButton.png; sourceTree = "<group>"; };
61F904D511DF7DA30068B24D /* WeaponCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeaponCellView.h; sourceTree = "<group>"; };
61F904D611DF7DA30068B24D /* WeaponCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeaponCellView.m; sourceTree = "<group>"; };
@@ -956,8 +960,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 618E27BC12A2C32600C20EF0 /* libSDL_net.a in Frameworks */,
61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */,
- 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */,
61272334117DF764005B90CF /* libSDL_image.a in Frameworks */,
61798996114AB3FF00BA94A9 /* libSDL_mixer.a in Frameworks */,
617988DB114AAA4200BA94A9 /* libSDLiPhoneOS.a in Frameworks */,
@@ -1075,8 +1079,8 @@
611E0E4B11FA92130077A41E /* freetype.xcodeproj */,
617988D3114AAA3900BA94A9 /* SDLiPhoneOS.xcodeproj */,
6127232E117DF752005B90CF /* SDL_image.xcodeproj */,
- 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */,
6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */,
+ 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */,
61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */,
61798934114AB25F00BA94A9 /* AudioToolbox.framework */,
61A117FE1168322700359010 /* CoreGraphics.framework */,
@@ -1328,14 +1332,6 @@
name = Products;
sourceTree = "<group>";
};
- 617989B4114AB47500BA94A9 /* Products */ = {
- isa = PBXGroup;
- children = (
- 617989BB114AB47500BA94A9 /* libSDL_net.a */,
- );
- name = Products;
- sourceTree = "<group>";
- };
61798A0C114AB65600BA94A9 /* Products */ = {
isa = PBXGroup;
children = (
@@ -1369,6 +1365,14 @@
name = Overlay;
sourceTree = "<group>";
};
+ 618E27B712A2C30700C20EF0 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 618E27BB12A2C30700C20EF0 /* libSDL_net.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
619C5AC1124F7DDF00D041AE /* Products */ = {
isa = PBXGroup;
children = (
@@ -1398,6 +1402,7 @@
611DA1CF124E5C6300008271 /* plus.png */,
6103D413129B417500911D8D /* plus@2x.png */,
61F2E7EB12060E31005734F7 /* checkbox.png */,
+ 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */,
61D3D2A41290E03A003CE7C3 /* irc.png */,
6103D384129B347700911D8D /* irc@2x.png */,
61E2F7421283752C00E12521 /* fb.png */,
@@ -1429,7 +1434,9 @@
615AD9E8120764CA00F2FF04 /* backButton.png */,
6172FED31298CE6600D73365 /* backButton@2x.png */,
615AD96112073B4D00F2FF04 /* startGameButton.png */,
- 61F9040C11DF59D10068B24D /* localplayButton.png */,
+ 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */,
+ 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */,
+ 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */,
61F9040D11DF59D10068B24D /* netplayButton.png */,
61EBA62811DFF2BC0048B68A /* title.png */,
618899811299516000D55FD6 /* title@2x.png */,
@@ -1569,8 +1576,8 @@
ProjectRef = 6179898B114AB3FA00BA94A9 /* SDL_mixer.xcodeproj */;
},
{
- ProductGroup = 617989B4114AB47500BA94A9 /* Products */;
- ProjectRef = 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */;
+ ProductGroup = 618E27B712A2C30700C20EF0 /* Products */;
+ ProjectRef = 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */;
},
{
ProductGroup = 61798A0C114AB65600BA94A9 /* Products */;
@@ -2067,13 +2074,6 @@
remoteRef = 61798992114AB3FA00BA94A9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 617989BB114AB47500BA94A9 /* libSDL_net.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libSDL_net.a;
- remoteRef = 617989BA114AB47500BA94A9 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
61798A13114AB65600BA94A9 /* libSDL_ttf.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -2088,6 +2088,13 @@
remoteRef = 6184608B11DA8BF3000E1314 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
+ 618E27BB12A2C30700C20EF0 /* libSDL_net.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libSDL_net.a;
+ remoteRef = 618E27BA12A2C30700C20EF0 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
619C5ACA124F7DDF00D041AE /* Lua.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
@@ -2132,7 +2139,6 @@
61EF921411DF57AC003441C4 /* joyButtonForwardJump.png in Resources */,
61F9040911DF58B00068B24D /* settingsButton.png in Resources */,
61F9040B11DF59370068B24D /* background.png in Resources */,
- 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */,
61EBA62A11DFF2BC0048B68A /* title.png in Resources */,
61F7A43811E290650040BA66 /* Icon-72.png in Resources */,
61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */,
@@ -2179,6 +2185,8 @@
6172FEF21298D25D00D73365 /* smallerBackground~iphone.png in Resources */,
61889985129995B500D55FD6 /* title~ipad.png in Resources */,
6103D414129B417500911D8D /* plus@2x.png in Resources */,
+ 615FEAE212A2A6640098EE92 /* localplayButton~ipad.png in Resources */,
+ 615FEAE312A2A6640098EE92 /* localplayButton~iphone.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2717,7 +2725,7 @@
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_STRICT_ALIASING = YES;
GCC_THUMB_SUPPORT = NO;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton@2x~iphone.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton~ipad.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton~iphone.png has changed
--- a/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib Sun Nov 28 23:49:09 2010 +0100
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <int key="IBDocument.SystemTarget">1056</int>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
+ <string key="NS.object.0">132</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
+ <integer value="97"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -161,7 +161,7 @@
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Pinch to return</string>
+ <string key="IBUIText">Touch interface</string>
<reference key="IBUIFont" ref="583365693"/>
<reference key="IBUITextColor" ref="283637272"/>
<nil key="IBUIHighlightedColor"/>
@@ -369,8 +369,37 @@
<int key="IBUINumberOfLines">0</int>
<int key="IBUITextAlignment">2</int>
</object>
+ <object class="IBUIButton" id="630442385">
+ <reference key="NSNextResponder" ref="400316535"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{203, 34}, {60, 37}}</string>
+ <reference key="NSSuperview" ref="400316535"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <int key="IBUIButtonType">1</int>
+ <string key="IBUINormalTitle">Back</string>
+ <object class="NSColor" key="IBUIHighlightedTitleColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC41AA</bytes>
+ </object>
+ </object>
</object>
- <string key="NSFrameSize">{480, 320}</string>
+ <string key="NSFrameSize">{489, 332}</string>
<reference key="NSSuperview" ref="766721923"/>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
@@ -410,6 +439,15 @@
</object>
<int key="connectionID">115</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">dismiss</string>
+ <reference key="source" ref="630442385"/>
+ <reference key="destination" ref="841351856"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">117</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -462,6 +500,7 @@
<reference ref="904797875"/>
<reference ref="827961215"/>
<reference ref="549219303"/>
+ <reference ref="630442385"/>
</object>
<reference key="parent" ref="766721923"/>
</object>
@@ -550,6 +589,11 @@
<reference key="object" ref="549219303"/>
<reference key="parent" ref="400316535"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">116</int>
+ <reference key="object" ref="630442385"/>
+ <reference key="parent" ref="400316535"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -588,6 +632,8 @@
<string>113.IBViewBoundsToFrameTransform</string>
<string>114.IBPluginDependency</string>
<string>114.IBViewBoundsToFrameTransform</string>
+ <string>116.IBPluginDependency</string>
+ <string>116.IBViewBoundsToFrameTransform</string>
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
<string>2.IBViewBoundsToFrameTransform</string>
@@ -663,16 +709,18 @@
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw7aAAA</bytes>
</object>
- <string>{{606, 570}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDSwAAwooAAA</bytes>
+ </object>
+ <string>{{165, 514}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw4kAAA</bytes>
</object>
<string>{{589, 578}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw58AAA</bytes>
- </object>
+ <object class="NSAffineTransform"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDeQAAw6aAAA</bytes>
@@ -699,7 +747,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">115</int>
+ <int key="maxID">117</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -843,6 +891,22 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.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">UILabel</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -883,6 +947,13 @@
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.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>
@@ -936,7 +1007,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
+ <integer value="1056" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -945,6 +1016,6 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">123</string>
+ <string key="IBCocoaTouchPluginVersion">132</string>
</data>
</archive>
Binary file project_files/HedgewarsMobile/Resources/Icons/checkbox.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/checkbox@2x.png has changed
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Sun Nov 28 23:49:09 2010 +0100
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1024</int>
+ <int key="IBDocument.SystemTarget">1056</int>
<string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
+ <string key="NS.object.0">132</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -72,7 +72,6 @@
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
- <string key="IBUINormalTitle">Single Game</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@@ -85,9 +84,9 @@
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
- <object class="NSCustomResource" key="IBUINormalBackgroundImage">
+ <object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">localplayButton.png</string>
+ <string key="NSResourceName">localplayButton~ipad.png</string>
</object>
</object>
<object class="IBUIButton" id="95106947">
@@ -537,6 +536,13 @@
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.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>
@@ -590,7 +596,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
+ <integer value="1056" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -604,7 +610,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>background.png</string>
- <string>localplayButton.png</string>
+ <string>localplayButton~ipad.png</string>
<string>savesButton.png</string>
<string>settingsButton.png</string>
<string>title~ipad.png</string>
@@ -618,6 +624,6 @@
<string>{540, 300}</string>
</object>
</object>
- <string key="IBCocoaTouchPluginVersion">123</string>
+ <string key="IBCocoaTouchPluginVersion">132</string>
</data>
</archive>
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Sun Nov 28 23:49:09 2010 +0100
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1024</int>
+ <int key="IBDocument.SystemTarget">1056</int>
<string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
+ <string key="NS.object.0">132</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -77,7 +77,7 @@
<object class="IBUIButton" id="124270424">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{208, 206}, {64, 64}}</string>
+ <string key="NSFrame">{{190, 200}, {100, 100}}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@@ -107,7 +107,7 @@
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">startButton.png</string>
+ <string key="NSResourceName">localplayButton~iphone.png</string>
</object>
</object>
<object class="IBUIButton" id="753723574">
@@ -255,9 +255,9 @@
<reference ref="249993817"/>
<reference ref="818907840"/>
<reference ref="171108356"/>
- <reference ref="124270424"/>
<reference ref="705508539"/>
<reference ref="753723574"/>
+ <reference ref="124270424"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -341,7 +341,7 @@
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDUAAAw2cAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDPgAAw5UAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
@@ -554,6 +554,13 @@
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.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>
@@ -607,7 +614,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
+ <integer value="1056" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -621,20 +628,20 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>background~iphone.png</string>
+ <string>localplayButton~iphone.png</string>
<string>savesButton.png</string>
<string>settingsButton.png</string>
- <string>startButton.png</string>
<string>title.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{480, 320}</string>
- <string>{64, 64}</string>
+ <string>{100, 100}</string>
<string>{64, 64}</string>
<string>{64, 64}</string>
<string>{270, 150}</string>
</object>
</object>
- <string key="IBCocoaTouchPluginVersion">123</string>
+ <string key="IBCocoaTouchPluginVersion">132</string>
</data>
</archive>
--- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Sun Nov 28 23:49:09 2010 +0100
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1024</int>
+ <int key="IBDocument.SystemTarget">1056</int>
<string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
+ <string key="NS.object.0">132</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -166,7 +166,7 @@
<object class="IBUILabel" id="743202682">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{88, 209}, {169, 29}}</string>
+ <string key="NSFrame">{{88, 210}, {169, 29}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -175,8 +175,8 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Label</string>
<object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">24</double>
+ <string key="NSName">Helvetica-Oblique</string>
+ <double key="NSSize">22</double>
<int key="NSfFlags">16</int>
</object>
<object class="NSColor" key="IBUITextColor">
@@ -825,6 +825,13 @@
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.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>
@@ -878,7 +885,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
+ <integer value="1056" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -891,6 +898,6 @@
<string key="NS.key.0">background~iphone.png</string>
<string key="NS.object.0">{480, 320}</string>
</object>
- <string key="IBCocoaTouchPluginVersion">123</string>
+ <string key="IBCocoaTouchPluginVersion">132</string>
</data>
</archive>
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowDown.png has changed
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowDown@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowLeft.png has changed
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowLeft@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowRight.png has changed
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowRight@2x.png has changed
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowUp.png has changed
Binary file project_files/HedgewarsMobile/Resources/Overlay/arrowUp@2x.png has changed
--- a/project_files/HedgewarsMobile/SDL.patch Sun Nov 28 01:58:43 2010 +0100
+++ b/project_files/HedgewarsMobile/SDL.patch Sun Nov 28 23:49:09 2010 +0100
@@ -1,7 +1,22 @@
-diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
---- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Oct 10 15:45:58 2010 -0700
-+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sat Oct 16 18:35:03 2010 +0200
-@@ -1549,15 +1549,19 @@
+diff -r 834ce48a19c2 Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
+--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun May 09 12:58:58 2010 +0800
++++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Sun Nov 28 18:14:58 2010 +0100
+@@ -1262,7 +1262,14 @@
+ isa = PBXProject;
+ buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SDLiPhoneOS" */;
+ compatibilityVersion = "Xcode 3.1";
++ developmentRegion = English;
+ hasScannedForEncodings = 1;
++ knownRegions = (
++ English,
++ Japanese,
++ French,
++ German,
++ );
+ mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
+ projectDirPath = "";
+ projectRoot = ../..;
+@@ -1549,15 +1556,19 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -18,11 +33,11 @@
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
- SDKROOT = iphoneos3.2;
-+ SDKROOT = iphoneos4.0;
++ SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
-@@ -1566,14 +1570,19 @@
+@@ -1566,14 +1577,19 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -40,13 +55,13 @@
IPHONEOS_DEPLOYMENT_TARGET = 3.1;
PREBINDING = NO;
- SDKROOT = iphoneos3.2;
-+ SDKROOT = iphoneos4.0;
++ SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
-diff -r c0021a587dc7 Xcode-iPhoneOS/SDL/testsdl-Info.plist
---- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Oct 10 15:45:58 2010 -0700
-+++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 Xcode-iPhoneOS/SDL/testsdl-Info.plist
+--- a/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun May 09 12:58:58 2010 +0800
++++ b/Xcode-iPhoneOS/SDL/testsdl-Info.plist Sun Nov 28 18:14:58 2010 +0100
@@ -16,7 +16,5 @@
<string>????</string>
<key>CFBundleVersion</key>
@@ -55,9 +70,9 @@
- <string>MainWindow</string>
</dict>
</plist>
-diff -r c0021a587dc7 include/SDL_config_iphoneos.h
---- a/include/SDL_config_iphoneos.h Sun Oct 10 15:45:58 2010 -0700
-+++ b/include/SDL_config_iphoneos.h Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 include/SDL_config_iphoneos.h
+--- a/include/SDL_config_iphoneos.h Sun May 09 12:58:58 2010 +0800
++++ b/include/SDL_config_iphoneos.h Sun Nov 28 18:14:58 2010 +0100
@@ -98,6 +98,8 @@
#define HAVE_COS 1
#define HAVE_COSF 1
@@ -93,9 +108,9 @@
+#define SDL_VIEW_TAG 456987
+
#endif /* _SDL_config_iphoneos_h */
-diff -r c0021a587dc7 src/SDL_fatal.c
---- a/src/SDL_fatal.c Sun Oct 10 15:45:58 2010 -0700
-+++ b/src/SDL_fatal.c Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 src/SDL_fatal.c
+--- a/src/SDL_fatal.c Sun May 09 12:58:58 2010 +0800
++++ b/src/SDL_fatal.c Sun Nov 28 18:14:58 2010 +0100
@@ -38,9 +38,9 @@
static void
SDL_Parachute(int sig)
@@ -108,9 +123,9 @@
}
static const int SDL_fatal_signals[] = {
-diff -r c0021a587dc7 src/video/SDL_renderer_gles.c
---- a/src/video/SDL_renderer_gles.c Sun Oct 10 15:45:58 2010 -0700
-+++ b/src/video/SDL_renderer_gles.c Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 src/video/SDL_renderer_gles.c
+--- a/src/video/SDL_renderer_gles.c Sun May 09 12:58:58 2010 +0800
++++ b/src/video/SDL_renderer_gles.c Sun Nov 28 18:14:58 2010 +0100
@@ -324,6 +324,9 @@
data->glDisable(GL_CULL_FACE);
data->updateSize = SDL_TRUE;
@@ -192,10 +207,10 @@
}
data->glDisable(GL_TEXTURE_2D);
-diff -r c0021a587dc7 src/video/SDL_video.c
---- a/src/video/SDL_video.c Sun Oct 10 15:45:58 2010 -0700
-+++ b/src/video/SDL_video.c Sat Oct 16 18:35:03 2010 +0200
-@@ -1416,9 +1416,9 @@
+diff -r 834ce48a19c2 src/video/SDL_video.c
+--- a/src/video/SDL_video.c Sun May 09 12:58:58 2010 +0800
++++ b/src/video/SDL_video.c Sun Nov 28 18:14:58 2010 +0100
+@@ -1421,9 +1421,9 @@
SDL_MinimizeWindow(window);
}
@@ -207,9 +222,9 @@
if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN))
&& _this->SetWindowGrab) {
_this->SetWindowGrab(_this, window);
-diff -r c0021a587dc7 src/video/uikit/SDL_uikitopengles.m
---- a/src/video/uikit/SDL_uikitopengles.m Sun Oct 10 15:45:58 2010 -0700
-+++ b/src/video/uikit/SDL_uikitopengles.m Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 src/video/uikit/SDL_uikitopengles.m
+--- a/src/video/uikit/SDL_uikitopengles.m Sun May 09 12:58:58 2010 +0800
++++ b/src/video/uikit/SDL_uikitopengles.m Sun Nov 28 18:14:58 2010 +0100
@@ -114,8 +114,8 @@
bBits: _this->gl_config.blue_size \
aBits: _this->gl_config.alpha_size \
@@ -221,9 +236,27 @@
/* add the view to our window */
[uiwindow addSubview: view ];
-diff -r c0021a587dc7 src/video/uikit/SDL_uikitview.m
---- a/src/video/uikit/SDL_uikitview.m Sun Oct 10 15:45:58 2010 -0700
-+++ b/src/video/uikit/SDL_uikitview.m Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 src/video/uikit/SDL_uikitview.h
+--- a/src/video/uikit/SDL_uikitview.h Sun May 09 12:58:58 2010 +0800
++++ b/src/video/uikit/SDL_uikitview.h Sun Nov 28 18:14:58 2010 +0100
+@@ -23,11 +23,11 @@
+ #include "SDL_stdinc.h"
+ #include "SDL_events.h"
+
+-#define IPHONE_TOUCH_EFFICIENT_DANGEROUS
+-#define FIXED_MULTITOUCH
++#undef IPHONE_TOUCH_EFFICIENT_DANGEROUS
++#undef FIXED_MULTITOUCH
+
+ #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
+-#define MAX_SIMULTANEOUS_TOUCHES 5
++#define MAX_SIMULTANEOUS_TOUCHES 0
+ #endif
+
+ /* *INDENT-OFF* */
+diff -r 834ce48a19c2 src/video/uikit/SDL_uikitview.m
+--- a/src/video/uikit/SDL_uikitview.m Sun May 09 12:58:58 2010 +0800
++++ b/src/video/uikit/SDL_uikitview.m Sun Nov 28 18:14:58 2010 +0100
@@ -35,9 +35,6 @@
@implementation SDL_uikitview
@@ -335,24 +368,24 @@
if (NULL == view) {
SDL_SetError("Window has no view");
-diff -r c0021a587dc7 src/video/uikit/SDL_uikitwindow.m
---- a/src/video/uikit/SDL_uikitwindow.m Sun Oct 10 15:45:58 2010 -0700
-+++ b/src/video/uikit/SDL_uikitwindow.m Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 src/video/uikit/SDL_uikitwindow.m
+--- a/src/video/uikit/SDL_uikitwindow.m Sun May 09 12:58:58 2010 +0800
++++ b/src/video/uikit/SDL_uikitwindow.m Sun Nov 28 18:14:58 2010 +0100
@@ -144,7 +144,10 @@
if (SDL_UIKit_supports_multiple_displays) {
[uiwindow setScreen:uiscreen];
}
-
+
-+ if ([[UIScreen screens] count] > 1)
++ if ([UIScreen respondsToSelector:@selector(screens)] && [[UIScreen screens] count] > 1)
+ uiwindow.screen = [[UIScreen screens] objectAtIndex:1];
+
if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) {
[uiwindow release];
return -1;
-diff -r c0021a587dc7 src/video/uikit/keyinfotable.h
---- a/src/video/uikit/keyinfotable.h Sun Oct 10 15:45:58 2010 -0700
-+++ b/src/video/uikit/keyinfotable.h Sat Oct 16 18:35:03 2010 +0200
+diff -r 834ce48a19c2 src/video/uikit/keyinfotable.h
+--- a/src/video/uikit/keyinfotable.h Sun May 09 12:58:58 2010 +0800
++++ b/src/video/uikit/keyinfotable.h Sun Nov 28 18:14:58 2010 +0100
@@ -54,7 +54,7 @@
/* 10 */ { SDL_SCANCODE_UNKNOWN, 0 },
/* 11 */ { SDL_SCANCODE_UNKNOWN, 0 },
