hedgewars: comparison hedgewars/uStore.pas

equal deleted inserted replaced

-:793386610068
+:b1c2c2f6fc5e
 {$INCLUDE "options.inc"}
 unit uStore;
 interface
-uses sysutils, uConsts, uTeams, SDLh, GLunit;
+uses sysutils, uConsts, uTeams, SDLh, GLunit, uWorld;
 var PixelFormat: PSDL_PixelFormat;
 SDLPrimSurface: PSDL_Surface;
 PauseTexture,
 procedure DrawCentered(X, Top: LongInt; Source: PTexture);
 procedure DrawFromRect(X, Y, W, H: LongInt; r: PSDL_Rect; SourceTexture: PTexture);
 procedure DrawFromRect(X, Y: LongInt; r: PSDL_Rect; SourceTexture: PTexture);
 procedure DrawHedgehog(X, Y: LongInt; Dir: LongInt; Pos, Step: LongWord; Angle: real);
 procedure DrawFillRect(r: TSDL_Rect);
+procedure DrawCircle(X, Y, Radius: LongInt; Width: Single; r, g, b, a: Byte);
 procedure DrawRoundRect(rect: PSDL_Rect; BorderColor, FillColor: Longword; Surface: PSDL_Surface; Clear: boolean);
 function  CheckCJKFont(s: ansistring; font: THWFont): THWFont;
 function  RenderStringTex(s: ansistring; Color: Longword; font: THWFont): PTexture;
 function  RenderSpeechBubbleTex(s: ansistring; SpeechType: Longword; font: THWFont): PTexture;
 procedure flipSurface(Surface: PSDL_Surface; Vertical: Boolean);
 procedure FreeWeaponTooltip;
 procedure Tint(r, g, b, a: Byte); inline;
 procedure Tint(c: Longword); inline;
 implementation
-uses uMisc, uConsole, uLocale;
+uses uMisc, uConsole, uLocale, uMobile;
 type TGPUVendor = (gvUnknown, gvNVIDIA, gvATI, gvIntel, gvApple);
 var HHTexture: PTexture;
 MaxTextureSize: LongInt;
 r.w:= 26;
 r.h:= 19;
 DrawRoundRect(@r, cWhiteColor, cNearBlackColor, texsurf, true);
 // overwrite flag for cpu teams and keep players from using it
 if (Hedgehogs[0].Gear <> nil) and (Hedgehogs[0].BotLevel > 0) then
 Flag:= 'cpu'
 else if Flag = 'cpu' then
 Flag:= 'hedgewars';
 flagsurf:= LoadImage(Pathz[ptFlags] + '/' + Flag, ifNone);
 if flagsurf = nil then
 flagsurf:= LoadImage(Pathz[ptFlags] + '/hedgewars', ifNone);
 TryDo(flagsurf <> nil, 'Failed to load flag "' + Flag + '" as well as the default flag', true);
 copyToXY(flagsurf, texsurf, 2, 2);
 SDL_FreeSurface(flagsurf);
 flagsurf:= nil;
 // restore black border pixels inside the flag
 PLongwordArray(texsurf^.pixels)^[32 * 2 +  2]:= cNearBlackColor;
 PLongwordArray(texsurf^.pixels)^[32 * 2 + 23]:= cNearBlackColor;
 PLongwordArray(texsurf^.pixels)^[32 * 16 +  2]:= cNearBlackColor;
 PLongwordArray(texsurf^.pixels)^[32 * 16 + 23]:= cNearBlackColor;
 FlagTex:= Surface2Tex(texsurf, false);
 SDL_FreeSurface(texsurf);
+AIKillsTex := RenderStringTex(inttostr(stats.AIKills), Clan^.Color, fnt16);
 dec(drY, r.h + 2);
 DrawHealthY:= drY;
 for i:= 0 to 7 do
 with Hedgehogs[i] do
 begin
 if (Length(Hat) > 39) and (Copy(Hat,1,8) = 'Reserved') and (Copy(Hat,9,32) = PlayerHash) then
 texsurf:= LoadImage(Pathz[ptHats] + '/Reserved/' + Copy(Hat,9,Length(s)-8), ifNone)
 else
 texsurf:= LoadImage(Pathz[ptHats] + '/' + Hat, ifNone);
 if texsurf <> nil then
 begin
 HatTex:= Surface2Tex(texsurf, true);
 SDL_FreeSurface(texsurf)
 end;
 texsurf:= nil;
 end
 end;
 end;
 MissionIcons:= LoadImage(Pathz[ptGraphics] + '/missions', ifCritical);
 iconsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, 28, 28, 32, RMask, GMask, BMask, AMask);
 if iconsurf <> nil then
 begin
 r.x:= 0;
 r.y:= 0;
 r.w:= 28;
 r.h:= 28;
 DrawRoundRect(@r, cWhiteColor, cNearBlackColor, iconsurf, true);
 ropeIconTex:= Surface2Tex(iconsurf, false);
 SDL_FreeSurface(iconsurf);
 iconsurf:= nil;
 end;
 end;
 procedure MakeCrossHairs;
 var t: LongInt;
 if SDL_MustLock(texsurf) then
 SDLTry(SDL_LockSurface(texsurf) >= 0, true);
 // make black pixel be alpha-transparent
 for i:= 0 to texsurf^.w * texsurf^.h - 1 do
-if PLongwordArray(texsurf^.pixels)^[i] = AMask then PLongwordArray(texsurf^.pixels)^[i]:= 0;
+if PLongwordArray(texsurf^.pixels)^[i] = AMask then PLongwordArray(texsurf^.pixels)^[i]:= (RMask or GMask or BMask) and Color;
 if SDL_MustLock(texsurf) then
 SDL_UnlockSurface(texsurf);
 CrosshairTex:= Surface2Tex(texsurf, false);
 begin
 for t:= 0 to Pred(TeamsCount) do
 if TeamsArray[t] <> nil then
 with TeamsArray[t]^ do
 begin
-if GraveName = '' then GraveName:= 'Simple';
+if GraveName = '' then GraveName:= 'Statue';
-texsurf:= LoadImage(Pathz[ptGraves] + '/' + GraveName, ifCritical or ifTransparent);
+texsurf:= LoadImage(Pathz[ptGraves] + '/' + GraveName, ifTransparent);
+if texsurf = nil then texsurf:= LoadImage(Pathz[ptGraves] + '/Statue', ifCritical or ifTransparent);
 GraveTex:= Surface2Tex(texsurf, false);
 SDL_FreeSurface(texsurf)
 end
 end;
 end;
 if tmpsurf <> nil then
 begin
 if getImageDimensions then
 begin
 imageWidth:= tmpsurf^.w;
 imageHeight:= tmpsurf^.h
 end;
 if getDimensions then
 begin
 Width:= tmpsurf^.w;
 Height:= tmpsurf^.h
 end;
 if (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR]) then
 begin
 Texture:= Surface2Tex(tmpsurf, true);
 Texture^.Scale:= 2
 end
 else
 begin
 Texture:= Surface2Tex(tmpsurf, false);
 if (ii = sprWater) and ((cReducedQuality and (rq2DWater or rqClampLess)) = 0) then // HACK: We should include some sprite attribute to define the texture wrap directions
-begin
 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-end;
 end;
 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, priority);
-if saveSurf then Surface:= tmpsurf else SDL_FreeSurface(tmpsurf)
+if saveSurf then
+Surface:= tmpsurf else SDL_FreeSurface(tmpsurf)
 end
 else
 Surface:= nil
 end;
 HHTexture:= Surface2Tex(tmpsurf, false);
 SDL_FreeSurface(tmpsurf);
 InitHealth;
+// TODO: are those textures ever freed?
 PauseTexture:= RenderStringTex(trmsg[sidPaused], cYellowColor, fntBig);
 ConfirmTexture:= RenderStringTex(trmsg[sidConfirm], cYellowColor, fntBig);
 SyncTexture:= RenderStringTex(trmsg[sidSync], cYellowColor, fntBig);
 AddProgress;
 // name of weapons in ammo menu
 for ai:= Low(TAmmoType) to High(TAmmoType) do
 with Ammoz[ai] do
 begin
 TryDo(trAmmo[NameId] <> '','No default text/translation found for ammo type #' + intToStr(ord(ai)) + '!',true);
 tmpsurf:= TTF_RenderUTF8_Blended(Fontz[CheckCJKFont(trAmmo[NameId],fnt16)].Handle, Str2PChar(trAmmo[NameId]), cWhiteColorChannels);
 TryDo(tmpsurf <> nil,'Name-texture creation for ammo type #' + intToStr(ord(ai)) + ' failed!',true);
 tmpsurf:= doSurfaceConversion(tmpsurf);
 NameTex:= Surface2Tex(tmpsurf, false);
 SDL_FreeSurface(tmpsurf)
 end;
 // number of weapons in ammo menu
 for i:= Low(CountTexz) to High(CountTexz) do
 begin
 tmpsurf:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(IntToStr(i) + 'x'), cWhiteColorChannels);
 tmpsurf:= doSurfaceConversion(tmpsurf);
 CountTexz[i]:= Surface2Tex(tmpsurf, false);
 SDL_FreeSurface(tmpsurf)
 end;
-{$IFDEF DUMP}
-//not working anymore, where are LandSurface and StoreSurface defined?
-//SDL_SaveBMP_RW(LandSurface, SDL_RWFromFile('LandSurface.bmp', 'wb'), 1);
-//SDL_SaveBMP_RW(StoreSurface, SDL_RWFromFile('StoreSurface.bmp', 'wb'), 1);
-{$ENDIF}
 AddProgress;
 {$IFDEF SDL_IMAGE_NEWER}
 IMG_Quit();
 {$ENDIF}
 var rr: TSDL_Rect;
 _l, _r, _t, _b: real;
 VertexBuffer, TextureBuffer: array [0..3] of TVertex2f;
 begin
 if (SourceTexture^.h = 0) or (SourceTexture^.w = 0) then exit;
+// don't draw anything outside the visible screen space (first check fixes some sprite drawing, e.g. hedgehogs)
+if (abs(X) > W) and ((abs(X + W / 2) - W / 2) > cScreenWidth / cScaleFactor) then
+exit;
+if (abs(Y) > H) and ((abs(Y + H / 2 - (0.5 * cScreenHeight)) - H / 2) > cScreenHeight / cScaleFactor) then
+exit;
 rr.x:= X;
 rr.y:= Y;
 rr.w:= W;
 rr.h:= H;
 glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
 end;
 procedure DrawTexture(X, Y: LongInt; Texture: PTexture; Scale: GLfloat);
 begin
 glPushMatrix;
 glTranslatef(X, Y, 0);
 glScalef(Scale, Scale, 1);
 glBindTexture(GL_TEXTURE_2D, Texture^.id);
 procedure DrawRotatedTextureF(Texture: PTexture; Scale, OffsetX, OffsetY: GLfloat; X, Y, Frame, Dir, w, h: LongInt; Angle: real);
 var ft, fb, fl, fr: GLfloat;
 hw, nx, ny: LongInt;
 VertexBuffer, TextureBuffer: array [0..3] of TVertex2f;
 begin
+// don't draw anything outside the visible screen space (first check fixes some sprite drawing, e.g. hedgehogs)
+if (abs(X) > W) and ((abs(X + dir * OffsetX) - W / 2) * cScaleFactor > cScreenWidth) then
+exit;
+if (abs(Y) > H) and ((abs(Y + OffsetY - (0.5 * cScreenHeight)) - W / 2) * cScaleFactor > cScreenHeight) then
+exit;
 glPushMatrix;
 glTranslatef(X, Y, 0);
 if Dir < 0 then
 glRotatef(Angle, 0, 0, -1)
 end;
 procedure DrawRotatedTex(Tex: PTexture; hw, hh, X, Y, Dir: LongInt; Angle: real);
 var VertexBuffer: array [0..3] of TVertex2f;
 begin
+// don't draw anything outside the visible screen space (first check fixes some sprite drawing, e.g. hedgehogs)
+if (abs(X) > 2 * hw) and ((abs(X) - hw) > cScreenWidth / cScaleFactor) then
+exit;
+if (abs(Y) > 2 * hh) and ((abs(Y - 0.5 * cScreenHeight) - hh) > cScreenHeight / cScaleFactor) then
+exit;
 glPushMatrix;
 glTranslatef(X, Y, 0);
 if Dir < 0 then
 begin
 r.h:= SpritesData[Sprite].Height;
 DrawFromRect(X, Y, @r, SpritesData[Sprite].Texture)
 end;
 procedure DrawCentered(X, Top: LongInt; Source: PTexture);
-begin
+var scale: GLfloat;
-DrawTexture(X - Source^.w shr 1, Top, Source)
+begin
+if (Source^.w + 20) > cScreenWidth then
+scale:= cScreenWidth / (Source^.w + 20)
+else
+scale:= 1.0;
+DrawTexture(X - round(Source^.w * scale) div 2, Top, Source, scale)
 end;
 procedure DrawHedgehog(X, Y: LongInt; Dir: LongInt; Pos, Step: LongWord; Angle: real);
 const VertexBuffer: array [0..3] of TVertex2f = (
 (x: -16; y: -16),
 (x:  16; y:  16),
 (x: -16; y:  16));
 var l, r, t, b: real;
 TextureBuffer: array [0..3] of TVertex2f;
 begin
+// don't draw anything outside the visible screen space (first check fixes some sprite drawing, e.g. hedgehogs)
+if (abs(X) > 32) and ((abs(X) - 16) * cScaleFactor > cScreenWidth) then
+exit;
+if (abs(Y) > 32) and ((abs(Y - 0.5 * cScreenHeight) - 16) * cScaleFactor > cScreenHeight) then
+exit;
 t:= Pos * 32 / HHTexture^.h;
 b:= (Pos + 1) * 32 / HHTexture^.h;
 if Dir = -1 then
 end;
 procedure DrawFillRect(r: TSDL_Rect);
 var VertexBuffer: array [0..3] of TVertex2f;
 begin
+// don't draw anything outside the visible screen space (first check fixes some sprite drawing, e.g. hedgehogs)
+if (abs(r.x) > r.w) and ((abs(r.x + r.w / 2) - r.w / 2) * cScaleFactor > cScreenWidth) then
+exit;
+if (abs(r.y) > r.h) and ((abs(r.y + r.h / 2 - (0.5 * cScreenHeight)) - r.h / 2) * cScaleFactor > cScreenHeight) then
+exit;
 glDisable(GL_TEXTURE_2D);
 Tint($00, $00, $00, $80);
 VertexBuffer[0].X:= r.x;
 Tint($FF, $FF, $FF, $FF);
 glEnable(GL_TEXTURE_2D)
 end;
+procedure DrawCircle(X, Y, Radius: LongInt; Width: Single; r, g, b, a: Byte);
+var
+i: LongInt;
+CircleVertex: array [0..359] of TVertex2f;
+begin
+for i := 0 to 359 do begin
+CircleVertex[i].X := X + Radius*cos(i*pi/180);
+CircleVertex[i].Y := Y + Radius*sin(i*pi/180);
+end;
+glDisable(GL_TEXTURE_2D);
+glEnable(GL_LINE_SMOOTH);
+glPushMatrix;
+glTranslatef(WorldDx, WorldDy, 0);
+glLineWidth(Width);
+Tint(r, g, b, a);
+glVertexPointer(2, GL_FLOAT, 0, @CircleVertex[0]);
+glDrawArrays(GL_LINE_LOOP, 0, 360);
+Tint($FF, $FF, $FF, $FF);
+glPopMatrix;
+glEnable(GL_TEXTURE_2D);
+glDisable(GL_LINE_SMOOTH);
+end;
 procedure StoreRelease;
 var ii: TSprite;
 begin
 for ii:= Low(TSprite) to High(TSprite) do
 begin
 function CheckCJKFont(s: ansistring; font: THWFont): THWFont;
 var l, i : LongInt;
 u: WideChar;
 tmpstr: array[0..256] of WideChar;
 begin
-if (font >= CJKfnt16) or (length(s) = 0)  then exit(font);
+{$IFNDEF IPHONEOS}
+// remove chinese fonts for now
+if (font >= CJKfnt16) or (length(s) = 0) then
+{$ENDIF}
+exit(font);
 l:= Utf8ToUnicode(@tmpstr, Str2PChar(s), length(s))-1;
 i:= 0;
 while i < l do
 begin
 function  LoadImage(const filename: shortstring; imageFlags: LongInt): PSDL_Surface;
 var tmpsurf: PSDL_Surface;
 s: shortstring;
 begin
-WriteToConsole(msgLoading + filename + '.png (flags: ' + inttostr(imageFlags)+') ');
+WriteToConsole(msgLoading + filename + '.png [flags: ' + inttostr(imageFlags) + ']');
-{$IFDEF DEBUGFILE}
-WriteToConsole('[flag translation:');
-if imageFlags = ifNone then
-WriteToConsole(' None')
-else
-begin
-if (imageFlags and ifAlpha) <> 0 then WriteToConsole(' Alpha');
-if (imageFlags and ifCritical) <> 0 then WriteToConsole(' Critical');
-if (imageFlags and ifTransparent) <> 0 then WriteToConsole(' Transparent');
-if (imageFlags and ifIgnoreCaps) <> 0 then WriteToConsole(' IgnoreCaps');
-end;
-WriteToConsole('] ');
-{$ENDIF}
 s:= filename + '.png';
 tmpsurf:= IMG_Load(Str2PChar(s));
 if tmpsurf = nil then
 if ((imageFlags and ifIgnoreCaps) = 0) and ((tmpsurf^.w > MaxTextureSize) or (tmpsurf^.h > MaxTextureSize)) then
 begin
 SDL_FreeSurface(tmpsurf);
 OutError(msgFailedSize, (imageFlags and ifCritical) <> 0);
 // dummy surface to replace non-critical textures that failed to load due to their size
-exit(SDL_CreateRGBSurface(SDL_SWSURFACE, 32, 32, 32, RMask, GMask, BMask, AMask));
+exit(SDL_CreateRGBSurface(SDL_SWSURFACE, 2, 2, 32, RMask, GMask, BMask, AMask));
 end;
 tmpsurf:= doSurfaceConversion(tmpsurf);
 if (imageFlags and ifTransparent) <> 0 then
 end;
 function glLoadExtension(extension : shortstring) : boolean;
 begin
 {$IFDEF IPHONEOS}
+extension:= extension; // avoid hint
 glLoadExtension:= false;
 {$IFDEF DEBUGFILE}
 AddFileLog('OpenGL - "' + extension + '" skipped')
 {$ENDIF}
 {$ELSE}
 {$ENDIF}
 {$ENDIF}
 end;
 procedure SetupOpenGL;
+{$IFNDEF IPHONEOS}
 var vendor: shortstring;
 {$IFDEF DARWIN}
 one: LongInt;
 {$ENDIF}
-begin
+{$ENDIF}
-// initialized here because when initModule is called cScreenWidth/Height are not yet set
+begin
-if (uStore.wScreen = 0) and (uStore.hScreen = 0) then
-begin
-uStore.wScreen:= cScreenWidth;
-uStore.hScreen:= cScreenHeight;
-end;
 {$IFDEF IPHONEOS}
 SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0); // no double buffering
 SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, 1);
 {$ELSE}
 SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+vendor:= LowerCase(shortstring(pchar(glGetString(GL_VENDOR))));
 {$IFNDEF SDL13}
 // this attribute is default in 1.3 and must be enabled in MacOSX
 if (cReducedQuality and rqDesyncVBlank) <> 0 then
 SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 0)
 else
 SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 16); // buffer has to be 16 bit only
 SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1); // try to prefer hardware rendering
 glGetIntegerv(GL_MAX_TEXTURE_SIZE, @MaxTextureSize);
-vendor:= LowerCase(shortstring(pchar(glGetString(GL_VENDOR))));
 {$IFDEF DEBUGFILE}
 AddFileLog('OpenGL-- Renderer: ' + shortstring(pchar(glGetString(GL_RENDERER))));
-AddFileLog('  |----- Vendor: ' + vendor);
+AddFileLog('  |----- Vendor: ' + shortstring(pchar(glGetString(GL_VENDOR))));
 AddFileLog('  |----- Version: ' + shortstring(pchar(glGetString(GL_VERSION))));
 AddFileLog('  \----- GL_MAX_TEXTURE_SIZE: ' + inttostr(MaxTextureSize));
 {$ENDIF}
 if MaxTextureSize <= 0 then
 // just avoid 'never used' compiler warning for now
 if cGPUVendor = gvUnknown then cGPUVendor:= gvUnknown;
 {$ENDIF}
 // set view port to whole window
-{$IFDEF IPHONEOS}
+if (rotationQt = 0) or (rotationQt = 180) then
-glViewport(0, 0, cScreenHeight, cScreenWidth);
+glViewport(0, 0, cScreenWidth, cScreenHeight)
-{$ELSE}
+else
-glViewport(0, 0, cScreenWidth, cScreenHeight);
+glViewport(0, 0, cScreenHeight, cScreenWidth);
-{$ENDIF}
 glMatrixMode(GL_MODELVIEW);
 // prepare default translation/scaling
 glLoadIdentity();
 glRotatef(rotationQt, 0, 0, 1);
 glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
 // disable dithering
 glDisable(GL_DITHER);
 // enable common states by default as they save a lot
 glEnable(GL_TEXTURE_2D);
 glEnableClientState(GL_VERTEX_ARRAY);
 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 end;
 procedure SetScale(f: GLfloat);
 begin
 // leave immediately if scale factor did not change
 else                    // other scaling
 begin
 glPushMatrix;       // save default scaling
 glLoadIdentity;
 glRotatef(rotationQt, 0, 0, 1);
-glScalef(f / wScreen, -f / hScreen, 1.0);
+glScalef(f / cScreenWidth, -f / cScreenHeight, 1.0);
 glTranslatef(0, -cScreenHeight / 2, 0);
 end;
 cScaleFactor:= f;
 end;
 begin
 WriteToConsole(msgLoading + 'progress sprite: ');
 texsurf:= LoadImage(Pathz[ptGraphics] + '/Progress', ifCritical or ifTransparent);
 ProgrTex:= Surface2Tex(texsurf, false);
 squaresize:= texsurf^.w shr 1;
 numsquares:= texsurf^.h div squaresize;
 SDL_FreeSurface(texsurf);
-{$IFDEF IPHONEOS}
-startSpinning();
+perfExt_AddProgress();
-{$ENDIF}
 end;
 TryDo(ProgrTex <> nil, 'Error - Progress Texure is nil!', true);
 glClear(GL_COLOR_BUFFER_BIT);
 if Step < numsquares then r.x:= 0
 else r.x:= squaresize;
 r.y:= (Step mod numsquares) * squaresize;
 r.w:= squaresize;
 r.h:= squaresize;
-DrawFromRect( -squaresize div 2, (hScreen - squaresize) shr 1, @r, ProgrTex);
+DrawFromRect( -squaresize div 2, (cScreenHeight - squaresize) shr 1, @r, ProgrTex);
 SDL_GL_SwapBuffers();
 {$IFDEF SDL13}
 SDL_RenderPresent();
 {$ENDIF}
 procedure FinishProgress;
 begin
 WriteLnToConsole('Freeing progress surface... ');
 FreeTexture(ProgrTex);
-{$IFDEF IPHONEOS}
+perfExt_FinishProgress();
-stopSpinning();
-{$ENDIF}
 end;
 procedure flipSurface(Surface: PSDL_Surface; Vertical: Boolean);
 var y, x, i, j: LongInt;
 tmpPixel: Longword;
 // get extra label's dimensions
 TTF_SizeUTF8(Fontz[font].Handle, Str2PChar(extra), i, j);
 if w < (i + wa) then w:= i + wa;
 inc(h, j + ha);
 end;
 // add borders space
 inc(w, wa);
 inc(h, ha + 8);
 tmpsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, RMask, GMask, BMask, AMask);
 SplitByChar(tmpline, tmpdesc, '|');
 r2:= r;
 if tmpline <> '' then
 begin
 r:= WriteInRect(tmpsurf, FontBorder + 2, r.y + r.h, $ff707070, font, tmpline);
 // render highlighted caption (if there's a ':')
 tmpline2:= '';
 SplitByChar(tmpline, tmpline2, ':');
 if tmpline2 <> '' then
 WriteInRect(tmpsurf, FontBorder + 2, r2.y + r2.h, $ffc7c7c7, font, tmpline + ':');
 r.y:= FontBorder + 4;
 r.w:= 32;
 r.h:= 32;
 SDL_FillRect(tmpsurf, @r, $ffffffff);
 SDL_UpperBlit(iconsurf, iconrect, tmpsurf, @r);
 RenderHelpWindow:=  Surface2Tex(tmpsurf, true);
 SDL_FreeSurface(tmpsurf)
 end;
 procedure RenderWeaponTooltip(atype: TAmmoType);
 // free old texture
 FreeWeaponTooltip;
 // image region
 i:= LongInt(atype) - 1;
-r.x:= (i shr 5) * 32;
+r.x:= (i shr 4) * 32;
-r.y:= (i mod 32) * 32;
+r.y:= (i mod 16) * 32;
 r.w:= 32;
 r.h:= 32;
 // default (no extra text)
 extra:= '';
 else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0 then // weapon or utility won't end your turn
 begin
 extra:= trmsg[sidNoEndTurn];
 extracolor:= LongInt($ff70c770);
 end
 else
 begin
 extra:= '';
 extracolor:= 0;
 end;
 procedure initModule;
 begin
 PixelFormat:= nil;
 SDLPrimSurface:= nil;
-{$IFDEF IPHONEOS}
-rotationQt:= -90;
+{$IFNDEF IPHONEOS}
-{$ELSE}
 rotationQt:= 0;
 cGPUVendor:= gvUnknown;
 {$ENDIF}
-// really initalized in storeLoad
-uStore.wScreen:= 0;
-uStore.hScreen:= 0;
 cScaleFactor:= 2.0;
 SupportNPOTT:= false;
 Step:= 0;
 ProgrTex:= nil;
 end;

branch	experimental3D
changeset 4004	b1c2c2f6fc5e
parent 3696	6009d8378422
parent 3971	5c82ee165ed5
child 4343	19cbea33e4d2