Mercurial Mercurial > hedgewars / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uStore.pas
changeset 5284 34abd278344e
parent 5238 46ddaf14509d
child 5285 af4dc03dd60d
child 5286 22c1f4833a86
equal deleted inserted replaced
5283:bc0459372238 5284:34abd278344e 
   284                 (not (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR]))) and
 
   284                 (not (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR]))) and
 
   285            (((cReducedQuality and rqPlainSplash) = 0) or ((not (ii in [sprSplash, sprDroplet, sprSDSplash, sprSDDroplet])))) and
 
   285            (((cReducedQuality and rqPlainSplash) = 0) or ((not (ii in [sprSplash, sprDroplet, sprSDSplash, sprSDDroplet])))) and
 
   286            (((cReducedQuality and rqKillFlakes) = 0) or (Theme = 'Snow') or (Theme = 'Christmas') or ((not (ii in [sprFlake, sprSDFlake])))) then
 
   286            (((cReducedQuality and rqKillFlakes) = 0) or (Theme = 'Snow') or (Theme = 'Christmas') or ((not (ii in [sprFlake, sprSDFlake])))) then
 
   287         begin
 
   287         begin
 
   288             if AltPath = ptNone then
 
   288             if AltPath = ptNone then
 
   289                 if ii in [sprHorizontL, sprHorizontR, sprSkyL, sprSkyR] then // FIXME: hack
 
   289                 if ii in [sprHorizontL, sprHorizontR, sprSkyL, sprSkyR, sprChunk] then // FIXME: hack
 
   290                     begin
 
   290                     begin
 
   291                     tmpsurf:= LoadImage(UserPathz[Path] + '/' + FileName, ifAlpha or ifTransparent);
 
   291                     tmpsurf:= LoadImage(UserPathz[Path] + '/' + FileName, ifAlpha or ifTransparent);
 
   292                     if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[Path] + '/' + FileName, ifAlpha or ifTransparent)
 
   292                     if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[Path] + '/' + FileName, ifAlpha or ifTransparent)
 
   293                     end
 
   293                     end
 
   294                 else
 
   294                 else
 
   304                 end;
 
   304                 end;
 
   305 
   305 
   306             if tmpsurf <> nil then
 
   306             if tmpsurf <> nil then
 
   307             begin
 
   307             begin
 
   308                 if getImageDimensions then
 
   308                 if getImageDimensions then
 
   309                 begin
 
   309 		begin
 
   310                     imageWidth:= tmpsurf^.w;
 
   310                     imageWidth:= tmpsurf^.w;
 
   311                     imageHeight:= tmpsurf^.h
 
   311                     imageHeight:= tmpsurf^.h
 
   312                 end;
 
   312                 end;
 
   313                 if getDimensions then
 
   313                 if getDimensions then
 
   314                 begin
 
   314                 begin
hedgewars