marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Amazing fixes to make it compile for Mac again

heavy-resources
Martin Plicht 2012-03-20 16:38:45 +01:00
parent 7686803fab
commit a8cadb8723
6 changed files with 215 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1115,8 +1115,8 @@ endforeach()
# Precompiled header support, gcc part (it needs the cxx flags)
############################################################################
include(GccPchSupport)
if(CMAKE_COMPILER_IS_GNUCXX)
include(GccPchSupport)
if(NOT DEFINED USE_GCC_PCH)
message("Using GCC precompiled headers! USE_GCC_PCH=Off to disable.")
endif()

2
src/editor/C4ConsoleCocoa.mm
View File

@ -426,7 +426,7 @@ void C4ConsoleGUI::AddNetMenuItemForPlayer(int32_t index, StdStrBuf &text)
[ClonkAppDelegate.instance.netMenu.submenu addItem:item];
}
void C4ConsoleGUI::SetInputFunctions(std::list<char*> &functions)
void C4ConsoleGUI::SetInputFunctions(std::list<const char*> &functions)
{
}

2
src/editor/C4EditCursor.cpp
View File

@ -882,7 +882,7 @@ void C4EditCursor::ObjselectDelItems() {
while(it != itemsObjselect.end()) {
#if defined(WITH_DEVELOPER_MODE)
gtk_widget_destroy(it->MenuItem);
#else if defined(_WIN32)
#elseif defined(_WIN32)
if(!it->ItemId) { ++it; continue; }
HMENU hContext = GetSubMenu(hMenu,0);
DeleteMenu(hContext, it->ItemId, MF_BYCOMMAND);

14
src/editor/C4EditCursor.h
View File

@ -44,27 +44,21 @@ protected:
float X,Y,X2,Y2;
bool Hold,DragFrame,DragLine;
C4Object *Target,*DropTarget;
#ifdef _WIN32
HMENU hMenu;
struct ObjselItemDt {
C4EditCursor* EditCursor;
C4Object* Object;
UINT_PTR ItemId;
void* MenuItem;
};
std::vector<ObjselItemDt> itemsObjselect;
#ifdef _WIN32
HMENU hMenu;
#else
#ifdef WITH_DEVELOPER_MODE
GtkWidget* menuContext;
GtkWidget* itemDelete;
GtkWidget* itemDuplicate;
GtkWidget* itemGrabContents;
GtkWidget* itemProperties;
struct ObjselItemDt {
C4EditCursor* EditCursor;
C4Object* Object;
GtkWidget* MenuItem;
};
std::vector<ObjselItemDt> itemsObjselect;
#endif
#endif // _WIN32
C4ObjectList Selection;

4
src/platform/ClonkOpenGLView.mm
View File

@ -622,7 +622,7 @@ namespace
GammaRampConversionTable GammaRampConversionTable::singleton;
}
bool CStdGL::ApplyGammaRamp(_D3DGAMMARAMP& ramp, bool fForce)
bool C4AbstractApp::ApplyGammaRamp(struct _D3DGAMMARAMP &ramp, bool fForce)
{
CGGammaValue r[256];
CGGammaValue g[256];
@ -637,7 +637,7 @@ bool CStdGL::ApplyGammaRamp(_D3DGAMMARAMP& ramp, bool fForce)
return true;
}
bool CStdGL::SaveDefaultGammaRamp(C4Window * pWindow)
bool C4AbstractApp::SaveDefaultGammaRamp(_D3DGAMMARAMP &ramp)
{
return false;//return SDL_GetGammaRamp(DefRamp.ramp.red, DefRamp.ramp.green, DefRamp.ramp.blue) != -1;
}

367
src/res/ConsoleWindow.xib
View File

@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">10J567</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">462.00</string>
<string key="IBDocument.SystemVersion">11D50</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.32</string>
<string key="IBDocument.HIToolboxVersion">568.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@ -13,31 +13,49 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.imagekit.ibplugin</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>823</string>
<string>1.1</string>
<string>2182</string>
<string>1117</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="207"/>
<integer value="217"/>
<integer value="178"/>
<string>NSScroller</string>
<string>NSMenu</string>
<string>NSSliderCell</string>
<string>NSToolbarItem</string>
<string>NSButton</string>
<string>NSToolbarFlexibleSpaceItem</string>
<string>NSCustomObject</string>
<string>NSSlider</string>
<string>NSCustomView</string>
<string>NSComboBox</string>
<string>NSTextField</string>
<string>NSComboBoxCell</string>
<string>NSWindowTemplate</string>
<string>NSTextFieldCell</string>
<string>NSButtonCell</string>
<string>NSSegmentedControl</string>
<string>NSToolbarSpaceItem</string>
<string>NSPopUpButtonCell</string>
<string>NSView</string>
<string>IKImageView</string>
<string>NSToolbar</string>
<string>NSScrollView</string>
<string>NSSegmentedCell</string>
<string>NSPopUpButton</string>
<string>NSMenuItem</string>
<string>NSTextView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.imagekit.ibplugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.imagekit.ibplugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -79,7 +97,7 @@
<string>NSToolbarFlexibleSpaceItem</string>
<string>NSToolbarSpaceItem</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSToolbarItem" id="970302531">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
@ -111,10 +129,9 @@
<string key="NSToolbarItemPaletteLabel">Mode</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSegmentedControl" key="NSToolbarItemView" id="299019912">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {104, 25}}</string>
<reference key="NSSuperview"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="233802485">
<int key="NSCellFlags">-2080244224</int>
@ -203,7 +220,7 @@
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSToolbarCustomizeToolbarItemImage</string>
<string key="NSResourceName">NSToolbarCustomize</string>
</object>
<nil key="NSToolbarItemTarget"/>
<string key="NSToolbarItemAction">runToolbarCustomizationPalette:</string>
@ -286,18 +303,18 @@
<reference ref="970302531"/>
<reference ref="35543244"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
<object class="NSArray" key="NSToolbarIBDefaultItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="450490876"/>
<reference ref="970302531"/>
<reference ref="458626114"/>
<reference ref="35543244"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBSelectableItems">
<object class="NSArray" key="NSToolbarIBSelectableItems" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="768161391">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
@ -308,6 +325,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{6, 0}, {118, 17}}</string>
<reference key="NSSuperview" ref="768161391"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="926896742">
<int key="NSCellFlags">68288064</int>
@ -339,11 +357,29 @@
</object>
</object>
</object>
<object class="NSTextField" id="586873942">
<reference key="NSNextResponder" ref="768161391"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{137, 0}, {141, 17}}</string>
<reference key="NSSuperview" ref="768161391"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="564808166">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Script</string>
<reference key="NSSupport" ref="805367209"/>
<reference key="NSControlView" ref="586873942"/>
<reference key="NSBackgroundColor" ref="43692000"/>
<reference key="NSTextColor" ref="169813348"/>
</object>
</object>
<object class="NSTextField" id="977182517">
<reference key="NSNextResponder" ref="768161391"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{280, 0}, {140, 17}}</string>
<reference key="NSSuperview" ref="768161391"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="750969160">
<int key="NSCellFlags">68288064</int>
@ -365,6 +401,7 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{20, 7}, {348, 26}}</string>
<reference key="NSSuperview" ref="587786245"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="136936318">
<int key="NSCellFlags">343014976</int>
@ -389,15 +426,14 @@
<object class="NSComboTableView" key="NSTableView" id="883834300">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{15, 0}</string>
<string key="NSFrameSize">{13, 0}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn">
<integer value="0" key="NSIdentifier"/>
<double key="NSWidth">12</double>
<double key="NSWidth">10</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@ -448,7 +484,7 @@
</object>
<double key="NSRowHeight">19</double>
<string key="NSAction">tableViewAction:</string>
<int key="NSTvFlags">-767524864</int>
<int key="NSTvFlags">-765427712</int>
<reference key="NSDelegate" ref="136936318"/>
<reference key="NSDataSource" ref="136936318"/>
<reference key="NSTarget" ref="136936318"/>
@ -457,6 +493,7 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
</object>
@ -473,8 +510,9 @@
<object class="NSTextView" id="1053662704">
<reference key="NSNextResponder" ref="90778228"/>
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{426, 14}</string>
<string key="NSFrameSize">{441, 14}</string>
<reference key="NSSuperview" ref="90778228"/>
<reference key="NSWindow"/>
<object class="NSTextContainer" key="NSTextContainer" id="45296395">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@ -491,11 +529,11 @@
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="1053662704"/>
<double key="NSWidth">426</double>
<double key="NSWidth">441</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">12133</int>
<int key="NSFlags">67120997</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="923521988"/>
@ -506,7 +544,7 @@
<string>NSBackgroundColor</string>
<string>NSColor</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSColor" id="196734682">
<int key="NSColorSpace">6</int>
@ -531,7 +569,7 @@
<string>NSCursor</string>
<string>NSUnderline</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSColor" id="821178312">
<int key="NSColorSpace">1</int>
@ -545,21 +583,43 @@
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
<nil key="NSTextFinder"/>
<int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{1179, 1e+07}</string>
<string key="NSMaxSize">{1179, 10000000}</string>
<string key="NSMinize">{223, 0}</string>
<nil key="NSDelegate"/>
</object>
</object>
<string key="NSFrame">{{1, 1}, {420, 338}}</string>
<string key="NSFrame">{{1, 1}, {435, 338}}</string>
<reference key="NSSuperview" ref="67762522"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1053662704"/>
<reference key="NSDocView" ref="1053662704"/>
<reference key="NSBGColor" ref="923521988"/>
<object class="NSCursor" key="NSCursor" id="827337378">
<string key="NSHotSpot">{4, -5}</string>
<int key="NSCursorType">1</int>
<string key="NSHotSpot">{4, 5}</string>
<object class="NSImage" key="NSImage">
<int key="NSImageFlags">79691776</int>
<object class="NSArray" key="NSReps">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="5"/>
<object class="NSURL">
<nil key="NS.base"/>
<object class="NSMutableString" key="NS.relative">
<characters key="NS.bytes">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</characters>
</object>
</object>
</object>
</object>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
</object>
</object>
<int key="NScvFlags">4</int>
</object>
@ -568,6 +628,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{421, 1}, {15, 338}}</string>
<reference key="NSSuperview" ref="67762522"/>
<reference key="NSWindow"/>
<reference key="NSTarget" ref="67762522"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
@ -578,6 +639,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="67762522"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="67762522"/>
@ -588,8 +650,9 @@
</object>
<string key="NSFrame">{{0, 40}, {437, 340}}</string>
<reference key="NSSuperview" ref="587786245"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="90778228"/>
<int key="NSsFlags">146</int>
<int key="NSsFlags">133266</int>
<reference key="NSVScroller" ref="508855094"/>
<reference key="NSHScroller" ref="67614164"/>
<reference key="NSContentView" ref="90778228"/>
@ -599,6 +662,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{373, 10}, {55, 24}}</string>
<reference key="NSSuperview" ref="587786245"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="691588619">
<int key="NSCellFlags">-2080244224</int>
@ -617,14 +681,17 @@
</object>
<string key="NSFrame">{{0, 20}, {437, 380}}</string>
<reference key="NSSuperview" ref="768161391"/>
<reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrameSize">{437, 400}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSWindowTemplate" id="761320180">
<int key="NSWindowStyleMask">8351</int>
@ -634,10 +701,11 @@
<string key="NSWindowTitle">Tools</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{388, 163}</string>
<string key="NSWindowContentMinSize">{388, 163}</string>
<object class="NSView" key="NSWindowView" id="235815207">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -953,11 +1021,11 @@
</object>
</object>
<string key="NSFrameSize">{388, 163}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMinSize">{388, 182}</string>
<string key="NSMaxSize">{388, 182}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSWindowTemplate" id="147644002">
<int key="NSWindowStyleMask">8351</int>
@ -967,9 +1035,9 @@
<string key="NSWindowTitle">Objects</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="426761021">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1008,7 +1076,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">12133</int>
<int key="NSFlags">67120997</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="923521988"/>
@ -1019,7 +1087,7 @@
<string>NSBackgroundColor</string>
<string>NSColor</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="196734682"/>
<reference ref="921228586"/>
@ -1034,7 +1102,7 @@
<string>NSCursor</string>
<string>NSUnderline</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="821178312"/>
<reference ref="862155258"/>
@ -1042,9 +1110,11 @@
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
<nil key="NSTextFinder"/>
<int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{1019, 1e+07}</string>
<string key="NSMaxSize">{1019, 10000000}</string>
<string key="NSMinize">{223, 0}</string>
<nil key="NSDelegate"/>
</object>
@ -1081,7 +1151,7 @@
<string key="NSFrame">{{12, 50}, {357, 108}}</string>
<reference key="NSSuperview" ref="426761021"/>
<reference key="NSNextKeyView" ref="502317114"/>
<int key="NSsFlags">18</int>
<int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="220510991"/>
<reference key="NSHScroller" ref="711933423"/>
<reference key="NSContentView" ref="502317114"/>
@ -1127,15 +1197,14 @@
<object class="NSComboTableView" key="NSTableView" id="687881756">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{15, 0}</string>
<string key="NSFrameSize">{13, 0}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn">
<integer value="0" key="NSIdentifier"/>
<double key="NSWidth">12</double>
<double key="NSWidth">10</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@ -1169,7 +1238,7 @@
<reference key="NSGridColor" ref="212832182"/>
<double key="NSRowHeight">19</double>
<string key="NSAction">tableViewAction:</string>
<int key="NSTvFlags">-767524864</int>
<int key="NSTvFlags">-765427712</int>
<reference key="NSDelegate" ref="929426175"/>
<reference key="NSDataSource" ref="929426175"/>
<reference key="NSTarget" ref="929426175"/>
@ -1178,28 +1247,21 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
</object>
</object>
<string key="NSFrameSize">{389, 178}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="364537446"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">22</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">consoleIn:</string>
@ -1240,6 +1302,14 @@
</object>
<int key="connectionID">107</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">scriptLabel</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="586873942"/>
</object>
<int key="connectionID">108</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">timeLabel</string>
@ -1368,22 +1438,6 @@
</object>
<int key="connectionID">218</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="761320180"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">219</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="147644002"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">220</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">previewView</string>
@ -1432,6 +1486,30 @@
</object>
<int key="connectionID">311</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="364537446"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">22</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="761320180"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">219</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="147644002"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">220</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -1490,6 +1568,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="738226569"/>
<reference ref="586873942"/>
<reference ref="977182517"/>
<reference ref="587786245"/>
</object>
@ -1524,6 +1603,20 @@
<reference key="object" ref="926896742"/>
<reference key="parent" ref="738226569"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">101</int>
<reference key="object" ref="586873942"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="564808166"/>
</object>
<reference key="parent" ref="768161391"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">102</int>
<reference key="object" ref="564808166"/>
<reference key="parent" ref="586873942"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">103</int>
<reference key="object" ref="977182517"/>
@ -1911,29 +2004,18 @@
<string>156.IBPluginDependency</string>
<string>16.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
<string>178.IBEditorWindowLastContentRect</string>
<string>178.IBPluginDependency</string>
<string>178.IBWindowTemplateEditedContentRect</string>
<string>178.NSWindowTemplate.visibleAtLaunch</string>
<string>178.windowTemplate.hasMaxSize</string>
<string>178.windowTemplate.hasMinSize</string>
<string>178.windowTemplate.maxSize</string>
<string>178.windowTemplate.minSize</string>
<string>179.IBPluginDependency</string>
<string>180.IBPluginDependency</string>
<string>180.IBSegmentedControlTracker.RoundRobinState</string>
<string>180.IBSegmentedControlTracker.WasGrowing</string>
<string>181.IBPluginDependency</string>
<string>182.IBPluginDependency</string>
<string>184.IBPluginDependency</string>
<string>185.IBPluginDependency</string>
<string>185.IBSegmentedControlTracker.RoundRobinState</string>
<string>185.IBSegmentedControlTracker.WasGrowing</string>
<string>186.IBPluginDependency</string>
<string>187.IBPluginDependency</string>
<string>188.IBPluginDependency</string>
<string>188.IBSegmentedControlTracker.RoundRobinState</string>
<string>188.IBSegmentedControlTracker.WasGrowing</string>
<string>189.IBPluginDependency</string>
<string>189.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>190.IBPluginDependency</string>
@ -1942,16 +2024,13 @@
<string>192.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>193.IBPluginDependency</string>
<string>194.IBPluginDependency</string>
<string>195.IBEditorWindowLastContentRect</string>
<string>195.IBPluginDependency</string>
<string>196.IBPluginDependency</string>
<string>197.IBPluginDependency</string>
<string>198.IBEditorWindowLastContentRect</string>
<string>198.IBPluginDependency</string>
<string>199.IBPluginDependency</string>
<string>200.IBPluginDependency</string>
<string>200.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>207.IBEditorWindowLastContentRect</string>
<string>207.IBPluginDependency</string>
<string>207.IBWindowTemplateEditedContentRect</string>
<string>207.NSWindowTemplate.visibleAtLaunch</string>
@ -1959,9 +2038,9 @@
<string>215.IBPluginDependency</string>
<string>216.IBPluginDependency</string>
<string>216.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>217.IBPluginDependency</string>
<string>27.IBPluginDependency</string>
<string>28.IBPluginDependency</string>
<string>3.IBEditorWindowLastContentRect</string>
<string>3.IBPluginDependency</string>
<string>3.IBWindowTemplateEditedContentRect</string>
<string>3.NSWindowTemplate.visibleAtLaunch</string>
@ -1977,13 +2056,12 @@
<string>46.IBPluginDependency</string>
<string>47.IBPluginDependency</string>
<string>48.IBPluginDependency</string>
<string>5.IBEditorWindowLastContentRect</string>
<string>5.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
<string>99.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -2001,47 +2079,33 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{404, 596}, {388, 163}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{404, 596}, {388, 163}}</string>
<boolean value="NO"/>
<boolean value="YES"/>
<boolean value="YES"/>
<string>{388, 163}</string>
<string>{388, 163}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0"/>
<integer value="0"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<integer value="0"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{265, 469}, {110, 4}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{462, 213}, {135, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{271, 581}, {389, 178}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{271, 581}, {389, 178}}</string>
<boolean value="NO"/>
@ -2051,7 +2115,7 @@
<integer value="2"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{145, 299}, {437, 400}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{145, 299}, {437, 400}}</string>
<boolean value="YES"/>
@ -2067,7 +2131,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{55, 530}, {617, 169}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -2077,17 +2140,13 @@
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">316</int>
@ -2100,7 +2159,7 @@
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../src/platform/ClonkOpenGLView.h</string>
<string key="minorKey">./Classes/ClonkOpenGLView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@ -2124,7 +2183,7 @@
<string>openGLView</string>
<string>scrollView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>ClonkOpenGLView</string>
<string>NSScrollView</string>
@ -2137,7 +2196,7 @@
<string>openGLView</string>
<string>scrollView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">openGLView</string>
@ -2151,7 +2210,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../src/platform/ClonkWindowController.h</string>
<string key="minorKey">./Classes/ClonkWindowController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@ -2174,7 +2233,7 @@
<string>selectTool:</string>
<string>setGrade:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
@ -2207,7 +2266,7 @@
<string>selectTool:</string>
<string>setGrade:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">consoleIn:</string>
@ -2278,7 +2337,7 @@
<string>toolSelector</string>
<string>toolsPanel</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSComboBox</string>
<string>NSTextField</string>
@ -2290,7 +2349,6 @@
<string>NSScrollView</string>
<string>NSTextView</string>
<string>IKImageView</string>
<string>NSTextField</string>
<string>NSPopUpButton</string>
<string>NSTextField</string>
<string>NSSegmentedControl</string>
@ -2316,7 +2374,7 @@
<string>toolSelector</string>
<string>toolsPanel</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">consoleCombo</string>
@ -2378,15 +2436,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../src/platform/ConsoleWindowController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ConsoleWindowController</string>
<string key="superclassName">ClonkWindowController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
<string key="minorKey">./Classes/ConsoleWindowController.h</string>
</object>
</object>
</object>
@ -2397,16 +2447,11 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../build/osx/clonk.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2423,14 +2468,14 @@
<string>Mouse_Trans</string>
<string>NSMenuCheckmark</string>
<string>NSMenuMixedState</string>
<string>NSToolbarCustomizeToolbarItemImage</string>
<string>NSToolbarCustomize</string>
<string>NoIft_Trans</string>
<string>Picker_Trans</string>
<string>Play_Trans</string>
<string>Rect_Trans</string>
<string>Static_Trans</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{16, 16}</string>
<string>{16, 16}</string>
@ -2441,8 +2486,8 @@
<string>{16, 16}</string>
<string>{16, 16}</string>
<string>{16, 16}</string>
<string>{9, 8}</string>
<string>{7, 2}</string>
<string>{11, 11}</string>
<string>{10, 3}</string>
<string>{32, 32}</string>
<string>{16, 16}</string>
<string>{16, 16}</string>