diff -r b216953c2617 -r 10b3b93c1f56 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Tue Nov 13 23:21:46 2012 +0400 +++ b/hedgewars/uStore.pas Wed Nov 14 00:41:29 2012 +0400 @@ -56,9 +56,11 @@ procedure SwapBuffers; {$IFDEF USE_VIDEO_RECORDING}cdecl{$ELSE}inline{$ENDIF}; implementation -uses uMisc, uConsole, uMobile, uVariables, uUtils, uTextures, uRender, uRenderUtils, uCommands, - uDebug{$IFDEF USE_CONTEXT_RESTORE}, uWorld{$ENDIF} - {$IF NOT DEFINED(SDL13) AND DEFINED(USE_VIDEO_RECORDING)}, glut {$ENDIF}; +uses uMisc, uConsole, uMobile, uVariables, uUtils, uTextures, uRender, uRenderUtils, uCommands + , uPhysFSLayer + , uDebug + {$IFDEF USE_CONTEXT_RESTORE}, uWorld{$ENDIF} + {$IF NOT DEFINED(SDL13) AND DEFINED(USE_VIDEO_RECORDING)}, glut {$ENDIF}; //type TGPUVendor = (gvUnknown, gvNVIDIA, gvATI, gvIntel, gvApple); @@ -564,7 +566,7 @@ WriteToConsole(msgLoading + filename + '.png [flags: ' + inttostr(imageFlags) + '] '); s:= filename + '.png'; - tmpsurf:= IMG_Load(Str2PChar(s)); + tmpsurf:= IMG_Load_RW(PHYSFSRWOPS_openRead(Str2PChar(s)), true); if tmpsurf = nil then begin @@ -596,13 +598,7 @@ var tmpsurf: PSDL_Surface; begin // check for file in user dir (never critical) - tmpsurf:= LoadImage(UserPathz[path] + '/' + filename, imageFlags and (not ifCritical)); - - // if unsuccessful check data dir - if (tmpsurf = nil) then - tmpsurf:= LoadImage(Pathz[path] + '/' + filename, imageFlags); - - LoadDataImage:= tmpsurf; + tmpsurf:= LoadImage(cPathz[path] + '/' + filename, imageFlags); end;