diff --git a/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3 b/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3
index b246473e7..e5e1102eb 100644
--- a/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3
+++ b/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3
@@ -197,7 +197,48 @@
Notifications
OpenEditors
-
+
+
+ Content
+
+ PBXProjectModuleGUID
+ 23D3EAAD1014760E001643FA
+ PBXProjectModuleLabel
+ game.cpp
+ PBXSplitModuleInNavigatorKey
+
+ Split0
+
+ PBXProjectModuleGUID
+ 23D3EC2B10166D64001643FA
+ PBXProjectModuleLabel
+ game.cpp
+ _historyCapacity
+ 0
+ bookmark
+ 23D3EC2C10166D64001643FA
+ history
+
+ 23D3EAA51013BA9B001643FA
+
+
+ SplitCount
+ 1
+
+ StatusBarVisibility
+
+
+ Geometry
+
+ Frame
+ {{0, 20}, {951, 627}}
+ PBXModuleWindowStatusBarHidden2
+
+ RubberWindowFrame
+ 166 -61 951 668 0 0 1280 778
+
+
+
PerspectiveWidths
-1
@@ -231,8 +272,6 @@
Layout
- BecomeActive
-
ContentConfiguration
PBXBottomSmartGroupGIDs
@@ -269,6 +308,8 @@
PBXSmartGroupTreeModuleOutlineStateExpansionKey
20286C29FDCF999611CA2CEA
+ 20286C2AFDCF999611CA2CEA
+ 23D3E9E31013ABCA001643FA
1C37FBAC04509CD000000102
1C37FAAC04509CD000000102
1C37FABC05509CD000000102
@@ -276,11 +317,14 @@
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 11
+ 52
+ 42
+ 2
+ 0
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
- {{0, 0}, {186, 581}}
+ {{0, 542}, {186, 581}}
PBXTopSmartGroupGIDs
@@ -310,18 +354,39 @@
Dock
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- <No Editor>
+ menu.cpp
PBXSplitModuleInNavigatorKey
Split0
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
+ PBXProjectModuleLabel
+ menu.cpp
+ _historyCapacity
+ 0
+ bookmark
+ 23D3EC2A10166D64001643FA
+ history
+
+ 23D3EC2310166D64001643FA
+ 23D3EC2410166D64001643FA
+ 23D3EC2510166D64001643FA
+ 23D3EC2610166D64001643FA
+
+ prevStack
+
+ 23D3EC2710166D64001643FA
+ 23D3EC2810166D64001643FA
+ 23D3EC2910166D64001643FA
+
SplitCount
1
@@ -332,14 +397,14 @@
GeometryConfiguration
Frame
- {{0, 0}, {711, 0}}
+ {{0, 0}, {711, 285}}
RubberWindowFrame
155 138 919 640 0 0 1280 778
Module
PBXNavigatorGroup
Proportion
- 0pt
+ 285pt
ContentConfiguration
@@ -352,14 +417,14 @@
GeometryConfiguration
Frame
- {{0, 5}, {711, 594}}
+ {{0, 290}, {711, 309}}
RubberWindowFrame
155 138 919 640 0 0 1280 778
Module
XCDetailModule
Proportion
- 594pt
+ 309pt
Proportion
@@ -514,10 +579,14 @@
5
WindowOrderList
+ 1C530D57069F1CE1000CFCEE
+ 23D3EC2D10166D64001643FA
+ 23D3EC2E10166D64001643FA
1CD10A99069EF8BA00B06720
- 23D3EA5A1013ABF8001643FA
1C78EAAD065D492600B07095
+ 23D3EAAD1014760E001643FA
/Users/az/Programmierung/CommanderGenius/build/Xcode/CommanderGenius.xcodeproj
+ 23D3EA5A1013ABF8001643FA
WindowString
155 138 919 640 0 0 1280 778
@@ -536,30 +605,30 @@
Dock
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
1CD0528F0623707200166675
PBXProjectModuleLabel
- <No Editor>
+ COpenGL.cpp
StatusBarVisibility
GeometryConfiguration
Frame
- {{0, 0}, {771, 0}}
+ {{0, 0}, {771, 245}}
RubberWindowFrame
390 137 771 527 0 0 1280 778
Module
PBXNavigatorGroup
Proportion
- 0pt
+ 245pt
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -574,14 +643,14 @@
GeometryConfiguration
Frame
- {{0, 5}, {771, 481}}
+ {{0, 250}, {771, 236}}
RubberWindowFrame
390 137 771 527 0 0 1280 778
Module
PBXBuildResultsModule
Proportion
- 481pt
+ 236pt
Proportion
@@ -610,7 +679,7 @@
WindowToolGUID
23D3EA5A1013ABF8001643FA
WindowToolIsVisible
-
+
FirstTimeWindowDisplayed
@@ -693,10 +762,10 @@
Frame
{{316, 0}, {378, 185}}
RubberWindowFrame
- 325 241 694 422 0 0 1280 778
+ 238 355 694 422 0 0 1280 778
RubberWindowFrame
- 325 241 694 422 0 0 1280 778
+ 238 355 694 422 0 0 1280 778
Module
PBXDebugSessionModule
@@ -730,15 +799,19 @@
ToolbarConfiguration
xcode.toolbar.config.debugV3
WindowString
- 325 241 694 422 0 0 1280 778
+ 238 355 694 422 0 0 1280 778
WindowToolGUID
1CD10A99069EF8BA00B06720
WindowToolIsVisible
+ FirstTimeWindowDisplayed
+
Identifier
windowTool.find
+ IsVertical
+
Layout
@@ -753,26 +826,16 @@
PBXProjectModuleGUID
1CDD528C0622207200134675
PBXProjectModuleLabel
- <No Editor>
- PBXSplitModuleInNavigatorKey
-
- Split0
-
- PBXProjectModuleGUID
- 1CD0528D0623707200166675
-
- SplitCount
- 1
-
+
StatusBarVisibility
- 1
+
GeometryConfiguration
Frame
- {{0, 0}, {781, 167}}
+ {{0, 0}, {781, 212}}
RubberWindowFrame
- 62 385 781 470 0 0 1440 878
+ 241 308 781 470 0 0 1280 778
Module
PBXNavigatorGroup
@@ -781,11 +844,11 @@
Proportion
- 50%
+ 212pt
BecomeActive
- 1
+
ContentConfiguration
PBXProjectModuleGUID
@@ -796,18 +859,18 @@
GeometryConfiguration
Frame
- {{8, 0}, {773, 254}}
+ {{0, 217}, {781, 212}}
RubberWindowFrame
- 62 385 781 470 0 0 1440 878
+ 241 308 781 470 0 0 1280 778
Module
PBXProjectFindModule
Proportion
- 50%
+ 212pt
Proportion
- 428pt
+ 429pt
Name
@@ -817,23 +880,21 @@
PBXProjectFindModule
StatusbarIsVisible
- 1
+
TableOfContents
1C530D57069F1CE1000CFCEE
- 1C530D58069F1CE1000CFCEE
- 1C530D59069F1CE1000CFCEE
+ 23D3EBE310166BD6001643FA
+ 23D3EBE410166BD6001643FA
1CDD528C0622207200134675
- 1C530D5A069F1CE1000CFCEE
- 1CE0B1FE06471DED0097A5F4
1CD0528E0623707200166675
WindowString
- 62 385 781 470 0 0 1440 878
+ 241 308 781 470 0 0 1280 778
WindowToolGUID
1C530D57069F1CE1000CFCEE
WindowToolIsVisible
- 0
+
Identifier
@@ -866,7 +927,7 @@
Frame
{{0, 0}, {784, 365}}
RubberWindowFrame
- 176 349 784 406 0 0 1280 778
+ 197 228 784 406 0 0 1280 778
Module
PBXDebugCLIModule
@@ -895,7 +956,7 @@
ToolbarConfiguration
xcode.toolbar.config.consoleV3
WindowString
- 176 349 784 406 0 0 1280 778
+ 197 228 784 406 0 0 1280 778
WindowToolGUID
1C78EAAD065D492600B07095
WindowToolIsVisible
diff --git a/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser b/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser
index a7f830ab7..d3a1024c0 100644
--- a/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser
+++ b/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser
@@ -45,7 +45,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 341,
+ 472,
20,
48,
43,
@@ -88,12 +88,16 @@
PBXWorkspaceStateSaveDate = 269724487;
};
perUserProjectItems = {
- 23D3EA611013AC5F001643FA /* PBXTextBookmark */ = 23D3EA611013AC5F001643FA /* PBXTextBookmark */;
- 23D3EA621013AC5F001643FA /* PBXTextBookmark */ = 23D3EA621013AC5F001643FA /* PBXTextBookmark */;
- 23D3EA881013AEC5001643FA /* PBXTextBookmark */ = 23D3EA881013AEC5001643FA /* PBXTextBookmark */;
- 23D3EA891013AEC5001643FA /* PBXTextBookmark */ = 23D3EA891013AEC5001643FA /* PBXTextBookmark */;
- 23D3EA8F1013AF06001643FA /* PBXTextBookmark */ = 23D3EA8F1013AF06001643FA /* PBXTextBookmark */;
- 23D3EA901013AF06001643FA /* PBXTextBookmark */ = 23D3EA901013AF06001643FA /* PBXTextBookmark */;
+ 23D3EAA51013BA9B001643FA /* PBXBookmark */ = 23D3EAA51013BA9B001643FA /* PBXBookmark */;
+ 23D3EC2310166D64001643FA /* PBXTextBookmark */ = 23D3EC2310166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2410166D64001643FA /* PBXTextBookmark */ = 23D3EC2410166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2510166D64001643FA /* PBXTextBookmark */ = 23D3EC2510166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2610166D64001643FA /* PBXTextBookmark */ = 23D3EC2610166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2710166D64001643FA /* PBXTextBookmark */ = 23D3EC2710166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2810166D64001643FA /* PBXTextBookmark */ = 23D3EC2810166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2910166D64001643FA /* PBXTextBookmark */ = 23D3EC2910166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2A10166D64001643FA /* PBXTextBookmark */ = 23D3EC2A10166D64001643FA /* PBXTextBookmark */;
+ 23D3EC2C10166D64001643FA /* PBXTextBookmark */ = 23D3EC2C10166D64001643FA /* PBXTextBookmark */;
};
sourceControlManager = 23D3E96C1013AB1D001643FA /* Source Control */;
userBuildSettings = {
@@ -135,9 +139,13 @@
executableUserSymbolLevel = 0;
libgmallocEnabled = 0;
name = CommanderGenius;
+ savedGlobals = {
+ };
sourceDirectories = (
);
startupPath = /Users/az/Programmierung/CommanderGenius/data;
+ variableFormatDictionary = {
+ };
};
23D3E96C1013AB1D001643FA /* Source Control */ = {
isa = PBXSourceControlManager;
@@ -150,6 +158,28 @@
isa = PBXCodeSenseManager;
indexTemplatePath = "";
};
+ 23D3E9AB1013ABCA001643FA /* game.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {892, 21098}}";
+ sepNavSelRange = "{185, 12}";
+ sepNavVisRange = "{0, 1106}";
+ sepNavWindowFrame = "{{166, -117}, {951, 724}}";
+ };
+ };
+ 23D3E9AC1013ABCA001643FA /* gamedo.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {633, 10808}}";
+ sepNavSelRange = "{24484, 0}";
+ sepNavVisRange = "{24326, 257}";
+ };
+ };
+ 23D3E9D51013ABCA001643FA /* menu.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {650, 20706}}";
+ sepNavSelRange = "{20986, 50}";
+ sepNavVisRange = "{20803, 473}";
+ };
+ };
23D3E9D61013ABCA001643FA /* misc.cpp */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {710, 18284}}";
@@ -157,6 +187,34 @@
sepNavVisRange = "{0, 432}";
};
};
+ 23D3E9E61013ABCA001643FA /* COpenGL.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {710, 2464}}";
+ sepNavSelRange = "{124, 0}";
+ sepNavVisRange = "{0, 309}";
+ };
+ };
+ 23D3E9EA1013ABCA001643FA /* CTimer.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {633, 1470}}";
+ sepNavSelRange = "{1353, 0}";
+ sepNavVisRange = "{1218, 283}";
+ };
+ };
+ 23D3E9EC1013ABCA001643FA /* CVideoDriver.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {642, 10850}}";
+ sepNavSelRange = "{15092, 0}";
+ sepNavVisRange = "{11800, 377}";
+ };
+ };
+ 23D3E9ED1013ABCA001643FA /* CVideoDriver.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {690, 1890}}";
+ sepNavSelRange = "{390, 0}";
+ sepNavVisRange = "{249, 350}";
+ };
+ };
23D3E9F31013ABCA001643FA /* CSound.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {439, 1022}}";
@@ -164,58 +222,96 @@
sepNavVisRange = "{75, 231}";
};
};
- 23D3EA611013AC5F001643FA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "error: SDL.h: No such file or directory";
- fRef = 23D3E9F31013ABCA001643FA /* CSound.h */;
- rLen = 1;
- rLoc = 13;
- rType = 1;
+ 23D3EAA51013BA9B001643FA /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */;
};
- 23D3EA621013AC5F001643FA /* PBXTextBookmark */ = {
+ 23D3EC2310166D64001643FA /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 23D3E9F31013ABCA001643FA /* CSound.h */;
- name = "CSound.h: 14";
- rLen = 17;
- rLoc = 175;
+ fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */;
+ name = "game.cpp: 1";
+ rLen = 0;
+ rLoc = 0;
rType = 0;
- vrLen = 231;
- vrLoc = 75;
- };
- 23D3EA881013AEC5001643FA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "error: 'JoyDrv_Stop' was not declared in this scope";
- fRef = 23D3E9D61013ABCA001643FA /* misc.cpp */;
- rLen = 1;
- rLoc = 54;
- rType = 1;
- };
- 23D3EA891013AEC5001643FA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 23D3E9D61013ABCA001643FA /* misc.cpp */;
- name = "misc.cpp: 55";
- rLen = 33;
- rLoc = 1446;
- rType = 0;
- vrLen = 0;
+ vrLen = 488;
vrLoc = 0;
};
- 23D3EA8F1013AF06001643FA /* PBXTextBookmark */ = {
+ 23D3EC2410166D64001643FA /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- comments = "error: 'JoyDrv_Stop' was not declared in this scope";
- fRef = 23D3E9D61013ABCA001643FA /* misc.cpp */;
+ fRef = 23D3E9E61013ABCA001643FA /* COpenGL.cpp */;
+ name = "COpenGL.cpp: 11";
+ rLen = 0;
+ rLoc = 195;
+ rType = 0;
+ vrLen = 382;
+ vrLoc = 0;
+ };
+ 23D3EC2510166D64001643FA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 23D3E9ED1013ABCA001643FA /* CVideoDriver.h */;
+ name = "CVideoDriver.h: 25";
+ rLen = 0;
+ rLoc = 390;
+ rType = 0;
+ vrLen = 350;
+ vrLoc = 249;
+ };
+ 23D3EC2610166D64001643FA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ comments = "warning: comparison is always true due to limited range of data type";
+ fRef = 23D3E9D51013ABCA001643FA /* menu.cpp */;
rLen = 1;
- rLoc = 54;
+ rLoc = 880;
rType = 1;
};
- 23D3EA901013AF06001643FA /* PBXTextBookmark */ = {
+ 23D3EC2710166D64001643FA /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 23D3E9D61013ABCA001643FA /* misc.cpp */;
- name = "misc.cpp: 10";
- rLen = 9;
- rLoc = 258;
+ fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */;
+ name = "game.cpp: 1";
+ rLen = 0;
+ rLoc = 0;
rType = 0;
- vrLen = 432;
+ vrLen = 488;
+ vrLoc = 0;
+ };
+ 23D3EC2810166D64001643FA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 23D3E9E61013ABCA001643FA /* COpenGL.cpp */;
+ name = "COpenGL.cpp: 11";
+ rLen = 0;
+ rLoc = 195;
+ rType = 0;
+ vrLen = 382;
+ vrLoc = 0;
+ };
+ 23D3EC2910166D64001643FA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 23D3E9ED1013ABCA001643FA /* CVideoDriver.h */;
+ name = "CVideoDriver.h: 25";
+ rLen = 0;
+ rLoc = 390;
+ rType = 0;
+ vrLen = 350;
+ vrLoc = 249;
+ };
+ 23D3EC2A10166D64001643FA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 23D3E9D51013ABCA001643FA /* menu.cpp */;
+ name = "menu.cpp: 881";
+ rLen = 50;
+ rLoc = 20986;
+ rType = 0;
+ vrLen = 430;
+ vrLoc = 20803;
+ };
+ 23D3EC2C10166D64001643FA /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */;
+ name = "game.cpp: 9";
+ rLen = 12;
+ rLoc = 185;
+ rType = 0;
+ vrLen = 1106;
vrLoc = 0;
};
8D0C4E890486CD37000505A6 /* CommanderGenius */ = {