--- a/cocoaTouch/xib/MapConfigViewController-iPhone.xib	Thu Jun 03 18:31:56 2010 +0000
+++ b/cocoaTouch/xib/MapConfigViewController-iPhone.xib	Thu Jun 03 23:02:35 2010 +0000
@@ -109,7 +109,6 @@
 							<double key="NSSize">15</double>
 							<int key="NSfFlags">16</int>
 						</object>
-						<int key="IBUIButtonType">1</int>
 						<object class="NSColor" key="IBUIHighlightedTitleColor" id="437070330">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
@@ -451,7 +450,6 @@
 							<string>sizeLabel</string>
 							<string>slider</string>
 							<string>tableView</string>
-							<string>viewForTables</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -461,7 +459,6 @@
 							<string>UILabel</string>
 							<string>UISlider</string>
 							<string>UITableView</string>
-							<string>UIView</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">

--- a/hedgewars/uConsts.pas	Thu Jun 03 18:31:56 2010 +0000
+++ b/hedgewars/uConsts.pas	Thu Jun 03 23:02:35 2010 +0000
@@ -259,10 +259,11 @@
     MAXNAMELEN = 192;
     
     // some opengl headers do not have these macros
-    GL_BGR       = $80E0;
-    GL_BGRA      = $80E1;
-    GL_CLAMP_TO_EDGE = $812F;
-
+    GL_BGR              = $80E0;
+    GL_BGRA             = $80E1;
+    GL_CLAMP_TO_EDGE    = $812F;
+    GL_TEXTURE_PRIORITY = $8066;
+    
     cSendCursorPosTime  : LongWord = 50;
     cVisibleWater       : LongInt = 128;
     cCursorEdgesDist    : LongInt = 100;

--- a/hedgewars/uKeys.pas	Thu Jun 03 18:31:56 2010 +0000
+++ b/hedgewars/uKeys.pas	Thu Jun 03 23:02:35 2010 +0000
@@ -61,7 +61,7 @@
     DefaultBinds, CurrentBinds: TBinds;
 
     coeff: LongInt;
-{$IFDEF IPHONEOS}
+{$IFDEF HWLIBRARY}
     leftClick: boolean;
     middleClick: boolean;
     rightClick: boolean;
@@ -86,9 +86,10 @@
     cursorDown: boolean;
     cursorLeft: boolean;
     cursorRight: boolean;
-    
+{$IFDEF IPHONEOS}    
 procedure setiPhoneBinds;
 {$ENDIF}
+{$ENDIF}
 implementation
 uses uTeams, uConsole, uMisc;
 //const KeyNumber = 1024;
@@ -509,7 +510,7 @@
     wheelUp:= false;
     wheelDown:= false;
     coeff:= 5;
-{$IFDEF IPHONEOS}
+{$IFDEF HWLIBRARY}
     // this function is called by HW_allKeysUp so be careful
     
     // mouse emulation