diff --git a/MacOSX/AppController.m b/MacOSX/AppController.m
index 2594a148..d3f503f3 100644
--- a/MacOSX/AppController.m
+++ b/MacOSX/AppController.m
@@ -132,7 +132,9 @@ NSString *FQPrefScreenModeKey = @"ScreenMode";
[arguments addArgument:@"-height" withValue:[NSString stringWithFormat:@"%d", height]];
[arguments addArgument:@"-bpp" withValue:[NSString stringWithFormat:@"%d", bpp]];
- if (!fullscreen)
+ if (fullscreen)
+ [arguments addArgument:@"-fullscreen"];
+ else
[arguments addArgument:@"-window"];
}
diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
index 73a4c0aa..1e809f79 100644
--- a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
+++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
@@ -9,7 +9,7 @@
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
activeArchitecturePreference = i386;
- activeBuildConfigurationName = Release;
+ activeBuildConfigurationName = Debug;
activeExecutable = 4847CD3D12057F05000B560F /* QuakeSpasm */;
activeSDKPreference = macosx10.5;
activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */;
@@ -29,7 +29,7 @@
PBXFileTableDataSourceColumnWidthsKey = (
22,
300,
- 1357.58349609375,
+ 1118,
);
PBXFileTableDataSourceColumnsKey = (
PBXExecutablesDataSource_ActiveFlagID,
@@ -42,7 +42,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 1470,
+ 1230,
20,
48,
43,
@@ -81,11 +81,15 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 303503139;
- PBXWorkspaceStateSaveDate = 303503139;
+ PBXPerProjectTemplateStateSaveDate = 303516610;
+ PBXWorkspaceStateSaveDate = 303516610;
};
perUserProjectItems = {
48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */;
+ 480BB3A212174CA900939117 /* PBXTextBookmark */ = 480BB3A212174CA900939117 /* PBXTextBookmark */;
+ 480BB3A312174CA900939117 /* PBXTextBookmark */ = 480BB3A312174CA900939117 /* PBXTextBookmark */;
+ 480BB3A412174CA900939117 /* PBXBookmark */ = 480BB3A412174CA900939117 /* PBXBookmark */;
+ 480BB3B4121750BB00939117 /* PBXTextBookmark */ = 480BB3B4121750BB00939117 /* PBXTextBookmark */;
48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */;
48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */;
48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */;
@@ -94,8 +98,6 @@
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 */;
@@ -127,6 +129,40 @@
vrLen = 1410;
vrLoc = 0;
};
+ 480BB3A212174CA900939117 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 48243B130D33F01A00C29F8F /* main_sdl.c */;
+ name = "main_sdl.c: 66";
+ rLen = 0;
+ rLoc = 1687;
+ rType = 0;
+ vrLen = 1050;
+ vrLoc = 1109;
+ };
+ 480BB3A312174CA900939117 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 483A78540D2EEAC300CB2E4C /* snd_sdl.c */;
+ name = "snd_sdl.c: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 1405;
+ vrLoc = 2734;
+ };
+ 480BB3A412174CA900939117 /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */;
+ };
+ 480BB3B4121750BB00939117 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */;
+ name = "AppController.m: 133";
+ rLen = 0;
+ rLoc = 4329;
+ rType = 0;
+ vrLen = 1646;
+ vrLoc = 3495;
+ };
48134A1412102F400015BF15 /* net_bsd.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1408, 1157}}";
@@ -180,7 +216,7 @@
};
48243B130D33F01A00C29F8F /* main_sdl.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1408, 2340}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1408, 2353}}";
sepNavSelRange = "{1687, 0}";
sepNavVisRange = "{1109, 1050}";
};
@@ -221,11 +257,18 @@
sepNavVisRange = "{11094, 861}";
};
};
+ 483A78540D2EEAC300CB2E4C /* snd_sdl.c */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1408, 2704}}";
+ sepNavSelRange = "{0, 0}";
+ sepNavVisRange = "{2734, 1405}";
+ };
+ };
4847CD3D12057F05000B560F /* QuakeSpasm */ = {
isa = PBXExecutable;
activeArgIndices = (
YES,
- YES,
+ NO,
);
argumentStrings = (
"-basedir /Applications/Quake",
@@ -343,23 +386,6 @@
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 */;
@@ -502,9 +528,9 @@
};
48B9E7A60D340BEA0001CACF /* AppController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1648, 2184}}";
- sepNavSelRange = "{3436, 0}";
- sepNavVisRange = "{2715, 1113}";
+ sepNavIntBoundsRect = "{{0, 0}, {1408, 2249}}";
+ sepNavSelRange = "{4329, 0}";
+ sepNavVisRange = "{3495, 1646}";
};
};
48B9E7BE0D340EA80001CACF /* SDLApplication.h */ = {
diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
index 4049f6ea..c9a853bb 100644
--- a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
+++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
@@ -267,13 +267,17 @@
PBXSmartGroupTreeModuleOutlineStateExpansionKey
29B97314FDCFA39411CA2CEA
+ 48243B060D33ED0A00C29F8F
+ 483A77D80D2EE8C500CB2E4C
+ 483A77DC0D2EE8ED00CB2E4C
19C28FACFE9D520D11CA2CBB
1C37FAAC04509CD000000102
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 0
+ 39
+ 38
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
@@ -312,7 +316,7 @@
PBXProjectModuleGUID
4890A4C11205A7AE00452753
PBXProjectModuleLabel
- main_sdl.c
+ AppController.m
PBXSplitModuleInNavigatorKey
Split0
@@ -320,11 +324,11 @@
PBXProjectModuleGUID
4890A4C21205A7AE00452753
PBXProjectModuleLabel
- main_sdl.c
+ AppController.m
_historyCapacity
0
bookmark
- 487EA7451217260D00315F97
+ 480BB3B4121750BB00939117
history
4890A5541205C1FF00452753
@@ -345,7 +349,9 @@
4861FA9312144B5300BBDEF1
48028D3E12156C670018F743
487EA7431217260D00315F97
- 487EA7441217260D00315F97
+ 480BB3A212174CA900939117
+ 480BB3A312174CA900939117
+ 480BB3A412174CA900939117
SplitCount
@@ -359,18 +365,18 @@
GeometryConfiguration
Frame
- {{0, 0}, {1469, 668}}
+ {{0, 0}, {1469, 663}}
RubberWindowFrame
0 122 1680 906 0 0 1680 1028
Module
PBXNavigatorGroup
Proportion
- 668pt
+ 663pt
Proportion
- 192pt
+ 197pt
Tabs
@@ -384,7 +390,9 @@
GeometryConfiguration
Frame
- {{10, 27}, {1709, 165}}
+ {{10, 27}, {1469, 170}}
+ RubberWindowFrame
+ 0 122 1680 906 0 0 1680 1028
Module
XCDetailModule
@@ -401,8 +409,6 @@
Frame
{{10, 27}, {1469, 165}}
- RubberWindowFrame
- 0 122 1680 906 0 0 1680 1028
Module
PBXProjectFindModule
@@ -468,11 +474,11 @@
TableOfContents
- 487EA7401217173200315F97
+ 480BB3A612174CA900939117
1CA23ED40692098700951B8B
- 487EA7411217173200315F97
+ 480BB3A712174CA900939117
4890A4C11205A7AE00452753
- 487EA7421217173200315F97
+ 480BB3A812174CA900939117
1CA23EDF0692099D00951B8B
1CA23EE00692099D00951B8B
1CA23EE10692099D00951B8B
@@ -621,14 +627,14 @@
TableOfContents
- 487EA7461217260D00315F97
+ 480BB3A912174CA900939117
1CCC7628064C1048000F2A68
1CCC7629064C1048000F2A68
- 487EA7471217260D00315F97
- 487EA7481217260D00315F97
- 487EA7491217260D00315F97
- 487EA74A1217260D00315F97
- 487EA74B1217260D00315F97
+ 480BB3AA12174CA900939117
+ 480BB3AB12174CA900939117
+ 480BB3AC12174CA900939117
+ 480BB3AD12174CA900939117
+ 480BB3AE12174CA900939117
ToolbarConfigUserDefaultsMinorVersion
2
@@ -662,8 +668,8 @@
5
WindowOrderList
- 487EA74C1217260D00315F97
- 487EA74D1217260D00315F97
+ 480BB3B012174CA900939117
+ 480BB3B112174CA900939117
/Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj
WindowString