sheepy-clone: comparison hedgewars/uStore.pas

equal deleted inserted replaced

-:ae2950c5465c
+:0e27949850e3
 var PixelFormat: PSDL_PixelFormat;
 SDLPrimSurface: PSDL_Surface;
 implementation
-uses uMisc, uIO, uConsole, uLand;
+uses uMisc, uIO, uConsole, uLand, uCollisions;
 var StoreSurface,
 TempSurface,
 HHSurface: PSDL_Surface;
 procedure DrawExplosion(X, Y, Radius: integer);
 var ty, tx, p: integer;
 begin
-for ty:= max(-Radius, -y) to min(radius, 1023 - y) do
+FillRoundInLand(X, Y, Radius, 0);
-for tx:= max(0, round(x-radius*sqrt(1-sqr(ty/radius)))) to min(2047, round(x+radius*sqrt(1-sqr(ty/radius)))) do
-Land[ty + y, tx]:= 0;
 if SDL_MustLock(LandSurface) then
 SDLTry(SDL_LockSurface(LandSurface) >= 0, true);
 p:= integer(LandSurface.pixels);
 case LandSurface.format.BytesPerPixel of
 1: ;// not supported
 2: for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
 for tx:= max(0, round(x-radius*sqrt(1-sqr(ty/radius)))) to min(2047, round(x+radius*sqrt(1-sqr(ty/radius)))) do
-if Land[y + ty, tx] <> 0 then
+if Land[y + ty, tx] = $FFFFFF then
 PWord(p + LandSurface.pitch*(y + ty) + tx * 2)^:= cExplosionBorderColor;
 3: for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
 for tx:= max(0, round(x-radius*sqrt(1-sqr(ty/radius)))) to min(2047, round(x+radius*sqrt(1-sqr(ty/radius)))) do
-if Land[y + ty, tx] <> 0 then
+if Land[y + ty, tx] = $FFFFFF then
 begin
 PByte(p + LandSurface.pitch*(y + ty) + tx * 3 + 0)^:= cExplosionBorderColor and $FF;
 PByte(p + LandSurface.pitch*(y + ty) + tx * 3 + 1)^:= (cExplosionBorderColor shr 8) and $FF;
 PByte(p + LandSurface.pitch*(y + ty) + tx * 3 + 2)^:= (cExplosionBorderColor shr 16);
 end;
 4: for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
 for tx:= max(0, round(x-radius*sqrt(1-sqr(ty/radius)))) to min(2047, round(x+radius*sqrt(1-sqr(ty/radius)))) do
-if Land[y + ty, tx] <> 0 then
+if Land[y + ty, tx] = $FFFFFF then
 PLongword(p + LandSurface.pitch*(y + ty) + tx * 4)^:= cExplosionBorderColor;
 end;
 if SDL_MustLock(LandSurface) then
 SDL_UnlockSurface(LandSurface);
 begin
 case LandSurface.format.BytesPerPixel of
 1: ;
 2: for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
 for tx:= max(0, round(ar[i].Left - radius*sqrt(1-sqr(ty/radius)))) to min(2047, round(ar[i].Right + radius*sqrt(1-sqr(ty/radius)))) do
-if Land[y + ty, tx] <> 0 then
+if Land[y + ty, tx] = $FFFFFF then
 PWord(p + LandSurface.pitch*(y + ty) + tx * 2)^:= cExplosionBorderColor;
 3: for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
 for tx:= max(0, round(ar[i].Left - radius*sqrt(1-sqr(ty/radius)))) to min(2047, round(ar[i].Right + radius*sqrt(1-sqr(ty/radius)))) do
-if Land[y + ty, tx] <> 0 then
+if Land[y + ty, tx] = $FFFFFF then
 begin
 PByte(p + LandSurface.pitch*(y + ty) + tx * 3 + 0)^:= cExplosionBorderColor and $FF;
 PByte(p + LandSurface.pitch*(y + ty) + tx * 3 + 1)^:= (cExplosionBorderColor shr 8) and $FF;
 PByte(p + LandSurface.pitch*(y + ty) + tx * 3 + 2)^:= (cExplosionBorderColor shr 16);
 end;
 4: for ty:= max(-Radius, -y) to min(Radius, 1023 - y) do
 for tx:= max(0, round(ar[i].Left - radius*sqrt(1-sqr(ty/radius)))) to min(2047, round(ar[i].Right + radius*sqrt(1-sqr(ty/radius)))) do
-if Land[y + ty, tx] <> 0 then
+if Land[y + ty, tx] = $FFFFFF then
 PLongword(p + LandSurface.pitch*(y + ty) + tx * 4)^:= cExplosionBorderColor;
 end;
 inc(y, dY)
 end;
 begin
 r.x:= 0;
 r.y:= 256;
 r.w:= 16;
 r.h:= 16;
-s:= Pathz[ptGraphics] + cCHFileName;
+s:= Pathz[ptGraphics] + '/' + cCHFileName;
 WriteToConsole(msgLoading + s + ' ');
 tmpsurf:= IMG_Load(PChar(s));
 TryDo(tmpsurf <> nil, msgFailed, true);
 WriteLnToConsole(msgOK);
 TransColor:= SDL_MapRGB(tmpsurf.format, $FF, $FF, $FF);
 l:= 512;
 while p <> nil do
 begin
 dec(l, 32);
 if p.GraveName = '' then p.GraveName:= 'Simple';
-LoadToSurface(Pathz[ptGraves] + p.GraveName + '.png', StoreSurface, l, 512);
+LoadToSurface(Pathz[ptGraves] + '/' + p.GraveName + '.png', StoreSurface, l, 512);
 p.GraveRect.x:= l;
 p.GraveRect.y:= 512;
 p.GraveRect.w:= 32;
 p.GraveRect.h:= 256;
 p:= p.Next
 procedure GetExplosionBorderColor;
 var f: textfile;
 c: integer;
 begin
-s:= Pathz[ptThemeCurrent] + cThemeCFGFilename;
+s:= Pathz[ptThemeCurrent] + '/' + cThemeCFGFilename;
 WriteToConsole(msgLoading + s + ' ');
 AssignFile(f, s);
 {$I-}
 Reset(f);
 Readln(f, s);
 begin
 for fi:= Low(THWFont) to High(THWFont) do
 with Fontz[fi] do
 begin
-s:= Pathz[ptFonts] + Name;
+s:= Pathz[ptFonts] + '/' + Name;
 WriteToConsole(msgLoading + s + ' ');
 Handle:= TTF_OpenFont(PChar(s), Height);
 TryDo(Handle <> nil, msgFailed, true);
 WriteLnToConsole(msgOK)
 end;
 AddProgress;
-//s:= Pathz[ptMapCurrent] + cLandFileName;
-//WriteToConsole(msgLoading + s + ' ');
-//tmpsurf:= IMG_Load(PChar(s));
 tmpsurf:= LandSurface;
 TryDo(tmpsurf <> nil, msgFailed, true);
 if cFullScreen then
 begin
 LandSurface:= SDL_DisplayFormat(tmpsurf);
 GetExplosionBorderColor;
 AddProgress;
 for i:= Low(TStuff) to High(TStuff) do
-LoadToSurface(Pathz[StuffLoadData[i].Path] + StuffLoadData[i].FileName, StoreSurface, StuffPoz[i].x, StuffPoz[i].y);
+LoadToSurface(Pathz[StuffLoadData[i].Path] + '/' + StuffLoadData[i].FileName, StoreSurface, StuffPoz[i].x, StuffPoz[i].y);
 AddProgress;
 WriteNames(fnt16);
 MakeCrosshairs;
 LoadGraves;
 GetSkyColor;
 AddProgress;
 for ii:= Low(TSprite) to High(TSprite) do
 with SpritesData[ii] do
-Surface:= LoadImage(Pathz[Path] + FileName, hasAlpha);
+Surface:= LoadImage(Pathz[Path] + '/' + FileName, hasAlpha);
 AddProgress;
-tmpsurf:= LoadImage(Pathz[ptGraphics] + cHHFileName, false);
+tmpsurf:= LoadImage(Pathz[ptGraphics] + '/' + cHHFileName, false);
 TryDo(SDL_SetColorKey(tmpsurf, SDL_SRCCOLORKEY or SDL_RLEACCEL, 0) = 0, errmsgTransparentSet, true);
 HHSurface:= SDL_DisplayFormat(tmpsurf);
 SDL_FreeSurface(tmpsurf);
 InitHealth;

changeset 53	0e27949850e3
parent 49	3afe33c1cf06
child 54	839fd258ae6f