diff --git a/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser b/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser index faac0a7f..73a4c0aa 100644 --- a/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser +++ b/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser @@ -9,7 +9,7 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeArchitecturePreference = i386; - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Release; activeExecutable = 4847CD3D12057F05000B560F /* QuakeSpasm */; activeSDKPreference = macosx10.5; activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */; @@ -81,12 +81,11 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 303391990; - PBXWorkspaceStateSaveDate = 303391990; + PBXPerProjectTemplateStateSaveDate = 303503139; + PBXWorkspaceStateSaveDate = 303503139; }; perUserProjectItems = { 48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */; - 48028D3F12156C670018F743 /* PBXTextBookmark */ = 48028D3F12156C670018F743 /* PBXTextBookmark */; 48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */; 48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */; 48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */; @@ -94,6 +93,9 @@ 4861FA9112144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9112144B5300BBDEF1 /* PBXTextBookmark */; 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */; 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */; + 487EA7431217260D00315F97 /* PBXTextBookmark */ = 487EA7431217260D00315F97 /* PBXTextBookmark */; + 487EA7441217260D00315F97 /* PBXTextBookmark */ = 487EA7441217260D00315F97 /* PBXTextBookmark */; + 487EA7451217260D00315F97 /* PBXTextBookmark */ = 487EA7451217260D00315F97 /* PBXTextBookmark */; 48821E15120DF1150008EE50 /* PBXTextBookmark */ = 48821E15120DF1150008EE50 /* PBXTextBookmark */; 48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */; 4890A5541205C1FF00452753 /* PBXTextBookmark */ = 4890A5541205C1FF00452753 /* PBXTextBookmark */; @@ -102,7 +104,6 @@ 4890A5D41205D58300452753 /* PBXTextBookmark */ = 4890A5D41205D58300452753 /* PBXTextBookmark */; 4890A5D51205D58300452753 /* PBXTextBookmark */ = 4890A5D51205D58300452753 /* PBXTextBookmark */; 4890A5DC1205D59F00452753 /* PBXTextBookmark */ = 4890A5DC1205D59F00452753 /* PBXTextBookmark */; - 4890A5FC1205EA8A00452753 /* PBXTextBookmark */ = 4890A5FC1205EA8A00452753 /* PBXTextBookmark */; 4890A5FD1205EA8A00452753 /* PlistBookmark */ = 4890A5FD1205EA8A00452753 /* PlistBookmark */; }; sourceControlManager = 4847CD5312057F2A000B560F /* Source Control */; @@ -126,16 +127,6 @@ vrLen = 1410; vrLoc = 0; }; - 48028D3F12156C670018F743 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4834895F120598A7004184BC /* appcast.xml */; - name = "appcast.xml: 17"; - rLen = 0; - rLoc = 919; - rType = 0; - vrLen = 919; - vrLoc = 0; - }; 48134A1412102F400015BF15 /* net_bsd.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1408, 1157}}"; @@ -189,9 +180,9 @@ }; 48243B130D33F01A00C29F8F /* main_sdl.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1411, 2314}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{3146, 1082}"; + sepNavIntBoundsRect = "{{0, 0}, {1408, 2340}}"; + sepNavSelRange = "{1687, 0}"; + sepNavVisRange = "{1109, 1050}"; }; }; 4834895D120597F7004184BC /* dsa_pub.pem */ = { @@ -203,7 +194,7 @@ }; 4834895F120598A7004184BC /* appcast.xml */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1648, 663}}"; + sepNavIntBoundsRect = "{{0, 0}, {1517, 636}}"; sepNavSelRange = "{919, 0}"; sepNavVisRange = "{0, 919}"; sepNavWindowFrame = "{{15, 465}, {750, 558}}"; @@ -342,6 +333,33 @@ path = /Users/kristian/Documents/Code/XCode/QuakeSpasm/Quake/net_sdlnet.c; sourceTree = ""; }; + 487EA7431217260D00315F97 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4834895F120598A7004184BC /* appcast.xml */; + name = "appcast.xml: 17"; + rLen = 0; + rLoc = 919; + rType = 0; + vrLen = 919; + vrLoc = 0; + }; + 487EA7441217260D00315F97 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48243B130D33F01A00C29F8F /* main_sdl.c */; + rLen = 10; + rLoc = 1677; + rType = 0; + }; + 487EA7451217260D00315F97 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 48243B130D33F01A00C29F8F /* main_sdl.c */; + name = "main_sdl.c: 66"; + rLen = 0; + rLoc = 1687; + rType = 0; + vrLen = 1050; + vrLoc = 1109; + }; 48821E15120DF1150008EE50 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 487C0A5B0DA94A0700A49FF5 /* net_sdlnet.c */; @@ -464,16 +482,6 @@ sepNavVisRange = "{0, 648}"; }; }; - 4890A5FC1205EA8A00452753 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4834895F120598A7004184BC /* appcast.xml */; - name = "appcast.xml: 5"; - rLen = 0; - rLoc = 278; - rType = 0; - vrLen = 919; - vrLoc = 0; - }; 4890A5FD1205EA8A00452753 /* PlistBookmark */ = { isa = PlistBookmark; fRef = 8D1107310486CEB800E47090 /* Info.plist */; diff --git a/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 b/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 index c6440506..4049f6ea 100644 --- a/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 +++ b/quakespasm/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 @@ -277,7 +277,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {189, 882}} + {{0, 0}, {189, 847}} PBXTopSmartGroupGIDs @@ -287,14 +287,14 @@ GeometryConfiguration Frame - {{0, 0}, {206, 900}} + {{0, 0}, {206, 865}} GroupTreeTableConfiguration MainColumn 189 RubberWindowFrame - 0 117 1920 941 0 0 1920 1058 + 0 122 1680 906 0 0 1680 1028 Module PBXSmartGroupTreeModule @@ -312,7 +312,7 @@ PBXProjectModuleGUID 4890A4C11205A7AE00452753 PBXProjectModuleLabel - appcast.xml + main_sdl.c PBXSplitModuleInNavigatorKey Split0 @@ -320,11 +320,11 @@ PBXProjectModuleGUID 4890A4C21205A7AE00452753 PBXProjectModuleLabel - appcast.xml + main_sdl.c _historyCapacity 0 bookmark - 48028D3F12156C670018F743 + 487EA7451217260D00315F97 history 4890A5541205C1FF00452753 @@ -344,7 +344,8 @@ 4861FA9212144B5300BBDEF1 4861FA9312144B5300BBDEF1 48028D3E12156C670018F743 - 4890A5FC1205EA8A00452753 + 487EA7431217260D00315F97 + 487EA7441217260D00315F97 SplitCount @@ -358,18 +359,18 @@ GeometryConfiguration Frame - {{0, 0}, {1709, 695}} + {{0, 0}, {1469, 668}} RubberWindowFrame - 0 117 1920 941 0 0 1920 1058 + 0 122 1680 906 0 0 1680 1028 Module PBXNavigatorGroup Proportion - 695pt + 668pt Proportion - 200pt + 192pt Tabs @@ -383,9 +384,7 @@ GeometryConfiguration Frame - {{10, 27}, {1709, 173}} - RubberWindowFrame - 0 117 1920 941 0 0 1920 1058 + {{10, 27}, {1709, 165}} Module XCDetailModule @@ -401,7 +400,9 @@ GeometryConfiguration Frame - {{10, 27}, {1229, 359}} + {{10, 27}, {1469, 165}} + RubberWindowFrame + 0 122 1680 906 0 0 1680 1028 Module PBXProjectFindModule @@ -448,7 +449,7 @@ Proportion - 1709pt + 1469pt Name @@ -467,11 +468,11 @@ TableOfContents - 48028D3B121565120018F743 + 487EA7401217173200315F97 1CA23ED40692098700951B8B - 48028D3C121565120018F743 + 487EA7411217173200315F97 4890A4C11205A7AE00452753 - 48028D3D121565120018F743 + 487EA7421217173200315F97 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -620,14 +621,14 @@ TableOfContents - 4861FA9912144B5300BBDEF1 + 487EA7461217260D00315F97 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - 4861FA9A12144B5300BBDEF1 - 4861FA9B12144B5300BBDEF1 - 4861FA9C12144B5300BBDEF1 - 4861FA9D12144B5300BBDEF1 - 4861FA9E12144B5300BBDEF1 + 487EA7471217260D00315F97 + 487EA7481217260D00315F97 + 487EA7491217260D00315F97 + 487EA74A1217260D00315F97 + 487EA74B1217260D00315F97 ToolbarConfigUserDefaultsMinorVersion 2 @@ -661,10 +662,12 @@ 5 WindowOrderList + 487EA74C1217260D00315F97 + 487EA74D1217260D00315F97 /Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj WindowString - 0 117 1920 941 0 0 1920 1058 + 0 122 1680 906 0 0 1680 1028 WindowToolsV3 diff --git a/quakespasm/Quake/main_sdl.c b/quakespasm/Quake/main_sdl.c index 4056911b..6455e9e0 100644 --- a/quakespasm/Quake/main_sdl.c +++ b/quakespasm/Quake/main_sdl.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) Sys_Error ("Not enough memory free; check disk space\n"); Con_Printf("FitzQuake %1.2f (c) John Fitzgibbons\n", FITZQUAKE_VERSION); - Con_Printf("SDL port (c) Sleepwalkr, Baker\n"); + Con_Printf("SDL port (c) SleepwalkR, Baker\n"); Con_Printf("QuakeSpasm %1.2f.%d (c) Ozkan Sezer, Stevenaaus\n", FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH); Con_Printf("Host_Init\n");