# HG changeset patch # User koda # Date 1256467089 0 # Node ID 10f03732ea605a9782a6999ab94d9328fabf1e1e # Parent aeccc8f51d3f289dc923bdf879f1eb97ad4cc653 convert 24 bits images to 32 (faster to manage) diff -r aeccc8f51d3f -r 10f03732ea60 hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Sun Oct 25 09:02:17 2009 +0000 +++ b/hedgewars/hwengine.pas Sun Oct 25 10:38:09 2009 +0000 @@ -190,6 +190,7 @@ AddFileLog('********************************************* touch down'); SDL_GetMouseState(0, @x, @y); + uKeys.leftClick:= true; {* zoom slider *} if (x <= 50) and (y <= 430) then @@ -272,7 +273,7 @@ SDL_MOUSEBUTTONUP: begin AddFileLog('********************************************* touch up'); - if bShowAmmoMenu = true then uKeys.leftClick:= true; + // if bShowAmmoMenu = true then SDL_GetMouseState(0, @x, @y); {* open ammo menu *} @@ -404,7 +405,7 @@ cAltDamage:= false; cShowFPS:= true; val('8', cTimerInterval); - cReducedQuality:= false; + cReducedQuality:= true; for p:= Succ(Low(TPathType)) to High(TPathType) do if p <> ptMapCurrent then Pathz[p]:= PathPrefix + '/' + Pathz[p] diff -r aeccc8f51d3f -r 10f03732ea60 hedgewars/uKeys.pas --- a/hedgewars/uKeys.pas Sun Oct 25 09:02:17 2009 +0000 +++ b/hedgewars/uKeys.pas Sun Oct 25 10:38:09 2009 +0000 @@ -343,6 +343,7 @@ inc(k, 1); end; end; + {$IFDEF IPHONEOS} DefaultBinds[ 1]:= '/put'; DefaultBinds[ 3]:= 'ammomenu'; diff -r aeccc8f51d3f -r 10f03732ea60 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Sun Oct 25 09:02:17 2009 +0000 +++ b/hedgewars/uStore.pas Sun Oct 25 10:38:09 2009 +0000 @@ -943,7 +943,6 @@ exit(SDL_CreateRGBSurface(SDL_SWSURFACE, 32, 32, 32, RMask, GMask, BMask, AMask)); end; -{$IFDEF DARWIN} //for more information http://www.idevgames.com/forum/showpost.php?p=85864&postcount=7 if (tmpsurf^.format^.bitsperpixel = 24) or ((tmpsurf^.format^.bitsperpixel = 32) and (tmpsurf^.format^.rshift > tmpsurf^.format^.bshift)) then begin @@ -951,7 +950,6 @@ SDL_FreeSurface(tmpsurf); tmpsurf:= convertedSurf; end; -{$ENDIF} if (imageFlags and ifTransparent) <> 0 then TryDo(SDL_SetColorKey(tmpsurf, SDL_SRCCOLORKEY, 0) = 0, errmsgTransparentSet, true); //if (imageFlags and ifAlpha) <> 0 then Result:= SDL_DisplayFormatAlpha(tmpsurf) else Result:= SDL_DisplayFormat(tmpsurf); diff -r aeccc8f51d3f -r 10f03732ea60 hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Sun Oct 25 09:02:17 2009 +0000 +++ b/hedgewars/uWorld.pas Sun Oct 25 10:38:09 2009 +0000 @@ -131,7 +131,7 @@ DrawSprite(sprAMSlot, x, y, 0); DrawSprite(sprAMSlotKeys, x + 2, y + 1, i); t:= 0; - g:= 0; + g:= 0; while (t <= cMaxSlotAmmoIndex) and (Ammo^[i, t].Count > 0) do begin if (Ammo^[i, t].AmmoType <> amNothing) then @@ -345,7 +345,7 @@ {$IFDEF IPHONEOS} {* see the code in MainLoop *} SDL_GetMouseState(0, @x, @y); -//if ((x > 100) and (x <= 220) and (y > 200) and (y <= 280)) and bShowAmmoMenu <> false then +if ((x > 50) and (x <= 270) and (y > 50) and (y <= 430)) then {$ENDIF} if not isPaused then MoveCamera;