diff -r 8474b7fa84d6 -r af2047bb4f70 hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Wed Nov 23 20:12:16 2011 +0300 +++ b/hedgewars/uWorld.pas Thu Nov 24 16:18:45 2011 +0100 @@ -922,7 +922,7 @@ SetScale(cDefaultZoomLevel); // Turn time -{$IFDEF IPHONEOS} +{$IFDEF MOBILE} offsetX:= cScreenHeight - 13; {$ELSE} offsetX:= 48; @@ -951,6 +951,10 @@ // Captions DrawCaptions; +{$IFDEF ANDROID} +// Draw buttons Related to the Touch interface +DrawTexture(Round(-cScreenWidth*0.5 + cScreenHeight*0.02),Round((cScreenHeight*0.98)-(spritesData[sprFireButton].Height*0.4) ),spritesData[sprFireButton].Texture, 0.4); +{$ENDIF} // Teams Healths if TeamsCount * 20 > Longword(cScreenHeight) div 7 then // take up less screen on small displays begin @@ -1024,7 +1028,7 @@ if isInLag then DrawSprite(sprLag, 32 - (cScreenWidth shr 1), 32, (RealTicks shr 7) mod 12); // Wind bar -{$IFDEF IPHONEOS} +{$IFDEF MOBILE} offsetX:= cScreenHeight - 13; offsetY:= (cScreenWidth shr 1) + 74; {$ELSE} @@ -1076,7 +1080,7 @@ end; // fps -{$IFDEF IPHONEOS} +{$IFDEF MOBILE} offsetX:= 8; {$ELSE} offsetX:= 10; @@ -1215,7 +1219,7 @@ var EdgesDist, wdy, shs,z: LongInt; PrevSentPointTime: LongWord = 0; begin -{$IFNDEF IPHONEOS} +{$IFNDEF MOBILE} if (not (CurrentTeam^.ExtDriven and isCursorVisible and not bShowAmmoMenu)) and cHasFocus and (GameState <> gsConfirm) then uCursor.updatePosition(); {$ENDIF} @@ -1243,7 +1247,7 @@ if AMxShift < AMWidth then begin -{$IFDEF IPHONEOS} +{$IFDEF MOBILE} if CursorPoint.X < cScreenWidth div 2 + AMxShift - AMWidth then CursorPoint.X:= cScreenWidth div 2 + AMxShift - AMWidth; if CursorPoint.X > cScreenWidth div 2 + AMxShift - AMxOffset then CursorPoint.X:= cScreenWidth div 2 + AMxShift - AMxOffset; if CursorPoint.Y < cScreenHeight - AMyOffset - SlotsNum * AMSlotSize then CursorPoint.Y:= cScreenHeight - AMyOffset - SlotsNum * AMSlotSize;