From fc789bbf80f730d9ffa8ff846b55bb067d401ee2 Mon Sep 17 00:00:00 2001 From: eddie-0815 Date: Sun, 20 Jan 2008 16:27:54 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@799 b956fd51-792f-4845-bead-9b4dfca2ff2c --- .../MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 | 180 ++++-------- .../MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser | 301 +++++++++++---------- .../MacOSX/UltraStarDX.xcodeproj/project.pbxproj | 12 +- 3 files changed, 209 insertions(+), 284 deletions(-) (limited to 'Game/Code') diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 index 05251214..89b83464 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 @@ -200,24 +200,24 @@ Content PBXProjectModuleGUID - 2CAC2C100D380F1200CA518A + 2C91297D0D43ADA1009299BF PBXProjectModuleLabel - URecord.pas + UPlatformMacOSX.pas PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 2CAC2C110D380F1200CA518A + 2C91297E0D43ADA1009299BF PBXProjectModuleLabel - URecord.pas + UPlatformMacOSX.pas _historyCapacity 0 bookmark - 2CAC2C120D380F1200CA518A + 2C91297F0D43ADA1009299BF history - 2CAC2C0F0D380E8700CA518A + 2C9129710D43A23B009299BF SplitCount @@ -229,35 +229,35 @@ Geometry Frame - {{0, 20}, {797, 748}} + {{0, 20}, {776, 859}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 130 129 797 789 0 0 1680 1028 + 79 110 776 900 0 0 1680 1028 Content PBXProjectModuleGUID - 2CAC2C000D380C5700CA518A + 2C9129800D43ADA1009299BF PBXProjectModuleLabel - UAudioInput_Bass.pas + UPlatform.pas PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 2CAC2C010D380C5700CA518A + 2C9129810D43ADA1009299BF PBXProjectModuleLabel - UAudioInput_Bass.pas + UPlatform.pas _historyCapacity 0 bookmark - 2CAC2C140D380F1200CA518A + 2C9129820D43ADA1009299BF history - 2CAC2C130D380F1200CA518A + 2C9129700D43A20F009299BF SplitCount @@ -269,75 +269,35 @@ Geometry Frame - {{0, 20}, {874, 786}} + {{0, 20}, {776, 858}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 15 196 874 827 0 0 1680 1028 + 200 118 776 899 0 0 1680 1028 Content PBXProjectModuleGUID - 2C36B5C30D358BF100E8D797 + 2C4D9D060D381D8200270C66 PBXProjectModuleLabel - UltraStarDX.pas + UScreenMain.pas PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 2C36B5C40D358BF100E8D797 + 2C4D9D070D381D8200270C66 PBXProjectModuleLabel - UltraStarDX.pas + UScreenMain.pas _historyCapacity 0 bookmark - 2CAC2C150D380F1200CA518A + 2C9129830D43ADA1009299BF history - 2CAC2C030D380C5700CA518A - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {987, 762}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 311 168 987 803 0 0 1680 1028 - - - - Content - - PBXProjectModuleGUID - 2C36B5750D3585ED00E8D797 - PBXProjectModuleLabel - UScreenSing.pas - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2C36B5760D3585ED00E8D797 - PBXProjectModuleLabel - UScreenSing.pas - _historyCapacity - 0 - bookmark - 2CAC2C160D380F1200CA518A - history - - 2C36B5E20D358CFB00E8D797 + 2C4D9D1C0D381F7A00270C66 SplitCount @@ -353,47 +313,7 @@ PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 38 134 754 888 0 0 1680 1028 - - - - Content - - PBXProjectModuleGUID - 2C5A593F0D35811F00DCBB8F - PBXProjectModuleLabel - UIni.pas - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2C5A59400D35811F00DCBB8F - PBXProjectModuleLabel - UIni.pas - _historyCapacity - 0 - bookmark - 2CAC2C170D380F1200CA518A - history - - 2C36B5E30D358CFB00E8D797 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {797, 748}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 107 150 797 789 0 0 1680 1028 + 38 135 754 888 0 0 1680 1028 @@ -480,7 +400,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 88}, {266, 694}} + {{0, 0}, {266, 694}} PBXTopSmartGroupGIDs @@ -582,9 +502,9 @@ TableOfContents - 2CAC2BC40D3808A200CA518A + 2C91297B0D43ADA1009299BF 1CE0B1FE06471DED0097A5F4 - 2CAC2BC50D3808A200CA518A + 2C91297C0D43ADA1009299BF 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -716,15 +636,13 @@ 5 WindowOrderList - 1C78EAAD065D492600B07095 + 2C4D9D060D381D8200270C66 1CD10A99069EF8BA00B06720 - 2C5A593F0D35811F00DCBB8F - 2C36B5750D3585ED00E8D797 - 2C36B5C30D358BF100E8D797 + 2C9129800D43ADA1009299BF + 2C91297D0D43ADA1009299BF + 1C530D57069F1CE1000CFCEE 2C65660B0CF2236C0041F7DC - 2CAC2C000D380C5700CA518A /Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj - 2CAC2C100D380F1200CA518A WindowString 799 242 817 753 0 0 1680 1028 @@ -743,12 +661,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - version.inc + UPlatformMacOSX.pas StatusBarVisibility @@ -765,8 +685,6 @@ 546pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -806,7 +724,7 @@ TableOfContents 2C65660B0CF2236C0041F7DC - 2CAC2BCC0D38094900CA518A + 2C9129840D43ADA1009299BF 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -926,13 +844,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 2CAC2C070D380C5700CA518A + 2C9129850D43ADA1009299BF 1C162984064C10D400B95A72 - 2CAC2C080D380C5700CA518A - 2CAC2C090D380C5700CA518A - 2CAC2C0A0D380C5700CA518A - 2CAC2C0B0D380C5700CA518A - 2CAC2C0C0D380C5700CA518A + 2C9129860D43ADA1009299BF + 2C9129870D43ADA1009299BF + 2C9129880D43ADA1009299BF + 2C9129890D43ADA1009299BF + 2C91298A0D43ADA1009299BF ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -941,7 +859,7 @@ WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -959,14 +877,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - UAudio_bass.pas + UIni.pas StatusBarVisibility @@ -987,6 +903,8 @@ 502pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -1022,8 +940,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 2C36B5940D3587D000E8D797 - 2C36B5950D3587D000E8D797 + 2C91298B0D43ADA1009299BF + 2C91298C0D43ADA1009299BF 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -1053,6 +971,8 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -1088,7 +1008,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 2CAC2C0D0D380C5700CA518A + 2C4D9C9E0D3811ED00270C66 1C78EAAC065D492600B07095 ToolbarConfiguration @@ -1098,7 +1018,7 @@ WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser index 65a02a81..5e9049de 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser @@ -1,25 +1,5 @@ // !$*UTF8*$! { - 2C36B5E20D358CFB00E8D797 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2CF54F5C0CDA1B2B00627463 /* UScreenSing.pas */; - name = "UScreenSing.pas: 321"; - rLen = 0; - rLoc = 8497; - rType = 0; - vrLen = 1569; - vrLoc = 7617; - }; - 2C36B5E30D358CFB00E8D797 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C4D9C720CC9EC8C0031092D /* UIni.pas */; - name = "UIni.pas: 177"; - rLen = 0; - rLoc = 5110; - rType = 0; - vrLen = 1173; - vrLoc = 4819; - }; 2C4B70220CF757A400B0F0BD /* Until5000.dpr */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {691, 1218}}"; @@ -104,10 +84,11 @@ }; 2C4D9C6D0CC9EC8C0031092D /* UDraw.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1277, 18872}}"; - sepNavSelRange = "{9710, 15}"; + sepNavIntBoundsRect = "{{0, 0}, {836, 19516}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{6577, 1474}"; sepNavVisRect = "{{0, 4065}, {1277, 312}}"; - sepNavWindowFrame = "{{61, 240}, {616, 741}}"; + sepNavWindowFrame = "{{61, 122}, {794, 859}}"; }; }; 2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */ = { @@ -146,9 +127,9 @@ }; 2C4D9C720CC9EC8C0031092D /* UIni.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {758, 11340}}"; - sepNavSelRange = "{5110, 0}"; - sepNavVisRange = "{4819, 1173}"; + sepNavIntBoundsRect = "{{0, 0}, {758, 11214}}"; + sepNavSelRange = "{5601, 15}"; + sepNavVisRange = "{5183, 839}"; sepNavVisRect = "{{0, 0}, {758, 716}}"; sepNavWindowFrame = "{{107, 94}, {797, 845}}"; }; @@ -205,18 +186,18 @@ }; 2C4D9C7A0CC9EC8C0031092D /* ULyrics.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1208, 10584}}"; - sepNavSelRange = "{6025, 1}"; - sepNavVisRange = "{5645, 705}"; + sepNavIntBoundsRect = "{{0, 0}, {758, 10626}}"; + sepNavSelRange = "{6965, 12}"; + sepNavVisRange = "{6549, 702}"; sepNavVisRect = "{{0, 4395}, {758, 716}}"; sepNavWindowFrame = "{{61, 136}, {797, 845}}"; }; }; 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {993, 14658}}"; - sepNavSelRange = "{6688, 0}"; - sepNavVisRange = "{5814, 1323}"; + sepNavIntBoundsRect = "{{0, 0}, {842, 15400}}"; + sepNavSelRange = "{9910, 0}"; + sepNavVisRange = "{9538, 599}"; sepNavVisRect = "{{0, 0}, {1013, 614}}"; sepNavWindowFrame = "{{30, 285}, {1052, 743}}"; }; @@ -281,7 +262,7 @@ }; 2C4D9C840CC9EC8C0031092D /* URecord.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {738, 4046}}"; + sepNavIntBoundsRect = "{{0, 0}, {738, 3794}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 1755}"; sepNavVisRect = "{{0, 4312}, {758, 716}}"; @@ -314,9 +295,9 @@ }; 2C4D9C880CC9EC8C0031092D /* USkins.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {738, 2534}}"; - sepNavSelRange = "{3097, 0}"; - sepNavVisRange = "{1981, 1318}"; + sepNavIntBoundsRect = "{{0, 0}, {842, 2450}}"; + sepNavSelRange = "{2805, 0}"; + sepNavVisRange = "{2928, 803}"; sepNavVisRect = "{{0, 550}, {923, 342}}"; sepNavWindowFrame = "{{61, 136}, {797, 845}}"; }; @@ -340,18 +321,18 @@ }; 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {717, 16506}}"; - sepNavSelRange = "{12906, 0}"; - sepNavVisRange = "{12038, 1920}"; + sepNavIntBoundsRect = "{{0, 0}, {729, 16002}}"; + sepNavSelRange = "{14991, 11}"; + sepNavVisRange = "{14754, 1148}"; sepNavVisRect = "{{0, 3420}, {737, 826}}"; sepNavWindowFrame = "{{15, 68}, {776, 955}}"; }; }; 2C4D9C8C0CC9EC8C0031092D /* UThemes.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {738, 33208}}"; - sepNavSelRange = "{25381, 0}"; - sepNavVisRange = "{24314, 2017}"; + sepNavIntBoundsRect = "{{0, 0}, {842, 32242}}"; + sepNavSelRange = "{59317, 12}"; + sepNavVisRange = "{61073, 1036}"; sepNavVisRect = "{{0, 19678}, {923, 342}}"; sepNavWindowFrame = "{{28, 161}, {797, 845}}"; }; @@ -373,6 +354,64 @@ sepNavWindowFrame = "{{15, 178}, {797, 845}}"; }; }; + 2C4D9D0E0D381DB000270C66 /* UScreenMain.pas:221 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */; + hitCount = 1; + ignoreCount = 0; + lineNumber = 221; + location = UltraStarDX; + modificationTime = 221781732.375473; + state = 1; + }; + 2C4D9D160D381EBD00270C66 /* UTexture.pas:318 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */; + hitCount = 0; + ignoreCount = 0; + lineNumber = 318; + location = UltraStarDX; + modificationTime = 221781728.225761; + state = 1; + }; + 2C4D9D1B0D381EEA00270C66 /* UTexture.pas:500 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */; + hitCount = 1; + ignoreCount = 0; + lineNumber = 500; + location = UltraStarDX; + modificationTime = 221781740.212444; + state = 1; + }; + 2C4D9D1C0D381F7A00270C66 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */; + name = "UScreenMain.pas: 221"; + rLen = 0; + rLoc = 5112; + rType = 0; + vrLen = 1245; + vrLoc = 4506; + }; 2C4D9D900CC9ED4F0031092D /* FreeBitmap.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {974, 24374}}"; @@ -391,9 +430,9 @@ }; 2C4D9DCC0CC9EE6F0031092D /* UDisplay.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {764, 6454}}"; - sepNavSelRange = "{7920, 10}"; - sepNavVisRange = "{7458, 890}"; + sepNavIntBoundsRect = "{{0, 0}, {782, 6748}}"; + sepNavSelRange = "{8084, 0}"; + sepNavVisRange = "{551, 818}"; sepNavVisRect = "{{0, 4834}, {758, 716}}"; sepNavWindowFrame = "{{38, 157}, {797, 845}}"; }; @@ -409,19 +448,20 @@ }; 2C4D9DCE0CC9EE6F0031092D /* UMenu.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1220, 21980}}"; - sepNavSelRange = "{28010, 0}"; - sepNavVisRange = "{27660, 1472}"; + sepNavIntBoundsRect = "{{0, 0}, {1220, 21770}}"; + sepNavSelRange = "{25533, 1}"; + sepNavVisRange = "{22476, 1170}"; sepNavVisRect = "{{0, 3972}, {749, 470}}"; - sepNavWindowFrame = "{{38, 157}, {797, 845}}"; + sepNavWindowFrame = "{{38, 82}, {898, 920}}"; }; }; 2C4D9DCF0CC9EE6F0031092D /* UMenuButton.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {680, 8064}}"; - sepNavSelRange = "{6107, 37}"; + sepNavIntBoundsRect = "{{0, 0}, {934, 7546}}"; + sepNavSelRange = "{10421, 15}"; + sepNavVisRange = "{9357, 1695}"; sepNavVisRect = "{{0, 1104}, {577, 612}}"; - sepNavWindowFrame = "{{153, 156}, {616, 741}}"; + sepNavWindowFrame = "{{44, 71}, {993, 935}}"; }; }; 2C4D9DD00CC9EE6F0031092D /* UMenuButtonCollection.pas */ = { @@ -529,103 +569,67 @@ }; 2C8937290CE393FB005D8A87 /* UPlatform.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {776, 1638}}"; - sepNavSelRange = "{2299, 15}"; - sepNavVisRange = "{1739, 1083}"; + sepNavIntBoundsRect = "{{0, 0}, {717, 1120}}"; + sepNavSelRange = "{830, 0}"; + sepNavVisRange = "{241, 1433}"; sepNavVisRect = "{{0, 0}, {737, 826}}"; sepNavWindowFrame = "{{200, 62}, {776, 955}}"; }; }; 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {734, 1456}}"; - sepNavSelRange = "{1212, 0}"; - sepNavVisRange = "{473, 1363}"; + sepNavIntBoundsRect = "{{0, 0}, {881, 2002}}"; + sepNavSelRange = "{696, 0}"; + sepNavVisRange = "{0, 1327}"; sepNavVisRect = "{{0, 105}, {737, 827}}"; sepNavWindowFrame = "{{79, 54}, {776, 956}}"; }; }; - 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {815, 4018}}"; - sepNavSelRange = "{2733, 0}"; - sepNavVisRange = "{5615, 1821}"; - sepNavWindowFrame = "{{15, 140}, {874, 883}}"; - }; - }; - 2CAC2C030D380C5700CA518A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; - name = "UltraStarDX.pas: 4"; - rLen = 0; - rLoc = 131; - rType = 0; - vrLen = 126; - vrLoc = 0; - }; - 2CAC2C0F0D380E8700CA518A /* PBXBookmark */ = { + 2C9129700D43A20F009299BF /* PBXBookmark */ = { isa = PBXBookmark; - fRef = 2C4D9C840CC9EC8C0031092D /* URecord.pas */; + fRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */; }; - 2CAC2C120D380F1200CA518A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C4D9C840CC9EC8C0031092D /* URecord.pas */; - name = "URecord.pas: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1755; - vrLoc = 0; - }; - 2CAC2C130D380F1200CA518A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */; - name = "UAudioInput_Bass.pas: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1426; - vrLoc = 2083; + 2C9129710D43A23B009299BF /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; }; - 2CAC2C140D380F1200CA518A /* PBXTextBookmark */ = { + 2C91297F0D43ADA1009299BF /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */; - name = "UAudioInput_Bass.pas: 131"; + fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; + name = "UPlatformMacOSX.pas: 31"; rLen = 0; - rLoc = 2733; + rLoc = 1020; rType = 0; - vrLen = 1821; - vrLoc = 5615; + vrLen = 1818; + vrLoc = 23; }; - 2CAC2C150D380F1200CA518A /* PBXTextBookmark */ = { + 2C9129820D43ADA1009299BF /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; - name = "UltraStarDX.pas: 3"; + fRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */; + name = "UPlatform.pas: 31"; rLen = 0; - rLoc = 72; + rLoc = 830; rType = 0; - vrLen = 152; - vrLoc = 0; + vrLen = 1433; + vrLoc = 241; }; - 2CAC2C160D380F1200CA518A /* PBXTextBookmark */ = { + 2C9129830D43ADA1009299BF /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 2CF54F5C0CDA1B2B00627463 /* UScreenSing.pas */; - name = "UScreenSing.pas: 320"; + fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */; + name = "UScreenMain.pas: 220"; rLen = 0; - rLoc = 8497; + rLoc = 5112; rType = 0; - vrLen = 1601; - vrLoc = 7561; + vrLen = 1285; + vrLoc = 4486; }; - 2CAC2C170D380F1200CA518A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C4D9C720CC9EC8C0031092D /* UIni.pas */; - name = "UIni.pas: 177"; - rLen = 0; - rLoc = 5110; - rType = 0; - vrLen = 1173; - vrLoc = 4819; + 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {815, 4018}}"; + sepNavSelRange = "{2733, 0}"; + sepNavVisRange = "{5604, 1832}"; + sepNavWindowFrame = "{{15, 140}, {874, 883}}"; + }; }; 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = { uiCtxt = { @@ -642,7 +646,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 0; + breakpointsEnabled = 1; configStateDict = { }; customDataFormattersEnabled = 1; @@ -734,8 +738,9 @@ }; 2CF54F450CDA1B2B00627463 /* UScreenEditConvert.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1178, 8092}}"; - sepNavSelRange = "{41, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {842, 8484}}"; + sepNavSelRange = "{13516, 0}"; + sepNavVisRange = "{13202, 415}"; sepNavVisRect = "{{0, 0}, {715, 815}}"; sepNavWindowFrame = "{{15, 79}, {754, 944}}"; }; @@ -774,9 +779,9 @@ }; 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {695, 4102}}"; - sepNavSelRange = "{3430, 0}"; - sepNavVisRange = "{2860, 1701}"; + sepNavIntBoundsRect = "{{0, 0}, {695, 4018}}"; + sepNavSelRange = "{5112, 0}"; + sepNavVisRange = "{4486, 1285}"; sepNavVisRect = "{{0, 0}, {715, 815}}"; sepNavWindowFrame = "{{38, 79}, {754, 944}}"; }; @@ -919,17 +924,18 @@ }; 2CF54F5C0CDA1B2B00627463 /* UScreenSing.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {695, 19880}}"; - sepNavSelRange = "{8497, 0}"; - sepNavVisRange = "{7561, 1601}"; + sepNavIntBoundsRect = "{{0, 0}, {1250, 18788}}"; + sepNavSelRange = "{39356, 0}"; + sepNavVisRange = "{39482, 1725}"; sepNavVisRect = "{{0, 0}, {715, 815}}"; sepNavWindowFrame = "{{38, 78}, {754, 944}}"; }; }; 2CF54F5D0CDA1B2B00627463 /* UScreenSingModi.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1277, 9324}}"; - sepNavSelRange = "{265, 14}"; + sepNavIntBoundsRect = "{{0, 0}, {729, 9912}}"; + sepNavSelRange = "{21169, 11}"; + sepNavVisRange = "{20602, 649}"; sepNavVisRect = "{{0, 187}, {1277, 312}}"; sepNavWindowFrame = "{{15, 79}, {754, 944}}"; }; @@ -1091,7 +1097,7 @@ }; DDC6850F09F5717A004E4BFF /* Project object */ = { activeArchitecture = i386; - activeBuildConfigurationName = Release; + activeBuildConfigurationName = Debug; activeExecutable = 2CDD4B5D0CB9354800549FAC /* UltraStarDX */; activeTarget = DDC688C709F574E9004E4BFF /* UltraStarDX */; addToTargets = ( @@ -1099,6 +1105,9 @@ DDC688D409F57523004E4BFF /* Put all program sources also in this target */, ); breakpoints = ( + 2C4D9D0E0D381DB000270C66 /* UScreenMain.pas:221 */, + 2C4D9D160D381EBD00270C66 /* UTexture.pas:318 */, + 2C4D9D1B0D381EEA00270C66 /* UTexture.pas:500 */, ); codeSenseManager = 2CDD4B6A0CB9357000549FAC /* Code sense */; executables = ( @@ -1227,20 +1236,16 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 221776031; - PBXWorkspaceStateSaveDate = 221776031; + PBXPerProjectTemplateStateSaveDate = 222536036; + PBXWorkspaceStateSaveDate = 222536036; }; perUserProjectItems = { - 2C36B5E20D358CFB00E8D797 /* PBXTextBookmark */ = 2C36B5E20D358CFB00E8D797 /* PBXTextBookmark */; - 2C36B5E30D358CFB00E8D797 /* PBXTextBookmark */ = 2C36B5E30D358CFB00E8D797 /* PBXTextBookmark */; - 2CAC2C030D380C5700CA518A /* PBXTextBookmark */ = 2CAC2C030D380C5700CA518A /* PBXTextBookmark */; - 2CAC2C0F0D380E8700CA518A /* PBXBookmark */ = 2CAC2C0F0D380E8700CA518A /* PBXBookmark */; - 2CAC2C120D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C120D380F1200CA518A /* PBXTextBookmark */; - 2CAC2C130D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C130D380F1200CA518A /* PBXTextBookmark */; - 2CAC2C140D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C140D380F1200CA518A /* PBXTextBookmark */; - 2CAC2C150D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C150D380F1200CA518A /* PBXTextBookmark */; - 2CAC2C160D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C160D380F1200CA518A /* PBXTextBookmark */; - 2CAC2C170D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C170D380F1200CA518A /* PBXTextBookmark */; + 2C4D9D1C0D381F7A00270C66 /* PBXTextBookmark */ = 2C4D9D1C0D381F7A00270C66 /* PBXTextBookmark */; + 2C9129700D43A20F009299BF /* PBXBookmark */ = 2C9129700D43A20F009299BF /* PBXBookmark */; + 2C9129710D43A23B009299BF /* PBXBookmark */ = 2C9129710D43A23B009299BF /* PBXBookmark */; + 2C91297F0D43ADA1009299BF /* PBXTextBookmark */ = 2C91297F0D43ADA1009299BF /* PBXTextBookmark */; + 2C9129820D43ADA1009299BF /* PBXTextBookmark */ = 2C9129820D43ADA1009299BF /* PBXTextBookmark */; + 2C9129830D43ADA1009299BF /* PBXTextBookmark */ = 2C9129830D43ADA1009299BF /* PBXTextBookmark */; }; sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */; userBuildSettings = { diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj index fff4e14b..882b3563 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj @@ -495,7 +495,7 @@ 2CF552A40CDA42C900627463 /* opt.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = opt.pas; path = ../lib/ffmpeg/opt.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 2CF552A50CDA42C900627463 /* rational.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = rational.pas; path = ../lib/ffmpeg/rational.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 2CF553070CDA51B500627463 /* sdlutils.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = sdlutils.pas; path = "/Library/Frameworks/JEDI-SDL.framework/SDL/sdlutils.pas"; sourceTree = ""; tabWidth = 2; }; - 2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libLib_UltraPong.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libUntil5000.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 2CF8E6BD0CDFA8E80053A996 /* UPartyDefs.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UPartyDefs.pas; path = ../../../Modis/SDK/UPartyDefs.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 98B8BE330B1F947800162019 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 98B8BE370B1F949C00162019 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; @@ -505,7 +505,7 @@ DD37F2430A60255800975B2D /* libfpcrtl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpcrtl.a; sourceTree = BUILT_PRODUCTS_DIR; }; DDC6851B09F57195004E4BFF /* UltraStarDX.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; path = UltraStarDX.pas; sourceTree = ""; tabWidth = 2; }; DDC6868B09F571C2004E4BFF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; - DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "UltraStar Deluxe.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + DDC688C809F574E9004E4BFF /* UltraStarDX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UltraStarDX.app; sourceTree = BUILT_PRODUCTS_DIR; }; DDC688CA09F574E9004E4BFF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; DDC689B309F57C69004E4BFF /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; DDC689B409F57C69004E4BFF /* SDLMain.nib */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = SDLMain.nib; path = English.lproj/SDLMain.nib; sourceTree = ""; }; @@ -822,9 +822,9 @@ DDC6888C09F57243004E4BFF /* Products */ = { isa = PBXGroup; children = ( - DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */, + DDC688C809F574E9004E4BFF /* UltraStarDX.app */, DD37F2430A60255800975B2D /* libfpcrtl.a */, - 2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */, + 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */, ); name = Products; sourceTree = ""; @@ -856,7 +856,7 @@ ); name = Modi_Until5000; productName = Lib_UltraPong; - productReference = 2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */; + productReference = 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */; productType = "com.apple.product-type.library.dynamic"; }; DD37F2420A60255800975B2D /* fpcrtl */ = { @@ -898,7 +898,7 @@ ); name = UltraStarDX; productName = "JEDI-SDLCocoa"; - productReference = DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */; + productReference = DDC688C809F574E9004E4BFF /* UltraStarDX.app */; productType = "com.apple.product-type.application"; }; DDC688D409F57523004E4BFF /* Put all program sources also in this target */ = { -- cgit v1.2.3