hedgewars: comparison hedgewars/uStore.pas

equal deleted inserted replaced

-:01f88c3b7b66
+:1b2b84315d27
 uses SysUtils, uConsts, SDLh, GLunit, uTypes, uLandTexture, uCaptions, uChat;
 procedure initModule;
 procedure freeModule;
+procedure LoadFonts();
 procedure StoreLoad(reload: boolean);
 procedure StoreRelease(reload: boolean);
 procedure RenderHealth(var Hedgehog: THedgehog);
 function makeHealthBarTexture(w, h, Color: Longword): PTexture;
 procedure AddProgress;
 procedure SwapBuffers; {$IFDEF USE_VIDEO_RECORDING}cdecl{$ELSE}inline{$ENDIF};
 procedure SetSkyColor(r, g, b: real);
 implementation
 uses uMisc, uConsole, uVariables, uUtils, uTextures, uRender, uRenderUtils,
-uCommands, uPhysFSLayer, uDebug
+uCommands, uPhysFSLayer, uDebug, adler32
 {$IFDEF USE_CONTEXT_RESTORE}, uWorld{$ENDIF};
 //type TGPUVendor = (gvUnknown, gvNVIDIA, gvATI, gvIntel, gvApple);
 var
-SDLwindow: PSDL_Window;
-SDLGLcontext: PSDL_GLContext;
 squaresize : LongInt;
 numsquares : LongInt;
 ProgrTex: PTexture;
+LoadingText: PTexture;
 prevHat: shortstring;
 tmpHatSurf: PSDL_Surface;
 const
 rr.w:= w;
 rr.h:= h;
 texsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32, RMask, GMask, BMask, AMask);
 if not checkFails(texsurf <> nil, errmsgCreateSurface, true) then
-checkFails(SDL_SetColorKey(texsurf, SDL_SRCCOLORKEY, 0) = 0, errmsgTransparentSet, true);
+checkFails(SDL_SetColorKey(texsurf, SDL_TRUE, 0) = 0, errmsgTransparentSet, true);
 if not allOK then exit(nil);
 DrawRoundRect(@rr, cWhiteColor, cNearBlackColor, texsurf, true);
 r.y:= 0;
 r.w:= 32;
 r.h:= 32;
 texsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, r.w, r.h, 32, RMask, GMask, BMask, AMask);
 if not checkFails(texsurf <> nil, errmsgCreateSurface, true) then
-checkFails(SDL_SetColorKey(texsurf, SDL_SRCCOLORKEY, 0) = 0, errmsgTransparentSet, true);
+checkFails(SDL_SetColorKey(texsurf, SDL_TRUE, 0) = 0, errmsgTransparentSet, true);
 if not allOK then exit;
 r.w:= 26;
 r.h:= 19;
 if TeamsArray[t] <> nil then
 with TeamsArray[t]^ do
 begin
 if GraveName = '' then
 GraveName:= 'Statue';
-texsurf:= LoadDataImageAltFile(ptGraves, GraveName, 'Statue', ifCritical or ifTransparent);
+texsurf:= LoadDataImageAltFile(ptGraves, GraveName, 'Statue', ifCritical or ifColorKey);
 GraveTex:= Surface2Tex(texsurf, false);
 SDL_FreeSurface(texsurf)
 end
 end;
-procedure StoreLoad(reload: boolean);
+procedure LoadFonts();
 var s: shortstring;
-ii: TSprite;
 fi: THWFont;
-ai: TAmmoType;
+begin
-tmpsurf: PSDL_Surface;
+AddFileLog('LoadFonts();');
-i, imflags: LongInt;
-begin
+if (not cOnlyStats) then
-AddFileLog('StoreLoad()');
-if (not reload) and (not cOnlyStats) then
 for fi:= Low(THWFont) to High(THWFont) do
 with Fontz[fi] do
 begin
 s:= cPathz[ptFonts] + '/' + Name;
 WriteToConsole(msgLoading + s + ' (' + inttostr(Height) + 'pt)... ');
 Handle:= TTF_OpenFontRW(rwopsOpenRead(s), true, Height);
 if SDLCheck(Handle <> nil, 'TTF_OpenFontRW', true) then exit;
 TTF_SetFontStyle(Handle, style);
 WriteLnToConsole(msgOK)
 end;
+end;
+procedure StoreLoad(reload: boolean);
+var ii: TSprite;
+ai: TAmmoType;
+tmpsurf, tmpoverlay: PSDL_Surface;
+i, y, imflags: LongInt;
+begin
+AddFileLog('StoreLoad()');
 if not cOnlyStats then
 begin
 MakeCrossHairs;
 LoadGraves;
 begin
 if reload then
 tmpsurf:= Surface
 else
 begin
-imflags := (ifAlpha or ifTransparent);
+imflags := (ifAlpha or ifColorKey);
 // these sprites are optional
-if not (ii in [sprHorizont, sprHorizontL, sprHorizontR, sprSky, sprSkyL, sprSkyR, sprChunk]) then // FIXME: hack
+if critical then
 imflags := (imflags or ifCritical);
 // load the image
-tmpsurf := LoadDataImageAltPath(Path, AltPath, FileName, imflags)
+tmpsurf := LoadDataImageAltPath(Path, AltPath, FileName, imflags);
+if (tmpsurf <> nil) and checkSum then
+for y := 0 to tmpsurf^.h-1 do
+syncedPixelDigest:= Adler32Update(syncedPixelDigest, @PByteArray(tmpsurf^.pixels)^[y*tmpsurf^.pitch], tmpsurf^.w*4)
 end;
 if tmpsurf <> nil then
 begin
 if getImageDimensions then
 begin
 imageWidth:= tmpsurf^.w;
 imageHeight:= tmpsurf^.h
 end;
 if getDimensions then
+if Height = -1 then //BlueWater
+begin
+Width:= tmpsurf^.w;
+Height:= tmpsurf^.h div watFrames;
+end
+else if Height = -2 then //SDWater
+begin
+Width:= tmpsurf^.w;
+Height:= tmpsurf^.h div watSDFrames;
+end
+else
+begin
+Width:= tmpsurf^.w;
+Height:= tmpsurf^.h
+end;
+if (ii in [sprAMAmmos, sprAMAmmosBW]) then
 begin
-Width:= tmpsurf^.w;
+tmpoverlay := LoadDataImage(Path, copy(FileName, 1, length(FileName)-5), (imflags and (not ifCritical)));
-Height:= tmpsurf^.h
+if tmpoverlay <> nil then
+begin
+copyToXY(tmpoverlay, tmpsurf, 0, 0);
+SDL_FreeSurface(tmpoverlay)
+end
 end;
 if (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR]) then
 begin
 Texture:= Surface2Tex(tmpsurf, true);
 Texture^.Scale:= 2
 WriteNames(fnt16);
 if not reload then
 AddProgress;
-tmpsurf:= LoadDataImage(ptGraphics, cHHFileName, ifAlpha or ifCritical or ifTransparent);
+tmpsurf:= LoadDataImage(ptGraphics, cHHFileName, ifAlpha or ifCritical or ifColorKey);
 HHTexture:= Surface2Tex(tmpsurf, false);
 SDL_FreeSurface(tmpsurf);
 InitHealth;
 exit;
 end;
 tmpsurf:= doSurfaceConversion(tmpsurf);
-if (imageFlags and ifTransparent) <> 0 then
+if (imageFlags and ifColorKey) <> 0 then
-if checkFails(SDL_SetColorKey(tmpsurf, SDL_SRCCOLORKEY, 0) = 0, errmsgTransparentSet, true) then exit;
+if checkFails(SDL_SetColorKey(tmpsurf, SDL_TRUE, 0) = 0, errmsgTransparentSet, true) then exit;
 WriteLnToConsole(msgOK + ' (' + inttostr(tmpsurf^.w) + 'x' + inttostr(tmpsurf^.h) + ')');
 LoadImage:= tmpsurf //Result
 end;
 begin
 if cOnlyStats then exit;
 if Step = 0 then
 begin
 WriteToConsole(msgLoading + 'progress sprite: ');
-texsurf:= LoadDataImage(ptGraphics, 'Progress', ifCritical or ifTransparent);
+texsurf:= LoadDataImage(ptGraphics, 'Progress', ifCritical or ifColorKey);
 ProgrTex:= Surface2Tex(texsurf, false);
+LoadingText:= RenderStringTex(trmsg[sidLoading], $FFF39EE8, fntBig);
 squaresize:= texsurf^.w shr 1;
 numsquares:= texsurf^.h div squaresize;
 SDL_FreeSurface(texsurf);
 {$IFNDEF PAS2C}
 with mobileRecord do
 if GameLoading <> nil then
 GameLoading();
 {$ENDIF}
 r.y:= (Step mod numsquares) * squaresize;
 r.w:= squaresize;
 r.h:= squaresize;
 DrawTextureFromRect( -squaresize div 2, (cScreenHeight - squaresize) shr 1, @r, ProgrTex);
+DrawTexture( -LoadingText^.w div 2, (cScreenHeight - LoadingText^.h) shr 1 - (squaresize div 2) - (LoadingText^.h div 2) - 8, LoadingText);
 SwapBuffers;
 inc(Step);
 end;
 {$IFNDEF PAS2C}
 with mobileRecord do
 if GameLoaded <> nil then
 GameLoaded();
 {$ENDIF}
-WriteLnToConsole('Freeing progress surface... ');
+WriteLnToConsole('Freeing progress textures... ');
 FreeAndNilTexture(ProgrTex);
+FreeAndNilTexture(LoadingText);
 Step:= 0
 end;
 function RenderHelpWindow(caption, subcaption, description, extra: ansistring; extracolor: LongInt; iconsurf: PSDL_Surface; iconrect: PSDL_Rect): PTexture;
 var tmpsurf: PSDL_SURFACE;
 r.x:= cFontBorder + 6;
 r.y:= cFontBorder + 4;
 r.w:= 32;
 r.h:= 32;
-SDL_FillRect(tmpsurf, @r, $ffffffff);
+SDL_FillRect(tmpsurf, @r, $ff000000);
 SDL_UpperBlit(iconsurf, iconrect, tmpsurf, @r);
 RenderHelpWindow:=  Surface2Tex(tmpsurf, true);
 SDL_FreeSurface(tmpsurf)
 end;
 procedure RenderWeaponTooltip(atype: TAmmoType);
 var r: TSDL_Rect;
 i: LongInt;
+ammoname: ansistring;
+ammocap: ansistring;
+ammodesc: ansistring;
 extra: ansistring;
 extracolor: LongInt;
 begin
 // don't do anything if the window shouldn't be shown
 if (cReducedQuality and rqTooltipsOff) <> 0 then
 extra:= _S'';
 extracolor:= 0;
 if (CurrentTeam <> nil) and (Ammoz[atype].SkipTurns >= CurrentTeam^.Clan^.TurnNumber) then // weapon or utility is not yet available
 begin
-extra:= trmsg[sidNotYetAvailable];
+if (atype = amTardis) and (suddenDeathDmg) then
+extra:= trmsg[sidNotAvailableInSD]
+else
+extra:= trmsg[sidNotYetAvailable];
 extracolor:= LongInt($ffc77070);
 end
 else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then // weapon or utility will not end your turn
 begin
 extra:= trmsg[sidNoEndTurn];
 begin
 extra:= _S'';
 extracolor:= 0;
 end;
+if length(trluaammo[Ammoz[atype].NameId]) > 0  then
+ammoname := trluaammo[Ammoz[atype].NameId]
+else
+ammoname := trammo[Ammoz[atype].NameId];
+if length(trluaammoc[Ammoz[atype].NameId]) > 0 then
+ammocap := trluaammoc[Ammoz[atype].NameId]
+else
+ammocap := trammoc[Ammoz[atype].NameId];
+if length(trluaammod[Ammoz[atype].NameId]) > 0 then
+ammodesc := trluaammod[Ammoz[atype].NameId]
+else
+ammodesc := trammod[Ammoz[atype].NameId];
+if length(trluaammoa[Ammoz[atype].NameId]) > 0 then
+ammodesc := ammodesc + '|' + trluaammoa[Ammoz[atype].NameId];
 // render window and return the texture
-WeaponTooltipTex:= RenderHelpWindow(trammo[Ammoz[atype].NameId], trammoc[Ammoz[atype].NameId], trammod[Ammoz[atype].NameId], extra, extracolor, SpritesData[sprAMAmmos].Surface, @r)
+WeaponTooltipTex:= RenderHelpWindow(ammoname, ammocap, ammodesc, extra, extracolor, SpritesData[sprAMAmmos].Surface, @r)
 end;
 procedure ShowWeaponTooltip(x, y: LongInt);
 begin
 // draw the texture if it exists
 if reinit then
 begin
 // clean the window from any previous content
 RenderClear();
 if SuddenDeathDmg then
-SetSkyColor(SDSkyColor.r * (SDTint/255) / 255, SDSkyColor.g * (SDTint/255) / 255, SDSkyColor.b * (SDTint/255) / 255)
+SetSkyColor(SDSkyColor.r * (SDTint.r/255) / 255, SDSkyColor.g * (SDTint.g/255) / 255, SDSkyColor.b * (SDTint.b/255) / 255)
 else if ((cReducedQuality and rqNoBackground) = 0) then
 SetSkyColor(SkyColor.r / 255, SkyColor.g / 255, SkyColor.b / 255)
 else
 SetSkyColor(RQSkyColor.r / 255, RQSkyColor.g / 255, RQSkyColor.b / 255);

branch	qmlfrontend
changeset 12855	1b2b84315d27
parent 12844	22cc3d82905a
child 12876	b544bbbd0696
child 12895	c77d75dafe2e
child 12920	21827fc9ca98