# HG changeset patch
# User koda
# Date 1269558110 0
# Node ID 0092dc37fbd65d6f5e7ff4361186c84291d89b6e
# Parent 62eb6095497b2ffd34473ba263d765cdd9e00f4c
reworked interaction of engine/frontend when closing
added a corner button for general actions during game
diff -r 62eb6095497b -r 0092dc37fbd6 cocoaTouch/MainMenuViewController.m
--- a/cocoaTouch/MainMenuViewController.m Thu Mar 25 02:02:53 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m Thu Mar 25 23:01:50 2010 +0000
@@ -113,6 +113,8 @@
-(void) appear {
[[SDLUIKitDelegate sharedAppDelegate].uiwindow addSubview:self.view];
+ [self release];
+
[UIView beginAnimations:@"inserting main controller" context:NULL];
[UIView setAnimationDuration:1];
self.view.alpha = 1;
@@ -124,6 +126,8 @@
[UIView setAnimationDuration:1];
self.view.alpha = 0;
[UIView commitAnimations];
+
+ [self retain];
[self.view removeFromSuperview];
}
diff -r 62eb6095497b -r 0092dc37fbd6 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Thu Mar 25 02:02:53 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Thu Mar 25 23:01:50 2010 +0000
@@ -31,6 +31,7 @@
UIWindow *uiwindow;
MainMenuViewController *viewController;
overlayViewController *overlayController;
+ BOOL isInGame;
}
@property (readwrite, assign) SDL_Window *window;
diff -r 62eb6095497b -r 0092dc37fbd6 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Thu Mar 25 02:02:53 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Thu Mar 25 23:01:50 2010 +0000
@@ -57,11 +57,11 @@
self.window = NULL;
self.viewController = nil;
self.overlayController = nil;
+ isInGame = NO;
return self;
}
-(void) dealloc {
- [viewController release];
[uiwindow release];
[super dealloc];
}
@@ -79,12 +79,14 @@
// overlay with controls, become visible after 2 seconds
overlayController = [[overlayViewController alloc] initWithNibName:@"overlayViewController" bundle:nil];
[uiwindow addSubview:overlayController.view];
-
+ [overlayController release];
+
+ isInGame = YES;
Game(gameArgs); // this is the pascal fuction that starts the game
+ isInGame = NO;
free(gameArgs);
[overlayController.view removeFromSuperview];
- [overlayController release];
[viewController appear];
}
@@ -105,30 +107,35 @@
self.uiwindow.backgroundColor = [UIColor blackColor];
self.viewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController" bundle:nil];
+ [uiwindow addSubview:viewController.view];
+ [viewController release];
// Set working directory to resource path
[[NSFileManager defaultManager] changeCurrentDirectoryPath: [[NSBundle mainBundle] resourcePath]];
- [uiwindow addSubview:viewController.view];
[uiwindow makeKeyAndVisible];
[uiwindow layoutSubviews];
}
-(void) applicationWillTerminate:(UIApplication *)application {
SDL_SendQuit();
- // hack to prevent automatic termination. See SDL_uikitevents.m for details
- // have to remove this otherwise game goes on when pushing the home button
- //longjmp(*(jump_env()), 1);
+ if (isInGame) {
+ HW_terminate(YES);
+ // hack to prevent automatic termination. See SDL_uikitevents.m for details
+ longjmp(*(jump_env()), 1);
+ }
}
-(void) applicationWillResignActive:(UIApplication *)application {
- //NSLog(@"%@", NSStringFromSelector(_cmd));
- SDL_SendWindowEvent(self.window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
+ NSLog(@"%@", NSStringFromSelector(_cmd));
+ if (isInGame) HW_pause();
+ //SDL_SendWindowEvent(self.window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
}
-(void) applicationDidBecomeActive:(UIApplication *)application {
- //NSLog(@"%@", NSStringFromSelector(_cmd));
- SDL_SendWindowEvent(self.window, SDL_WINDOWEVENT_RESTORED, 0, 0);
+ NSLog(@"%@", NSStringFromSelector(_cmd));
+ if (isInGame) HW_pause();
+ //SDL_SendWindowEvent(self.window, SDL_WINDOWEVENT_RESTORED, 0, 0);
}
@end
diff -r 62eb6095497b -r 0092dc37fbd6 cocoaTouch/iPad/overlayViewController.xib
--- a/cocoaTouch/iPad/overlayViewController.xib Thu Mar 25 02:02:53 2010 +0000
+++ b/cocoaTouch/iPad/overlayViewController.xib Thu Mar 25 23:01:50 2010 +0000
@@ -100,7 +100,7 @@
<object class="IBUIButton" id="590902961">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{960, 690}, {64, 48}}</string>
+ <string key="NSFrame">{{964, 690}, {64, 48}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -123,7 +123,7 @@
<object class="IBUIButton" id="132251648">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{915, 665}, {64, 50}}</string>
+ <string key="NSFrame">{{919, 665}, {64, 50}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -143,7 +143,7 @@
<object class="IBUIButton" id="752933969">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{904, 719}, {61, 49}}</string>
+ <string key="NSFrame">{{908, 723}, {61, 45}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -206,6 +206,27 @@
<string key="NSResourceName">arrowDown.png</string>
</object>
</object>
+ <object class="IBUIButton" id="873773099">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{956, -5}, {72, 64}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <reference key="IBUIFont" ref="969592940"/>
+ <reference key="IBUIHighlightedTitleColor" ref="708011311"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="280149554"/>
+ <object class="NSCustomResource" key="IBUINormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">menuCorner.png</string>
+ </object>
+ </object>
</object>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview"/>
@@ -484,6 +505,15 @@
</object>
<int key="connectionID">57</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">showPopover</string>
+ <reference key="source" ref="873773099"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">59</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -503,9 +533,10 @@
<reference ref="123494776"/>
<reference ref="261686746"/>
<reference ref="81315603"/>
- <reference ref="752933969"/>
+ <reference ref="873773099"/>
<reference ref="590902961"/>
<reference ref="132251648"/>
+ <reference ref="752933969"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -562,6 +593,11 @@
<reference key="parent" ref="191373211"/>
<string key="objectName">push3</string>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
+ <reference key="object" ref="873773099"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -579,12 +615,14 @@
<string>43.IBPluginDependency</string>
<string>48.IBPluginDependency</string>
<string>53.IBPluginDependency</string>
+ <string>58.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>overlayViewController</string>
<string>UIResponder</string>
- <string>{{226, 336}, {1024, 768}}</string>
+ <string>{{-49, 273}, {1024, 768}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -611,7 +649,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">57</int>
+ <int key="maxID">59</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -625,11 +663,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>buttonPressed:</string>
<string>buttonReleased:</string>
+ <string>showPopover</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="IBClassDescriptionSource" key="sourceIdentifier">
@@ -661,6 +701,7 @@
<string>arrowRight.png</string>
<string>arrowUp.png</string>
<string>joyPush.png</string>
+ <string>menuCorner.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -669,6 +710,7 @@
<string>{64, 64}</string>
<string>{64, 64}</string>
<string>{64, 64}</string>
+ <string>{64, 64}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">87</string>
diff -r 62eb6095497b -r 0092dc37fbd6 cocoaTouch/otherSrc/PascalImports.h
--- a/cocoaTouch/otherSrc/PascalImports.h Thu Mar 25 02:02:53 2010 +0000
+++ b/cocoaTouch/otherSrc/PascalImports.h Thu Mar 25 23:01:50 2010 +0000
@@ -42,6 +42,8 @@
void HW_chat(void);
void HW_tab(void);
void HW_pause(void);
+
+ void HW_terminate(BOOL);
#ifdef __cplusplus
}
diff -r 62eb6095497b -r 0092dc37fbd6 cocoaTouch/overlayViewController.h
--- a/cocoaTouch/overlayViewController.h Thu Mar 25 02:02:53 2010 +0000
+++ b/cocoaTouch/overlayViewController.h Thu Mar 25 23:01:50 2010 +0000
@@ -11,19 +11,20 @@
@interface overlayViewController : UIViewController {
NSTimer *dimTimer;
+
CGFloat initialDistanceForPinching;
CGPoint gestureStartPoint;
}
@property (nonatomic,retain) NSTimer *dimTimer;
-
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;
-(IBAction) buttonReleased:(id) sender;
-(IBAction) buttonPressed:(id) sender;
+-(IBAction) showPopover;
-(void) dimOverlay;
-(void) showMenuAfterwards;
diff -r 62eb6095497b -r 0092dc37fbd6 cocoaTouch/overlayViewController.m
--- a/cocoaTouch/overlayViewController.m Thu Mar 25 02:02:53 2010 +0000
+++ b/cocoaTouch/overlayViewController.m Thu Mar 25 23:01:50 2010 +0000
@@ -11,6 +11,8 @@
#import "PascalImports.h"
#import "CGPointUtils.h"
#import "SDL_mouse.h"
+#import "SettingsViewController.h"
+#import "popupMenuViewController.h"
@implementation overlayViewController
@synthesize dimTimer;
@@ -89,7 +91,7 @@
-(IBAction) buttonPressed:(id) sender {
[self activateOverlay];
- UIButton *theButton = (UIButton*)sender;
+ UIButton *theButton = (UIButton *)sender;
switch (theButton.tag) {
case 0:
HW_walkLeft();
@@ -112,12 +114,55 @@
case 6:
HW_backjump();
break;
+ case 7:
+ HW_pause();
+ break;
+ case 8:
+ HW_chat();
+ break;
default:
+ NSLog(@"Nope");
// HW_chat() HW_tab() HW_pause()
break;
}
}
+-(IBAction) showPopover{
+ //UIViewController *content = [[UIViewController alloc] initWithNibName: nil bundle:nil];
+ //CGRect rectArea = CGRectMake(0, 0, 320, 480);
+ //content.view.frame = rectArea;
+ //settings.view.frame = rectArea;
+ popupMenuViewController *popupMenu = [[UIViewController alloc] initWithNibName:@"popupMenuViewController" bundle:nil];
+
+ UIButton *buttonPause = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+ buttonPause.tag = 7;
+ buttonPause.frame = CGRectMake(100, 170, 170, 30);
+ [buttonPause setTitle:@"Pause Game" forState:UIControlStateNormal];
+ [buttonPause addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside];
+ [popupMenu.view addSubview:buttonPause];
+
+ UIButton *buttonChat = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+ buttonChat.tag = 8;
+ buttonChat.frame = CGRectMake(100, 220, 170, 30);
+ [buttonChat setTitle:@"Chat" forState:UIControlStateNormal];
+ [buttonChat addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside];
+ [popupMenu.view addSubview: buttonChat];
+
+
+ UIPopoverController* aPopover = [[UIPopoverController alloc] initWithContentViewController:popupMenu];
+ //[aPopover setPopoverContentSize:CGSizeMake(320, 480) animated:YES];
+
+ [aPopover presentPopoverFromRect: CGRectMake(1024, 0, 320, 480) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionDown animated:YES];
+ //UIBarButtonItem *sender = [[useless items] objectAtIndex:1];
+ //[self.popoverController presentPopoverFromBarButtonItem:sender permittedArrowDirections:UIPopoverArrowDirectionDown animated:YES];
+ //aPopover.popoverContentSize = CGSizeMake(320, 480);
+
+ /*SettingsViewController *settings = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController" bundle:nil];
+ UIPopoverController *popover = [[UIPopoverController alloc] initWithContentViewController:settings];
+ [self.view addSubview:popover.contentViewController.view];*/
+}
+
+
#pragma mark -
#pragma mark Custom SDL_UIView input handling
#define kMinimumPinchDelta 50
diff -r 62eb6095497b -r 0092dc37fbd6 hedgewars/PascalExports.pas
--- a/hedgewars/PascalExports.pas Thu Mar 25 02:02:53 2010 +0000
+++ b/hedgewars/PascalExports.pas Thu Mar 25 23:01:50 2010 +0000
@@ -13,42 +13,14 @@
unit PascalExports;
interface
-uses uKeys, uConsole;
+uses uKeys, uConsole, hwengine;
{$INCLUDE "config.inc"}
-{$IFDEF IPHONEOS}
-// called by pascal code, they deal with the objc code
-function IPH_getDocumentsPath: PChar; cdecl; external;
-procedure IPH_showControls; cdecl; external;
-{$ENDIF}
-
-{$IFDEF HWLIBRARY}
-// retrieve protocol information
-procedure HW_versionInfo(netProto: PShortInt; versionStr: PString); cdecl; export;
-
-// called by the touch functions (SDL_uikitview.m)
-// they emulate user interaction from mouse or keyboard
-procedure HW_click; cdecl; export;
-procedure HW_zoomIn; cdecl; export;
-procedure HW_zoomOut; cdecl; export;
-procedure HW_zoomReset; cdecl; export;
-procedure HW_ammoMenu; cdecl; export;
-procedure HW_allKeysUp; cdecl; export;
-procedure HW_walkLeft; cdecl; export;
-procedure HW_walkRight; cdecl; export;
-procedure HW_aimUp; cdecl; export;
-procedure HW_aimDown; cdecl; export;
-procedure HW_shoot; cdecl; export;
-procedure HW_whereIsHog; cdecl; export;
-procedure HW_chat; cdecl; export;
-procedure HW_pause; cdecl; export;
-procedure HW_tab; cdecl; export;
-{$ENDIF}
-
implementation
{$IFDEF HWLIBRARY}
+// retrieve protocol information
procedure HW_versionInfo(netProto: PShortInt; versionStr: PString); cdecl; export;
begin
if netProto <> nil then netProto^:= cNetProtoVersion;
@@ -144,6 +116,12 @@
exit
end;
+
+procedure HW_terminate(closeFrontend: boolean); cdecl; export;
+begin
+ isTerminated:= true;
+ if closeFrontend then alsoShutdownFrontend:= true;
+end;
{$ENDIF}
end.
diff -r 62eb6095497b -r 0092dc37fbd6 hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas Thu Mar 25 02:02:53 2010 +0000
+++ b/hedgewars/hwengine.pas Thu Mar 25 23:01:50 2010 +0000
@@ -59,7 +59,6 @@
uChat in 'uChat.pas',
uLandTexture in 'uLandTexture.pas',
uScript in 'uScript.pas',
- {$IFDEF IPHONEOS}PascalExports in 'PascalExports.pas',{$ENDIF}
sysutils;
// also: GSHandlers.inc
@@ -70,6 +69,8 @@
{$IFDEF HWLIBRARY}
type arrayofpchar = array[0..7] of PChar;
+var isTerminated: boolean = false;
+ alsoShutdownFrontend: boolean = false;
procedure initEverything;
procedure freeEverything;
@@ -161,6 +162,7 @@
CloseIPC();
TTF_Quit();
SDL_Quit();
+ isTerminated:= false;
end;
///////////////////
@@ -169,7 +171,8 @@
{$IFNDEF IPHONEOS}event: TSDL_Event;{$ENDIF}
begin
PrevTime:= SDL_GetTicks;
- repeat
+ while isTerminated = false do
+ begin
{$IFNDEF IPHONEOS}
// have to remove this cycle because otherwise it segfaults at exit
while SDL_PollEvent(@event) <> 0 do
@@ -194,14 +197,18 @@
end; // end case event.type_ of
end; // end while SDL_PollEvent(@event) <> 0 do
{$ENDIF}
- CurrTime:= SDL_GetTicks;
- if PrevTime + cTimerInterval <= CurrTime then
+ if isTerminated = false then
begin
- DoTimer(CurrTime - PrevTime);
- PrevTime:= CurrTime
- end else SDL_Delay(1);
- if isTerminated = false then IPCCheckSock();
- until isTerminated;
+ CurrTime:= SDL_GetTicks;
+ if PrevTime + cTimerInterval <= CurrTime then
+ begin
+ DoTimer(CurrTime - PrevTime);
+ PrevTime:= CurrTime
+ end
+ else SDL_Delay(1);
+ IPCCheckSock();
+ end;
+ end;
end;
/////////////////////////
@@ -303,6 +310,11 @@
MainLoop();
OnDestroy();
+ if alsoShutdownFrontend then
+ begin
+ alsoShutdownFrontend:= false;
+ halt;
+ end;
end;
procedure initEverything;
@@ -568,7 +580,7 @@
if GameType = gmtLandPreview then
begin
GenLandPreview();
- // freeEverything() TODO - Koda, please check if this is needed here.
+ freeEverything();
end
else if GameType = gmtSyntax then DisplayUsage()
else Game();
diff -r 62eb6095497b -r 0092dc37fbd6 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Thu Mar 25 02:02:53 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Thu Mar 25 23:01:50 2010 +0000
@@ -197,6 +197,8 @@
6179936E11501D3D00BA94A9 /* arrowUp.png in Resources */ = {isa = PBXBuildFile; fileRef = 6179936A11501D3D00BA94A9 /* arrowUp.png */; };
617993A01150226700BA94A9 /* overlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; };
617995321150403800BA94A9 /* joyPush.png in Resources */ = {isa = PBXBuildFile; fileRef = 617995311150403800BA94A9 /* joyPush.png */; };
+ 618AFBEF115BE8AE003D411B /* popupMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; };
+ 618AFBF1115BE8B6003D411B /* popupMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 618AFBF0115BE8B6003D411B /* popupMenuViewController.xib */; };
61C0838A11567C83005D474F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C0838911567C83005D474F /* CoreGraphics.framework */; };
61E2F06911567CC7002D33C1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61E2F06811567CC7002D33C1 /* CoreGraphics.framework */; };
922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; };
@@ -387,6 +389,9 @@
6179939D1150226700BA94A9 /* overlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlayViewController.h; path = ../../cocoaTouch/overlayViewController.h; sourceTree = SOURCE_ROOT; };
6179939E1150226700BA94A9 /* overlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = overlayViewController.m; path = ../../cocoaTouch/overlayViewController.m; sourceTree = SOURCE_ROOT; };
617995311150403800BA94A9 /* joyPush.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyPush.png; path = ../../cocoaTouch/resources/joyPush.png; sourceTree = SOURCE_ROOT; };
+ 618AFBED115BE8AE003D411B /* popupMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = popupMenuViewController.h; path = ../../cocoaTouch/popupMenuViewController.h; sourceTree = SOURCE_ROOT; };
+ 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = popupMenuViewController.m; path = ../../cocoaTouch/popupMenuViewController.m; sourceTree = SOURCE_ROOT; };
+ 618AFBF0115BE8B6003D411B /* popupMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = popupMenuViewController.xib; path = ../../cocoaTouch/iPad/popupMenuViewController.xib; sourceTree = SOURCE_ROOT; };
61C0838911567C83005D474F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
61E2F06811567CC7002D33C1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -452,6 +457,8 @@
61798860114AA49D00BA94A9 /* SDLOverrides */,
6179939D1150226700BA94A9 /* overlayViewController.h */,
6179939E1150226700BA94A9 /* overlayViewController.m */,
+ 618AFBED115BE8AE003D411B /* popupMenuViewController.h */,
+ 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */,
);
path = Classes;
sourceTree = "<group>";
@@ -545,6 +552,7 @@
611FD990115590E700C2203D /* MainMenuViewController.xib */,
611FD992115590E700C2203D /* SettingsViewController.xib */,
611FDB3B1155BB9E00C2203D /* overlayViewController.xib */,
+ 618AFBF0115BE8B6003D411B /* popupMenuViewController.xib */,
);
name = "Resources-iPad";
sourceTree = "<group>";
@@ -910,6 +918,7 @@
611FD9D21155A41000C2203D /* Multiplayer.png in Resources */,
611FDB3C1155BB9E00C2203D /* overlayViewController.xib in Resources */,
611FDB641155BFFF00C2203D /* Default.png in Resources */,
+ 618AFBF1115BE8B6003D411B /* popupMenuViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1092,6 +1101,7 @@
6100DABA115446B000F455E0 /* TeamMenuViewController.m in Sources */,
6100DABB115446B000F455E0 /* GameSetup.m in Sources */,
6100DABC115446B000F455E0 /* overlayViewController.m in Sources */,
+ 618AFBEF115BE8AE003D411B /* popupMenuViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1230,13 +1240,17 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -vwi -B -Sgix";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
- FPC_SPECIFIC_OPTIONS = "-ghttt -gw2 -O-";
+ FPC_SPECIFIC_OPTIONS = "-dDEBUGFILE -O- -gl -gw2 -gs -godwarfsets -gt -ghttt -Xs-";
FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_DEBUGGING_SYMBOLS = full;
+ GCC_FAST_MATH = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
GCC_THUMB_SUPPORT = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -1262,13 +1276,16 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "Don't Code Sign";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -vwi -B -Sgix -Cfvfpv2";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
- FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs";
+ FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs -Cfvfpv2";
FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_DEBUGGING_SYMBOLS = default;
+ GCC_FAST_MATH = YES;
+ GCC_OPTIMIZATION_LEVEL = 2;
GCC_THUMB_SUPPORT = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
diff -r 62eb6095497b -r 0092dc37fbd6 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Thu Mar 25 02:02:53 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Thu Mar 25 23:01:50 2010 +0000
@@ -197,7 +197,49 @@
<key>Notifications</key>
<array/>
<key>OpenEditors</key>
- <array/>
+ <array>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>619F1DBE115C173800A32B0B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>overlayViewController.m</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>619F1DBF115C173800A32B0B</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>overlayViewController.m</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>6107A251115C289600BAD238</string>
+ <key>history</key>
+ <array>
+ <string>6107A213115C25EE00BAD238</string>
+ <string>6107A214115C25EE00BAD238</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {927, 621}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>722 248 927 662 0 0 1920 1178 </string>
+ </dict>
+ </dict>
+ </array>
<key>PerspectiveWidths</key>
<array>
<integer>-1</integer>
@@ -265,20 +307,20 @@
<array>
<string>29B97314FDCFA39411CA2CEA</string>
<string>080E96DDFE201D6D7F000001</string>
+ <string>6100DAD4115446B000F455E0</string>
<string>1C37FBAC04509CD000000102</string>
- <string>61E2F0B81156C9FD002D33C1</string>
<string>1C37FABC05509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>18</integer>
- <integer>17</integer>
+ <integer>23</integer>
<integer>14</integer>
+ <integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 558}}</string>
+ <string>{{0, 6}, {186, 558}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -297,7 +339,7 @@
<real>186</real>
</array>
<key>RubberWindowFrame</key>
- <string>460 405 801 617 0 0 1920 1178 </string>
+ <string>977 203 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -313,7 +355,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>uFloat.pas</string>
+ <string>popupMenuViewController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -321,11 +363,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>uFloat.pas</string>
+ <string>popupMenuViewController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>61E2F0C51156CAF1002D33C1</string>
+ <string>6107A250115C289600BAD238</string>
<key>history</key>
<array>
<string>6179889C114AA5BD00BA94A9</string>
@@ -343,7 +385,6 @@
<string>6179943111502CEA00BA94A9</string>
<string>6194CC0711505FCF00A4BA5C</string>
<string>6194CCFC1151E00900A4BA5C</string>
- <string>611FD81C1155111700C2203D</string>
<string>611FD81D1155111700C2203D</string>
<string>611FD81E1155111700C2203D</string>
<string>611FD81F1155111700C2203D</string>
@@ -364,7 +405,6 @@
<string>611FD9AE115594B400C2203D</string>
<string>611FD9D51155A4B900C2203D</string>
<string>611FD9F41155A8F500C2203D</string>
- <string>611FDA441155AEBF00C2203D</string>
<string>611FDAC41155B77500C2203D</string>
<string>611FDADF1155B83200C2203D</string>
<string>611FDB471155BCE500C2203D</string>
@@ -374,18 +414,22 @@
<string>611FDB6D1155C0B300C2203D</string>
<string>611FDB6E1155C0B300C2203D</string>
<string>611FDBF51155D39400C2203D</string>
- <string>611FDBF61155D39400C2203D</string>
<string>611FDBF71155D39400C2203D</string>
<string>611FDC1A1155D8E400C2203D</string>
<string>611FDC1B1155D8E400C2203D</string>
<string>61C0838F11567CA9005D474F</string>
- <string>61E2F07E1156B170002D33C1</string>
<string>61E2F07F1156B170002D33C1</string>
<string>61E2F0801156B170002D33C1</string>
<string>61E2F0811156B170002D33C1</string>
<string>61E2F0821156B170002D33C1</string>
<string>61E2F0831156B170002D33C1</string>
- <string>61E2F0881156C6B9002D33C1</string>
+ <string>618AFC06115BE92A003D411B</string>
+ <string>618AFC07115BE92A003D411B</string>
+ <string>618AFC14115BEA91003D411B</string>
+ <string>618AFC15115BEA91003D411B</string>
+ <string>6107A1C0115C232E00BAD238</string>
+ <string>6107A205115C259400BAD238</string>
+ <string>6107A218115C260B00BAD238</string>
</array>
</dict>
<key>SplitCount</key>
@@ -397,14 +441,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {593, 73}}</string>
+ <string>{{0, 0}, {593, 171}}</string>
<key>RubberWindowFrame</key>
- <string>460 405 801 617 0 0 1920 1178 </string>
+ <string>977 203 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>73pt</string>
+ <string>171pt</string>
</dict>
<dict>
<key>BecomeActive</key>
@@ -419,14 +463,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 78}, {593, 498}}</string>
+ <string>{{0, 176}, {593, 400}}</string>
<key>RubberWindowFrame</key>
- <string>460 405 801 617 0 0 1920 1178 </string>
+ <string>977 203 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>498pt</string>
+ <string>400pt</string>
</dict>
</array>
<key>Proportion</key>
@@ -445,9 +489,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>61E2F0A21156C970002D33C1</string>
+ <string>6107A16A115C1B3B00BAD238</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>61E2F0A31156C970002D33C1</string>
+ <string>6107A16B115C1B3B00BAD238</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -585,13 +629,17 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>1C78EAAD065D492600B07095</string>
+ <string>6107A24F115C287800BAD238</string>
+ <string>6107A17E115C1B6D00BAD238</string>
+ <string>6107A177115C1B3B00BAD238</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>61798848114AA42600BA94A9</string>
<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
+ <string>1C78EAAD065D492600B07095</string>
+ <string>619F1DBE115C173800A32B0B</string>
</array>
<key>WindowString</key>
- <string>460 405 801 617 0 0 1920 1178 </string>
+ <string>977 203 801 617 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -612,7 +660,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string></string>
+ <string>overlayViewController.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -670,7 +718,7 @@
<key>TableOfContents</key>
<array>
<string>61798848114AA42600BA94A9</string>
- <string>61E2F0A41156C970002D33C1</string>
+ <string>6107A15F115C196800BAD238</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -714,8 +762,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {316, 203}}</string>
- <string>{{316, 0}, {378, 203}}</string>
+ <string>{{0, 0}, {347, 190}}</string>
+ <string>{{0, 190}, {347, 191}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -730,8 +778,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {694, 203}}</string>
- <string>{{0, 203}, {694, 178}}</string>
+ <string>{{0, 0}, {347, 381}}</string>
+ <string>{{347, 0}, {347, 381}}</string>
</array>
</dict>
</dict>
@@ -757,19 +805,21 @@
<key>DebugVariablesTableConfiguration</key>
<array>
<string>Name</string>
- <real>143</real>
+ <real>120</real>
<string>Value</string>
- <real>108</real>
+ <real>85</real>
<string>Summary</string>
- <real>102</real>
+ <real>80</real>
+ <string>Type</string>
+ <real>84</real>
</array>
<key>Frame</key>
- <string>{{316, 0}, {378, 203}}</string>
+ <string>{{0, 190}, {347, 191}}</string>
<key>RubberWindowFrame</key>
- <string>740 517 694 422 0 0 1920 1178 </string>
+ <string>588 485 694 422 0 0 1920 1178 </string>
</dict>
<key>RubberWindowFrame</key>
- <string>740 517 694 422 0 0 1920 1178 </string>
+ <string>588 485 694 422 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
@@ -792,18 +842,18 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>61E2F0A51156C970002D33C1</string>
+ <string>6107A16F115C1B3B00BAD238</string>
<string>1C162984064C10D400B95A72</string>
- <string>61E2F0A61156C970002D33C1</string>
- <string>61E2F0A71156C970002D33C1</string>
- <string>61E2F0A81156C970002D33C1</string>
- <string>61E2F0A91156C970002D33C1</string>
- <string>61E2F0AA1156C970002D33C1</string>
+ <string>6107A170115C1B3B00BAD238</string>
+ <string>6107A171115C1B3B00BAD238</string>
+ <string>6107A172115C1B3B00BAD238</string>
+ <string>6107A173115C1B3B00BAD238</string>
+ <string>6107A174115C1B3B00BAD238</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
- <string>740 517 694 422 0 0 1920 1178 </string>
+ <string>588 485 694 422 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
@@ -939,7 +989,7 @@
<key>Frame</key>
<string>{{0, 0}, {656, 344}}</string>
<key>RubberWindowFrame</key>
- <string>482 555 656 385 0 0 1920 1178 </string>
+ <string>1100 641 656 385 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@@ -962,17 +1012,17 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>61E2F0AB1156C970002D33C1</string>
+ <string>6107A175115C1B3B00BAD238</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>482 555 656 385 0 0 1920 1178 </string>
+ <string>1100 641 656 385 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>Identifier</key>
@@ -1109,10 +1159,12 @@
<string>743 379 452 308 0 0 1280 1002 </string>
</dict>
<dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
<key>Identifier</key>
<string>windowTool.breakpoints</string>
<key>IsVertical</key>
- <integer>0</integer>
+ <false/>
<key>Layout</key>
<array>
<dict>
@@ -1120,7 +1172,7 @@
<array>
<dict>
<key>BecomeActive</key>
- <integer>1</integer>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -1149,10 +1201,18 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array>
<string>1C77FABC04509CD000000102</string>
+ <string>1C3E0DCA080725EA00A55177</string>
+ <string>1C3E0DCA080725EA00A55177</string>
+ <string>1C3E0DCA080725EA00A55177</string>
+ <string>1C3E0DCA080725EA00A55177</string>
+ <string>1C3E0DCA080725EA00A55177</string>
+ <string>1C3E0DCA080725EA00A55177</string>
+ <string>1C3E0DCC080725EA11A45113</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
+ <integer>1</integer>
<integer>0</integer>
</array>
</array>
@@ -1162,7 +1222,7 @@
<key>PBXTopSmartGroupGIDs</key>
<array/>
<key>XCIncludePerspectivesSwitch</key>
- <integer>0</integer>
+ <false/>
</dict>
<key>GeometryConfiguration</key>
<dict>
@@ -1174,7 +1234,7 @@
<real>168</real>
</array>
<key>RubberWindowFrame</key>
- <string>315 424 744 409 0 0 1440 878 </string>
+ <string>264 599 744 409 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -1194,7 +1254,7 @@
<key>Frame</key>
<string>{{190, 0}, {554, 368}}</string>
<key>RubberWindowFrame</key>
- <string>315 424 744 409 0 0 1440 878 </string>
+ <string>264 599 744 409 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -1218,22 +1278,22 @@
<string>XCDetailModule</string>
</array>
<key>StatusbarIsVisible</key>
- <integer>1</integer>
+ <true/>
<key>TableOfContents</key>
<array>
- <string>1CDDB66807F98D9800BB5817</string>
- <string>1CDDB66907F98D9800BB5817</string>
+ <string>619F1DB4115C170100A32B0B</string>
+ <string>619F1DB5115C170100A32B0B</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>1CA1AED706398EBD00589147</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.breakpointsV3</string>
<key>WindowString</key>
- <string>315 424 744 409 0 0 1440 878 </string>
+ <string>264 599 744 409 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
- <string>1CDDB66807F98D9800BB5817</string>
+ <string>619F1DB4115C170100A32B0B</string>
<key>WindowToolIsVisible</key>
- <integer>1</integer>
+ <true/>
</dict>
<dict>
<key>Identifier</key>
@@ -1330,16 +1390,18 @@
<string>50 850 472 307 0 0 1440 877</string>
</dict>
<dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
<key>Identifier</key>
<string>windowTool.classBrowser</string>
+ <key>IsVertical</key>
+ <true/>
<key>Layout</key>
<array>
<dict>
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <integer>1</integer>
<key>ContentConfiguration</key>
<dict>
<key>OptionsSetName</key>
@@ -1352,7 +1414,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>ClassesFrame</key>
- <string>{{0, 0}, {374, 96}}</string>
+ <string>{{0, 0}, {378, 96}}</string>
<key>ClassesTreeTableConfiguration</key>
<array>
<string>PBXClassNameColumnIdentifier</string>
@@ -1361,9 +1423,9 @@
<real>22</real>
</array>
<key>Frame</key>
- <string>{{0, 0}, {630, 331}}</string>
+ <string>{{0, 0}, {630, 332}}</string>
<key>MembersFrame</key>
- <string>{{0, 105}, {374, 395}}</string>
+ <string>{{0, 101}, {378, 231}}</string>
<key>MembersTreeTableConfiguration</key>
<array>
<string>PBXMemberTypeIconColumnIdentifier</string>
@@ -1371,14 +1433,12 @@
<string>PBXMemberNameColumnIdentifier</string>
<real>216</real>
<string>PBXMemberTypeColumnIdentifier</string>
- <real>97</real>
+ <real>101</real>
<string>PBXMemberBookColumnIdentifier</string>
<real>22</real>
</array>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <integer>1</integer>
<key>RubberWindowFrame</key>
- <string>385 179 630 352 0 0 1440 878 </string>
+ <string>503 565 630 352 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXClassBrowserModule</string>
@@ -1397,21 +1457,21 @@
<string>PBXClassBrowserModule</string>
</array>
<key>StatusbarIsVisible</key>
- <integer>0</integer>
+ <false/>
<key>TableOfContents</key>
<array>
<string>1C0AD2AF069F1E9B00FABCE6</string>
- <string>1C0AD2B0069F1E9B00FABCE6</string>
+ <string>619F1DA8115C156500A32B0B</string>
<string>1CA6456E063B45B4001379D8</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.classbrowser</string>
<key>WindowString</key>
- <string>385 179 630 352 0 0 1440 878 </string>
+ <string>503 565 630 352 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C0AD2AF069F1E9B00FABCE6</string>
<key>WindowToolIsVisible</key>
- <integer>0</integer>
+ <false/>
</dict>
<dict>
<key>Identifier</key>
diff -r 62eb6095497b -r 0092dc37fbd6 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Thu Mar 25 02:02:53 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Thu Mar 25 23:01:50 2010 +0000
@@ -15,15 +15,42 @@
6100DA6E115446B000F455E0 /* iHedgewars */,
);
breakpoints = (
- 611FDAC31155B77100C2203D /* malloc_error_break */,
- 611FDACE1155B78800C2203D /* malloc_error_break */,
+ 6107A201115C259000BAD238 /* popupMenuViewController.m:58 */,
);
codeSenseManager = 617987E0114AA2EB00BA94A9 /* Code sense */;
executables = (
617987D7114AA2CD00BA94A9 /* HedgewarsMobile */,
6100DAD3115446B000F455E0 /* iHedgewars */,
);
+ ignoreBreakpointsInProjectsDict = {
+ SDL_mixer = Ignored;
+ SDL_net = Ignored;
+ };
perUserDictionary = {
+ "PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
+ PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+ PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_BreakpointID;
+ PBXFileTableDataSourceColumnWidthsKey = (
+ 20,
+ 20,
+ 198,
+ 20,
+ 99,
+ 99,
+ 29,
+ 20,
+ );
+ PBXFileTableDataSourceColumnsKey = (
+ PBXBreakpointsDataSource_ActionID,
+ PBXBreakpointsDataSource_TypeID,
+ PBXBreakpointsDataSource_BreakpointID,
+ PBXBreakpointsDataSource_UseID,
+ PBXBreakpointsDataSource_LocationID,
+ PBXBreakpointsDataSource_ConditionID,
+ PBXBreakpointsDataSource_IgnoreCountID,
+ PBXBreakpointsDataSource_ContinueID,
+ );
+ };
PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
@@ -68,11 +95,90 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 290900329;
- PBXWorkspaceStateSaveDate = 290900329;
+ PBXPerProjectTemplateStateSaveDate = 291248035;
+ PBXWorkspaceStateSaveDate = 291248035;
};
perUserProjectItems = {
- 611FD81C1155111700C2203D = 611FD81C1155111700C2203D /* PBXTextBookmark */;
+ 6107A169115C1B3B00BAD238 /* PBXTextBookmark */ = 6107A169115C1B3B00BAD238 /* PBXTextBookmark */;
+ 6107A16C115C1B3B00BAD238 /* PBXTextBookmark */ = 6107A16C115C1B3B00BAD238 /* PBXTextBookmark */;
+ 6107A16D115C1B3B00BAD238 /* PBXTextBookmark */ = 6107A16D115C1B3B00BAD238 /* PBXTextBookmark */;
+ 6107A16E115C1B3B00BAD238 /* PBXTextBookmark */ = 6107A16E115C1B3B00BAD238 /* PBXTextBookmark */;
+ 6107A17B115C1B6D00BAD238 /* PBXTextBookmark */ = 6107A17B115C1B6D00BAD238 /* PBXTextBookmark */;
+ 6107A17C115C1B6D00BAD238 /* PBXTextBookmark */ = 6107A17C115C1B6D00BAD238 /* PBXTextBookmark */;
+ 6107A1AC115C215100BAD238 /* XCBuildMessageTextBookmark */ = 6107A1AC115C215100BAD238 /* XCBuildMessageTextBookmark */;
+ 6107A1AD115C215100BAD238 /* PBXTextBookmark */ = 6107A1AD115C215100BAD238 /* PBXTextBookmark */;
+ 6107A1AE115C215200BAD238 /* PBXTextBookmark */ = 6107A1AE115C215200BAD238 /* PBXTextBookmark */;
+ 6107A1AF115C215200BAD238 /* XCBuildMessageTextBookmark */ = 6107A1AF115C215200BAD238 /* XCBuildMessageTextBookmark */;
+ 6107A1B0115C215200BAD238 /* PBXTextBookmark */ = 6107A1B0115C215200BAD238 /* PBXTextBookmark */;
+ 6107A1B1115C215200BAD238 /* PBXTextBookmark */ = 6107A1B1115C215200BAD238 /* PBXTextBookmark */;
+ 6107A1BF115C232E00BAD238 /* PBXTextBookmark */ = 6107A1BF115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C0115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C0115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C1115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C1115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C2115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C2115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C3115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C3115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C4115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C4115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C5115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C5115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C6115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C6115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1C9115C232E00BAD238 /* PBXTextBookmark */ = 6107A1C9115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1CA115C232E00BAD238 /* PBXTextBookmark */ = 6107A1CA115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1CB115C232E00BAD238 /* PBXTextBookmark */ = 6107A1CB115C232E00BAD238 /* PBXTextBookmark */;
+ 6107A1D0115C236300BAD238 /* PBXTextBookmark */ = 6107A1D0115C236300BAD238 /* PBXTextBookmark */;
+ 6107A1D1115C236300BAD238 /* PBXTextBookmark */ = 6107A1D1115C236300BAD238 /* PBXTextBookmark */;
+ 6107A1D2115C236300BAD238 /* PBXTextBookmark */ = 6107A1D2115C236300BAD238 /* PBXTextBookmark */;
+ 6107A1D7115C23E300BAD238 /* PBXTextBookmark */ = 6107A1D7115C23E300BAD238 /* PBXTextBookmark */;
+ 6107A1D8115C23E300BAD238 /* XCBuildMessageTextBookmark */ = 6107A1D8115C23E300BAD238 /* XCBuildMessageTextBookmark */;
+ 6107A1D9115C23E300BAD238 /* PBXTextBookmark */ = 6107A1D9115C23E300BAD238 /* PBXTextBookmark */;
+ 6107A1DA115C23E300BAD238 /* PBXTextBookmark */ = 6107A1DA115C23E300BAD238 /* PBXTextBookmark */;
+ 6107A1DB115C23E300BAD238 /* PBXTextBookmark */ = 6107A1DB115C23E300BAD238 /* PBXTextBookmark */;
+ 6107A1DC115C23E300BAD238 /* PBXTextBookmark */ = 6107A1DC115C23E300BAD238 /* PBXTextBookmark */;
+ 6107A1DD115C23E300BAD238 /* PBXTextBookmark */ = 6107A1DD115C23E300BAD238 /* PBXTextBookmark */;
+ 6107A1E6115C24E100BAD238 /* PBXTextBookmark */ = 6107A1E6115C24E100BAD238 /* PBXTextBookmark */;
+ 6107A1E7115C24E100BAD238 /* XCBuildMessageTextBookmark */ = 6107A1E7115C24E100BAD238 /* XCBuildMessageTextBookmark */;
+ 6107A1E8115C24E100BAD238 /* PBXTextBookmark */ = 6107A1E8115C24E100BAD238 /* PBXTextBookmark */;
+ 6107A1E9115C24E200BAD238 /* PBXTextBookmark */ = 6107A1E9115C24E200BAD238 /* PBXTextBookmark */;
+ 6107A1EA115C24E200BAD238 /* PBXTextBookmark */ = 6107A1EA115C24E200BAD238 /* PBXTextBookmark */;
+ 6107A1EB115C24E200BAD238 /* PBXTextBookmark */ = 6107A1EB115C24E200BAD238 /* PBXTextBookmark */;
+ 6107A1F2115C251C00BAD238 /* PBXTextBookmark */ = 6107A1F2115C251C00BAD238 /* PBXTextBookmark */;
+ 6107A1F3115C251C00BAD238 /* PBXTextBookmark */ = 6107A1F3115C251C00BAD238 /* PBXTextBookmark */;
+ 6107A1F4115C251C00BAD238 /* PBXTextBookmark */ = 6107A1F4115C251C00BAD238 /* PBXTextBookmark */;
+ 6107A1F7115C253500BAD238 /* PBXTextBookmark */ = 6107A1F7115C253500BAD238 /* PBXTextBookmark */;
+ 6107A1FA115C255200BAD238 /* PBXTextBookmark */ = 6107A1FA115C255200BAD238 /* PBXTextBookmark */;
+ 6107A1FB115C255200BAD238 /* PBXTextBookmark */ = 6107A1FB115C255200BAD238 /* PBXTextBookmark */;
+ 6107A1FC115C255200BAD238 /* PBXTextBookmark */ = 6107A1FC115C255200BAD238 /* PBXTextBookmark */;
+ 6107A205115C259400BAD238 /* PBXTextBookmark */ = 6107A205115C259400BAD238 /* PBXTextBookmark */;
+ 6107A206115C259400BAD238 /* PBXTextBookmark */ = 6107A206115C259400BAD238 /* PBXTextBookmark */;
+ 6107A209115C259400BAD238 /* PBXTextBookmark */ = 6107A209115C259400BAD238 /* PBXTextBookmark */;
+ 6107A20A115C259400BAD238 /* PBXTextBookmark */ = 6107A20A115C259400BAD238 /* PBXTextBookmark */;
+ 6107A20B115C259400BAD238 /* PBXTextBookmark */ = 6107A20B115C259400BAD238 /* PBXTextBookmark */;
+ 6107A20C115C259400BAD238 /* PBXTextBookmark */ = 6107A20C115C259400BAD238 /* PBXTextBookmark */;
+ 6107A20D115C259400BAD238 /* PBXTextBookmark */ = 6107A20D115C259400BAD238 /* PBXTextBookmark */;
+ 6107A212115C25EE00BAD238 /* PBXTextBookmark */ = 6107A212115C25EE00BAD238 /* PBXTextBookmark */;
+ 6107A213115C25EE00BAD238 /* PBXTextBookmark */ = 6107A213115C25EE00BAD238 /* PBXTextBookmark */;
+ 6107A214115C25EE00BAD238 /* PBXTextBookmark */ = 6107A214115C25EE00BAD238 /* PBXTextBookmark */;
+ 6107A215115C25EE00BAD238 /* PBXTextBookmark */ = 6107A215115C25EE00BAD238 /* PBXTextBookmark */;
+ 6107A218115C260B00BAD238 /* PBXTextBookmark */ = 6107A218115C260B00BAD238 /* PBXTextBookmark */;
+ 6107A219115C260B00BAD238 /* PBXTextBookmark */ = 6107A219115C260B00BAD238 /* PBXTextBookmark */;
+ 6107A21A115C260B00BAD238 /* PBXTextBookmark */ = 6107A21A115C260B00BAD238 /* PBXTextBookmark */;
+ 6107A21E115C263200BAD238 /* PBXTextBookmark */ = 6107A21E115C263200BAD238 /* PBXTextBookmark */;
+ 6107A21F115C263200BAD238 /* PBXTextBookmark */ = 6107A21F115C263200BAD238 /* PBXTextBookmark */;
+ 6107A221115C265100BAD238 /* PBXTextBookmark */ = 6107A221115C265100BAD238 /* PBXTextBookmark */;
+ 6107A222115C265100BAD238 /* PBXTextBookmark */ = 6107A222115C265100BAD238 /* PBXTextBookmark */;
+ 6107A226115C270D00BAD238 /* PBXTextBookmark */ = 6107A226115C270D00BAD238 /* PBXTextBookmark */;
+ 6107A227115C270D00BAD238 /* PBXTextBookmark */ = 6107A227115C270D00BAD238 /* PBXTextBookmark */;
+ 6107A22B115C272C00BAD238 /* PBXTextBookmark */ = 6107A22B115C272C00BAD238 /* PBXTextBookmark */;
+ 6107A22C115C272C00BAD238 /* PBXTextBookmark */ = 6107A22C115C272C00BAD238 /* PBXTextBookmark */;
+ 6107A234115C276400BAD238 /* PBXTextBookmark */ = 6107A234115C276400BAD238 /* PBXTextBookmark */;
+ 6107A235115C276400BAD238 /* PBXTextBookmark */ = 6107A235115C276400BAD238 /* PBXTextBookmark */;
+ 6107A23D115C27C400BAD238 /* PBXTextBookmark */ = 6107A23D115C27C400BAD238 /* PBXTextBookmark */;
+ 6107A23E115C27C400BAD238 /* PBXTextBookmark */ = 6107A23E115C27C400BAD238 /* PBXTextBookmark */;
+ 6107A242115C27DB00BAD238 /* PBXTextBookmark */ = 6107A242115C27DB00BAD238 /* PBXTextBookmark */;
+ 6107A243115C27DB00BAD238 /* PBXTextBookmark */ = 6107A243115C27DB00BAD238 /* PBXTextBookmark */;
+ 6107A247115C284900BAD238 /* PBXTextBookmark */ = 6107A247115C284900BAD238 /* PBXTextBookmark */;
+ 6107A248115C284900BAD238 /* PBXTextBookmark */ = 6107A248115C284900BAD238 /* PBXTextBookmark */;
+ 6107A24D115C287800BAD238 /* PBXTextBookmark */ = 6107A24D115C287800BAD238 /* PBXTextBookmark */;
+ 6107A24E115C287800BAD238 /* PBXTextBookmark */ = 6107A24E115C287800BAD238 /* PBXTextBookmark */;
+ 6107A250115C289600BAD238 /* PBXTextBookmark */ = 6107A250115C289600BAD238 /* PBXTextBookmark */;
+ 6107A251115C289600BAD238 /* PBXTextBookmark */ = 6107A251115C289600BAD238 /* PBXTextBookmark */;
611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */;
611FD81E1155111700C2203D = 611FD81E1155111700C2203D /* PBXTextBookmark */;
611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
@@ -93,7 +199,6 @@
611FD9AE115594B400C2203D = 611FD9AE115594B400C2203D /* PBXTextBookmark */;
611FD9D51155A4B900C2203D = 611FD9D51155A4B900C2203D /* PBXTextBookmark */;
611FD9F41155A8F500C2203D = 611FD9F41155A8F500C2203D /* PBXTextBookmark */;
- 611FDA441155AEBF00C2203D = 611FDA441155AEBF00C2203D /* PBXTextBookmark */;
611FDAC41155B77500C2203D = 611FDAC41155B77500C2203D /* PBXTextBookmark */;
611FDADF1155B83200C2203D = 611FDADF1155B83200C2203D /* PBXTextBookmark */;
611FDB471155BCE500C2203D = 611FDB471155BCE500C2203D /* PBXTextBookmark */;
@@ -103,7 +208,6 @@
611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
611FDB6E1155C0B300C2203D = 611FDB6E1155C0B300C2203D /* PBXBookmark */;
611FDBF51155D39400C2203D = 611FDBF51155D39400C2203D /* PBXBookmark */;
- 611FDBF61155D39400C2203D = 611FDBF61155D39400C2203D /* PBXTextBookmark */;
611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
611FDC1A1155D8E400C2203D = 611FDC1A1155D8E400C2203D /* PBXTextBookmark */;
611FDC1B1155D8E400C2203D = 611FDC1B1155D8E400C2203D /* PBXTextBookmark */;
@@ -120,22 +224,27 @@
6179937711501D7800BA94A9 = 6179937711501D7800BA94A9 /* PBXBookmark */;
6179938511501FFA00BA94A9 = 6179938511501FFA00BA94A9 /* PBXBookmark */;
6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */;
+ 618AFC06115BE92A003D411B = 618AFC06115BE92A003D411B /* PBXTextBookmark */;
+ 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */;
+ 618AFC14115BEA91003D411B = 618AFC14115BEA91003D411B /* PBXTextBookmark */;
+ 618AFC15115BEA91003D411B = 618AFC15115BEA91003D411B /* PBXTextBookmark */;
6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
6194CCFC1151E00900A4BA5C = 6194CCFC1151E00900A4BA5C /* PBXTextBookmark */;
+ 619F1D45115BEF7400A32B0B = 619F1D45115BEF7400A32B0B /* PBXTextBookmark */;
+ 619F1D7E115C0EFF00A32B0B = 619F1D7E115C0EFF00A32B0B /* PBXTextBookmark */;
+ 619F1D81115C0F0500A32B0B = 619F1D81115C0F0500A32B0B /* PBXTextBookmark */;
+ 619F1DAF115C169A00A32B0B = 619F1DAF115C169A00A32B0B /* PBXBookmark */;
+ 619F1DC0115C173800A32B0B = 619F1DC0115C173800A32B0B /* PBXTextBookmark */;
+ 619F1DC1115C173800A32B0B = 619F1DC1115C173800A32B0B /* PBXTextBookmark */;
+ 619F1DC6115C179400A32B0B = 619F1DC6115C179400A32B0B /* PBXTextBookmark */;
+ 619F1DC7115C179400A32B0B = 619F1DC7115C179400A32B0B /* PBXTextBookmark */;
+ 619F1DC8115C179400A32B0B = 619F1DC8115C179400A32B0B /* PBXTextBookmark */;
61C0838F11567CA9005D474F = 61C0838F11567CA9005D474F /* PBXTextBookmark */;
- 61E2F07E1156B170002D33C1 = 61E2F07E1156B170002D33C1 /* PBXTextBookmark */;
61E2F07F1156B170002D33C1 = 61E2F07F1156B170002D33C1 /* PBXTextBookmark */;
61E2F0801156B170002D33C1 = 61E2F0801156B170002D33C1 /* PBXTextBookmark */;
61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
61E2F0821156B170002D33C1 = 61E2F0821156B170002D33C1 /* PBXTextBookmark */;
61E2F0831156B170002D33C1 = 61E2F0831156B170002D33C1 /* PBXTextBookmark */;
- 61E2F0841156B170002D33C1 = 61E2F0841156B170002D33C1 /* PBXBookmark */;
- 61E2F0881156C6B9002D33C1 = 61E2F0881156C6B9002D33C1 /* PBXTextBookmark */;
- 61E2F0A11156C970002D33C1 /* PBXTextBookmark */ = 61E2F0A11156C970002D33C1 /* PBXTextBookmark */;
- 61E2F0B71156C9D1002D33C1 /* PBXTextBookmark */ = 61E2F0B71156C9D1002D33C1 /* PBXTextBookmark */;
- 61E2F0B91156C9FD002D33C1 /* PBXTextBookmark */ = 61E2F0B91156C9FD002D33C1 /* PBXTextBookmark */;
- 61E2F0BA1156CA26002D33C1 /* PBXTextBookmark */ = 61E2F0BA1156CA26002D33C1 /* PBXTextBookmark */;
- 61E2F0C51156CAF1002D33C1 /* PBXTextBookmark */ = 61E2F0C51156CAF1002D33C1 /* PBXTextBookmark */;
};
sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
userBuildSettings = {
@@ -161,7 +270,7 @@
argumentStrings = (
);
autoAttachOnCrash = 1;
- breakpointsEnabled = 0;
+ breakpointsEnabled = 1;
configStateDict = {
};
customDataFormattersEnabled = 1;
@@ -186,15 +295,846 @@
variableFormatDictionary = {
};
};
- 611FD81C1155111700C2203D /* PBXTextBookmark */ = {
+ 6107A169115C1B3B00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 6107A16C115C1B3B00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */;
+ name = "overlayViewController.h: 21";
+ rLen = 0;
+ rLoc = 384;
+ rType = 0;
+ vrLen = 916;
+ vrLoc = 0;
+ };
+ 6107A16D115C1B3B00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 131";
+ rLen = 0;
+ rLoc = 4738;
+ rType = 0;
+ vrLen = 2034;
+ vrLoc = 3441;
+ };
+ 6107A16E115C1B3B00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 134";
+ rLen = 0;
+ rLoc = 4849;
+ rType = 0;
+ vrLen = 1955;
+ vrLoc = 3413;
+ };
+ 6107A17B115C1B6D00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 6107A17C115C1B6D00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 132";
+ rLen = 0;
+ rLoc = 4843;
+ rType = 0;
+ vrLen = 1936;
+ vrLoc = 3413;
+ };
+ 6107A1AC115C215100BAD238 /* XCBuildMessageTextBookmark */ = {
+ isa = PBXTextBookmark;
+ comments = "Cannot find protocol declaration for 'UIViewControllerDelegate'";
+ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */;
+ fallbackIsa = XCBuildMessageTextBookmark;
+ rLen = 1;
+ rLoc = 11;
+ rType = 1;
+ };
+ 6107A1AD115C215100BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */;
+ name = "popupMenuViewController.h: 12";
+ rLen = 0;
+ rLoc = 182;
+ rType = 0;
+ vrLen = 281;
+ vrLoc = 0;
+ };
+ 6107A1AE115C215200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 6107A1AF115C215200BAD238 /* XCBuildMessageTextBookmark */ = {
+ isa = PBXTextBookmark;
+ comments = "Cannot find protocol declaration for 'UIViewControllerDelegate'";
+ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */;
+ fallbackIsa = XCBuildMessageTextBookmark;
+ rLen = 1;
+ rLoc = 11;
+ rType = 1;
+ };
+ 6107A1B0115C215200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */;
+ name = "popupMenuViewController.h: 12";
+ rLen = 0;
+ rLoc = 182;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 6107A1B1115C215200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 132";
+ rLen = 0;
+ rLoc = 4843;
+ rType = 0;
+ vrLen = 2028;
+ vrLoc = 3413;
+ };
+ 6107A1B3115C21D800BAD238 /* popupMenuView.h */ = {
+ isa = PBXFileReference;
+ fileEncoding = 4;
+ lastKnownFileType = sourcecode.c.h;
+ name = popupMenuView.h;
+ path = /Users/vittorio/hedgewars/trunk/cocoaTouch/popupMenuView.h;
+ sourceTree = "<absolute>";
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {868, 717}}";
+ sepNavSelRange = "{250, 0}";
+ sepNavVisRange = "{0, 256}";
+ };
+ };
+ 6107A1B4115C21D800BAD238 /* popupMenuView.m */ = {
+ isa = PBXFileReference;
+ fileEncoding = 4;
+ lastKnownFileType = sourcecode.c.objc;
+ name = popupMenuView.m;
+ path = /Users/vittorio/hedgewars/trunk/cocoaTouch/popupMenuView.m;
+ sourceTree = "<absolute>";
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {868, 717}}";
+ sepNavSelRange = "{583, 38}";
+ sepNavVisRange = "{0, 869}";
+ sepNavWindowFrame = "{{153, 202}, {927, 845}}";
+ };
+ };
+ 6107A1BF115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 247;
+ vrLoc = 0;
+ };
+ 6107A1C0115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */;
+ name = "popupMenuViewController.h: 12";
+ rLen = 0;
+ rLoc = 225;
+ rType = 0;
+ vrLen = 132;
+ vrLoc = 155;
+ };
+ 6107A1C1115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 172;
+ vrLoc = 0;
+ };
+ 6107A1C2115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B4115C21D800BAD238 /* popupMenuView.m */;
+ name = "popupMenuView.m: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 174;
+ vrLoc = 0;
+ };
+ 6107A1C3115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 165;
+ vrLoc = 1159;
+ };
+ 6107A1C4115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A1C5115C232E00BAD238 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */;
- name = "uStore.pas: 1120";
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 132";
+ rLen = 0;
+ rLoc = 4843;
+ rType = 0;
+ vrLen = 2028;
+ vrLoc = 3413;
+ };
+ 6107A1C6115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 133";
+ rLen = 0;
+ rLoc = 4844;
+ rType = 0;
+ vrLen = 2139;
+ vrLoc = 3514;
+ };
+ 6107A1C9115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B4115C21D800BAD238 /* popupMenuView.m */;
+ name = "popupMenuView.m: 34";
+ rLen = 38;
+ rLoc = 583;
+ rType = 0;
+ vrLen = 869;
+ vrLoc = 0;
+ };
+ 6107A1CA115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 217;
+ vrLoc = 0;
+ };
+ 6107A1CB115C232E00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 15";
+ rLen = 0;
+ rLoc = 250;
+ rType = 0;
+ vrLen = 256;
+ vrLoc = 0;
+ };
+ 6107A1D0115C236300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 165;
+ vrLoc = 1159;
+ };
+ 6107A1D1115C236300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 132";
+ rLen = 0;
+ rLoc = 4833;
+ rType = 0;
+ vrLen = 2245;
+ vrLoc = 3514;
+ };
+ 6107A1D2115C236300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 15";
+ rLen = 0;
+ rLoc = 250;
+ rType = 0;
+ vrLen = 256;
+ vrLoc = 0;
+ };
+ 6107A1D7115C23E300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 165;
+ vrLoc = 1159;
+ };
+ 6107A1D8115C23E300BAD238 /* XCBuildMessageTextBookmark */ = {
+ isa = PBXTextBookmark;
+ comments = "'popoverController' undeclared (first use in this function)";
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ fallbackIsa = XCBuildMessageTextBookmark;
+ rLen = 0;
+ rLoc = 44;
+ rType = 1;
+ };
+ 6107A1D9115C23E300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 45";
+ rLen = 0;
+ rLoc = 1494;
+ rType = 0;
+ vrLen = 349;
+ vrLoc = 1371;
+ };
+ 6107A1DA115C23E300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */;
+ name = "overlayViewController.h: 14";
+ rLen = 0;
+ rLoc = 257;
+ rType = 0;
+ vrLen = 872;
+ vrLoc = 0;
+ };
+ 6107A1DB115C23E300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 134";
+ rLen = 0;
+ rLoc = 4849;
+ rType = 0;
+ vrLen = 2223;
+ vrLoc = 3514;
+ };
+ 6107A1DC115C23E300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 133";
+ rLen = 0;
+ rLoc = 4937;
+ rType = 0;
+ vrLen = 1943;
+ vrLoc = 3290;
+ };
+ 6107A1DD115C23E300BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 15";
+ rLen = 0;
+ rLoc = 250;
+ rType = 0;
+ vrLen = 256;
+ vrLoc = 0;
+ };
+ 6107A1E6115C24E100BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */;
+ name = "popupMenuViewController.h: 12";
+ rLen = 0;
+ rLoc = 182;
+ rType = 0;
+ vrLen = 281;
+ vrLoc = 0;
+ };
+ 6107A1E7115C24E100BAD238 /* XCBuildMessageTextBookmark */ = {
+ isa = PBXTextBookmark;
+ comments = "Confused by earlier errors, bailing out";
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ fallbackIsa = XCBuildMessageTextBookmark;
+ rLen = 1;
+ rLoc = 141;
+ rType = 1;
+ };
+ 6107A1E8115C24E100BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 141";
+ rLen = 0;
+ rLoc = 4349;
+ rType = 0;
+ vrLen = 975;
+ vrLoc = 3929;
+ };
+ 6107A1E9115C24E200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 45";
+ rLen = 0;
+ rLoc = 1494;
+ rType = 0;
+ vrLen = 350;
+ vrLoc = 1371;
+ };
+ 6107A1EA115C24E200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 133";
+ rLen = 0;
+ rLoc = 4066;
+ rType = 0;
+ vrLen = 2046;
+ vrLoc = 3290;
+ };
+ 6107A1EB115C24E200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 15";
+ rLen = 0;
+ rLoc = 250;
+ rType = 0;
+ vrLen = 256;
+ vrLoc = 0;
+ };
+ 6107A1F2115C251C00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 45";
rLen = 0;
- rLoc = 36957;
+ rLoc = 1494;
+ rType = 0;
+ vrLen = 349;
+ vrLoc = 1371;
+ };
+ 6107A1F3115C251C00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 141";
+ rLen = 0;
+ rLoc = 4349;
+ rType = 0;
+ vrLen = 1952;
+ vrLoc = 3290;
+ };
+ 6107A1F4115C251C00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 15";
+ rLen = 0;
+ rLoc = 250;
+ rType = 0;
+ vrLen = 256;
+ vrLoc = 0;
+ };
+ 6107A1F7115C253500BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 141";
+ rLen = 0;
+ rLoc = 4349;
+ rType = 0;
+ vrLen = 866;
+ vrLoc = 4012;
+ };
+ 6107A1FA115C255200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 45";
+ rLen = 0;
+ rLoc = 1494;
+ rType = 0;
+ vrLen = 349;
+ vrLoc = 1371;
+ };
+ 6107A1FB115C255200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 140";
+ rLen = 0;
+ rLoc = 4256;
+ rType = 0;
+ vrLen = 2101;
+ vrLoc = 3470;
+ };
+ 6107A1FC115C255200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6107A1B3115C21D800BAD238 /* popupMenuView.h */;
+ name = "popupMenuView.h: 15";
+ rLen = 0;
+ rLoc = 250;
+ rType = 0;
+ vrLen = 256;
+ vrLoc = 0;
+ };
+ 6107A201115C259000BAD238 /* popupMenuViewController.m:58 */ = {
+ isa = PBXFileBreakpoint;
+ actions = (
+ );
+ breakpointStyle = 0;
+ continueAfterActions = 0;
+ countType = 0;
+ delayBeforeContinue = 0;
+ fileReference = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ functionName = "-buttonPressed:";
+ hitCount = 0;
+ ignoreCount = 0;
+ lineNumber = 58;
+ location = iHedgewars;
+ modificationTime = 291252345.388723;
+ originalNumberOfMultipleMatches = 1;
+ state = 1;
+ };
+ 6107A205115C259400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 45";
+ rLen = 0;
+ rLoc = 1494;
+ rType = 0;
+ vrLen = 275;
+ vrLoc = 1496;
+ };
+ 6107A206115C259400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A209115C259400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 1362;
+ vrLoc = 267;
+ };
+ 6107A20A115C259400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 1359;
+ vrLoc = 267;
+ };
+ 6107A20B115C259400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */;
+ name = "overlayViewController.h: 20";
+ rLen = 0;
+ rLoc = 384;
+ rType = 0;
+ vrLen = 803;
+ vrLoc = 0;
+ };
+ 6107A20C115C259400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 259";
+ rLen = 0;
+ rLoc = 9172;
+ rType = 0;
+ vrLen = 1135;
+ vrLoc = 2507;
+ };
+ 6107A20D115C259400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 259";
+ rLen = 0;
+ rLoc = 9172;
+ rType = 0;
+ vrLen = 1258;
+ vrLoc = 1670;
+ };
+ 6107A212115C25EE00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 165;
+ vrLoc = 1159;
+ };
+ 6107A213115C25EE00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */;
+ name = "overlayViewController.h: 20";
+ rLen = 0;
+ rLoc = 384;
+ rType = 0;
+ vrLen = 743;
+ vrLoc = 0;
+ };
+ 6107A214115C25EE00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 259";
+ rLen = 0;
+ rLoc = 9172;
+ rType = 0;
+ vrLen = 1569;
+ vrLoc = 7180;
+ };
+ 6107A215115C25EE00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 120";
+ rLen = 0;
+ rLoc = 3425;
+ rType = 0;
+ vrLen = 1276;
+ vrLoc = 2853;
+ };
+ 6107A218115C260B00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 165;
+ vrLoc = 1159;
+ };
+ 6107A219115C260B00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
rType = 0;
- vrLen = 298;
- vrLoc = 36785;
+ vrLen = 165;
+ vrLoc = 1159;
+ };
+ 6107A21A115C260B00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 120";
+ rLen = 0;
+ rLoc = 3425;
+ rType = 0;
+ vrLen = 1276;
+ vrLoc = 2853;
+ };
+ 6107A21E115C263200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A21F115C263200BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 138";
+ rLen = 0;
+ rLoc = 4065;
+ rType = 0;
+ vrLen = 2088;
+ vrLoc = 3612;
+ };
+ 6107A221115C265100BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A222115C265100BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 138";
+ rLen = 0;
+ rLoc = 4065;
+ rType = 0;
+ vrLen = 1181;
+ vrLoc = 2125;
+ };
+ 6107A226115C270D00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 165;
+ vrLoc = 1159;
+ };
+ 6107A227115C270D00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 146";
+ rLen = 0;
+ rLoc = 4455;
+ rType = 0;
+ vrLen = 2342;
+ vrLoc = 3486;
+ };
+ 6107A22B115C272C00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A22C115C272C00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 147";
+ rLen = 0;
+ rLoc = 4498;
+ rType = 0;
+ vrLen = 2274;
+ vrLoc = 3486;
+ };
+ 6107A234115C276400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A235115C276400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 144";
+ rLen = 0;
+ rLoc = 4354;
+ rType = 0;
+ vrLen = 2278;
+ vrLoc = 3486;
+ };
+ 6107A23D115C27C400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A23E115C27C400BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 143";
+ rLen = 0;
+ rLoc = 4349;
+ rType = 0;
+ vrLen = 2281;
+ vrLoc = 3486;
+ };
+ 6107A242115C27DB00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A243115C27DB00BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 142";
+ rLen = 0;
+ rLoc = 4349;
+ rType = 0;
+ vrLen = 2258;
+ vrLoc = 3486;
+ };
+ 6107A247115C284900BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A248115C284900BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 135";
+ rLen = 0;
+ rLoc = 3861;
+ rType = 0;
+ vrLen = 2256;
+ vrLoc = 3486;
+ };
+ 6107A24D115C287800BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A24E115C287800BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 135";
+ rLen = 23;
+ rLoc = 3838;
+ rType = 0;
+ vrLen = 2258;
+ vrLoc = 3486;
+ };
+ 6107A250115C289600BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */;
+ name = "popupMenuViewController.m: 49";
+ rLen = 0;
+ rLoc = 1301;
+ rType = 0;
+ vrLen = 147;
+ vrLoc = 1159;
+ };
+ 6107A251115C289600BAD238 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 147";
+ rLen = 0;
+ rLoc = 4542;
+ rType = 0;
+ vrLen = 2252;
+ vrLoc = 3486;
};
611FD81D1155111700C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -378,32 +1318,6 @@
vrLen = 99;
vrLoc = 144;
};
- 611FDA441155AEBF00C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */;
- name = "overlayViewController.h: 16";
- rLen = 0;
- rLoc = 329;
- rType = 0;
- vrLen = 250;
- vrLoc = 330;
- };
- 611FDAC31155B77100C2203D /* malloc_error_break */ = {
- isa = PBXSymbolicBreakpoint;
- actions = (
- );
- breakpointStyle = 1;
- continueAfterActions = 0;
- countType = 0;
- delayBeforeContinue = 0;
- hitCount = 0;
- ignoreCount = 0;
- location = libSystem.B.dylib;
- modificationTime = 290879724.515999;
- originalNumberOfMultipleMatches = 1;
- state = 2;
- symbolName = malloc_error_break;
- };
611FDAC41155B77500C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798868114AA4AA00BA94A9 /* SDL_uikitwindow.m */;
@@ -414,22 +1328,6 @@
vrLen = 382;
vrLoc = 1853;
};
- 611FDACE1155B78800C2203D /* malloc_error_break */ = {
- isa = PBXSymbolicBreakpoint;
- actions = (
- );
- breakpointStyle = 1;
- continueAfterActions = 0;
- countType = 0;
- delayBeforeContinue = 0;
- hitCount = 0;
- ignoreCount = 0;
- location = libSystem.B.dylib;
- modificationTime = 290879724.516013;
- originalNumberOfMultipleMatches = 1;
- state = 2;
- symbolName = malloc_error_break;
- };
611FDADF1155B83200C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987F9114AA34C00BA94A9 /* uConsts.pas */;
@@ -487,16 +1385,6 @@
isa = PBXBookmark;
fRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */;
};
- 611FDBF61155D39400C2203D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
- name = "hwengine.pas: 165";
- rLen = 0;
- rLoc = 4453;
- rType = 0;
- vrLen = 172;
- vrLoc = 4544;
- };
611FDBF71155D39400C2203D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987E1114AA34C00BA94A9 /* CCHandlers.inc */;
@@ -607,9 +1495,9 @@
};
617987E7114AA34C00BA94A9 /* hwengine.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {696, 7618}}";
- sepNavSelRange = "{4453, 0}";
- sepNavVisRange = "{4196, 295}";
+ sepNavIntBoundsRect = "{{0, 0}, {789, 7748}}";
+ sepNavSelRange = "{1040, 0}";
+ sepNavVisRange = "{6672, 1049}";
sepNavWindowFrame = "{{243, 357}, {803, 674}}";
};
};
@@ -682,9 +1570,9 @@
};
617987FA114AA34C00BA94A9 /* uFloat.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {532, 4784}}";
+ sepNavIntBoundsRect = "{{0, 0}, {532, 4810}}";
sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{0, 115}";
+ sepNavVisRange = "{0, 49}";
};
};
617987FB114AA34C00BA94A9 /* uGame.pas */ = {
@@ -737,9 +1625,9 @@
};
6179880B114AA34C00BA94A9 /* uStore.pas */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {824, 19565}}";
- sepNavSelRange = "{36957, 0}";
- sepNavVisRange = "{37472, 439}";
+ sepNavIntBoundsRect = "{{0, 0}, {696, 19630}}";
+ sepNavSelRange = "{36975, 0}";
+ sepNavVisRange = "{36771, 571}";
sepNavWindowFrame = "{{38, 478}, {803, 674}}";
};
};
@@ -812,9 +1700,9 @@
};
61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {744, 1820}}";
- sepNavSelRange = "{1005, 0}";
- sepNavVisRange = "{526, 1251}";
+ sepNavIntBoundsRect = "{{0, 0}, {768, 1898}}";
+ sepNavSelRange = "{2579, 0}";
+ sepNavVisRange = "{2089, 995}";
sepNavWindowFrame = "{{841, 168}, {803, 674}}";
};
};
@@ -836,9 +1724,9 @@
};
6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {901, 2262}}";
- sepNavSelRange = "{770, 0}";
- sepNavVisRange = "{148, 1277}";
+ sepNavIntBoundsRect = "{{0, 0}, {901, 2249}}";
+ sepNavSelRange = "{4275, 0}";
+ sepNavVisRange = "{3879, 882}";
sepNavWindowFrame = "{{226, 388}, {775, 623}}";
};
};
@@ -984,17 +1872,17 @@
};
6179939D1150226700BA94A9 /* overlayViewController.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {532, 416}}";
- sepNavSelRange = "{329, 0}";
- sepNavVisRange = "{330, 250}";
+ sepNavIntBoundsRect = "{{0, 0}, {868, 567}}";
+ sepNavSelRange = "{384, 0}";
+ sepNavVisRange = "{0, 743}";
sepNavWindowFrame = "{{381, 378}, {922, 717}}";
};
};
6179939E1150226700BA94A9 /* overlayViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {712, 3016}}";
- sepNavSelRange = "{272, 0}";
- sepNavVisRange = "{545, 55}";
+ sepNavIntBoundsRect = "{{0, 0}, {1076, 3562}}";
+ sepNavSelRange = "{4542, 0}";
+ sepNavVisRange = "{3486, 2252}";
sepNavWindowFrame = "{{722, 192}, {927, 718}}";
};
};
@@ -1002,6 +1890,56 @@
isa = PBXBookmark;
fRef = 6179936711501D3D00BA94A9 /* arrowDown.png */;
};
+ 618AFBED115BE8AE003D411B /* popupMenuViewController.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {696, 247}}";
+ sepNavSelRange = "{182, 0}";
+ sepNavVisRange = "{0, 281}";
+ sepNavWindowFrame = "{{56, 154}, {927, 845}}";
+ };
+ };
+ 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {663, 962}}";
+ sepNavSelRange = "{1301, 0}";
+ sepNavVisRange = "{1159, 147}";
+ sepNavWindowFrame = "{{15, 328}, {927, 845}}";
+ };
+ };
+ 618AFC06115BE92A003D411B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
+ name = "uFloat.pas: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 49;
+ vrLoc = 0;
+ };
+ 618AFC07115BE92A003D411B /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 61798A20114ADD2600BA94A9 /* backgroundLeft.png */;
+ };
+ 618AFC14115BEA91003D411B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179880B114AA34C00BA94A9 /* uStore.pas */;
+ name = "uStore.pas: 1121";
+ rLen = 0;
+ rLoc = 36975;
+ rType = 0;
+ vrLen = 49;
+ vrLoc = 0;
+ };
+ 618AFC15115BEA91003D411B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */;
+ name = "overlayViewController.h: 14";
+ rLen = 0;
+ rLoc = 257;
+ rType = 0;
+ vrLen = 72;
+ vrLoc = 287;
+ };
6194CC0711505FCF00A4BA5C /* PlistBookmark */ = {
isa = PlistBookmark;
fRef = 8D1107310486CEB800E47090 /* Info.plist */;
@@ -1024,6 +1962,87 @@
vrLen = 860;
vrLoc = 0;
};
+ 619F1D45115BEF7400A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */;
+ name = "popupMenuViewController.h: 19";
+ rLen = 0;
+ rLoc = 287;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 619F1D7E115C0EFF00A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
+ rLen = 1;
+ rLoc = 231;
+ rType = 1;
+ };
+ 619F1D81115C0F0500A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 619F1DAF115C169A00A32B0B /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
+ };
+ 619F1DC0115C173800A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */;
+ name = "overlayViewController.h: 14";
+ rLen = 0;
+ rLoc = 257;
+ rType = 0;
+ vrLen = 948;
+ vrLoc = 0;
+ };
+ 619F1DC1115C173800A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 13";
+ rLen = 0;
+ rLoc = 272;
+ rType = 0;
+ vrLen = 1540;
+ vrLoc = 0;
+ };
+ 619F1DC6115C179400A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
+ name = "hwengine.pas: 232";
+ rLen = 22;
+ rLoc = 6900;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
+ 619F1DC7115C179400A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
+ name = "overlayViewController.m: 130";
+ rLen = 0;
+ rLoc = 3834;
+ rType = 0;
+ vrLen = 1882;
+ vrLoc = 3080;
+ };
+ 619F1DC8115C179400A32B0B /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
+ name = "hwengine.pas: 35";
+ rLen = 0;
+ rLoc = 1040;
+ rType = 0;
+ vrLen = 1078;
+ vrLoc = 6672;
+ };
61C0838F11567CA9005D474F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
@@ -1034,16 +2053,6 @@
vrLen = 252;
vrLoc = 8101;
};
- 61E2F07E1156B170002D33C1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */;
- name = "overlayViewController.m: 13";
- rLen = 0;
- rLoc = 272;
- rType = 0;
- vrLen = 55;
- vrLoc = 545;
- };
61E2F07F1156B170002D33C1 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 617987FF114AA34C00BA94A9 /* uLand.pas */;
@@ -1094,70 +2103,6 @@
vrLen = 186;
vrLoc = 0;
};
- 61E2F0841156B170002D33C1 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
- };
- 61E2F0881156C6B9002D33C1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
- name = "uFloat.pas: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 187;
- vrLoc = 0;
- };
- 61E2F0A11156C970002D33C1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
- name = "uFloat.pas: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 49;
- vrLoc = 0;
- };
- 61E2F0B71156C9D1002D33C1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
- name = "uFloat.pas: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 115;
- vrLoc = 0;
- };
- 61E2F0B91156C9FD002D33C1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
- name = "uFloat.pas: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 115;
- vrLoc = 0;
- };
- 61E2F0BA1156CA26002D33C1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
- name = "uFloat.pas: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 115;
- vrLoc = 0;
- };
- 61E2F0C51156CAF1002D33C1 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 617987FA114AA34C00BA94A9 /* uFloat.pas */;
- name = "uFloat.pas: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 115;
- vrLoc = 0;
- };
928301160F10CAFC00CC5A3C /* fpc */ = {
activeExec = 0;
};