equal
deleted
inserted
replaced
194 until y > (LAND_HEIGHT-125); |
194 until y > (LAND_HEIGHT-125); |
195 |
195 |
196 if x1 > 0 then |
196 if x1 > 0 then |
197 begin |
197 begin |
198 bRes:= true; |
198 bRes:= true; |
199 tmpsurf:= LoadImage(Pathz[ptCurrTheme] + '/Girder', ifTransparent or ifIgnoreCaps); |
199 tmpsurf:= LoadImage(UserPathz[ptCurrTheme] + '/Girder', ifTransparent or ifIgnoreCaps); |
|
200 if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[ptCurrTheme] + '/Girder', ifTransparent or ifIgnoreCaps); |
|
201 if tmpsurf = nil then tmpsurf:= LoadImage(UserPathz[ptGraphics] + '/Girder', ifTransparent or ifIgnoreCaps); |
200 if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[ptGraphics] + '/Girder', ifCritical or ifTransparent or ifIgnoreCaps); |
202 if tmpsurf = nil then tmpsurf:= LoadImage(Pathz[ptGraphics] + '/Girder', ifCritical or ifTransparent or ifIgnoreCaps); |
201 |
203 |
202 rr.x:= x1; |
204 rr.x:= x1; |
203 while rr.x < x2 do |
205 while rr.x < x2 do |
204 begin |
206 begin |
381 |
383 |
382 begin |
384 begin |
383 |
385 |
384 AddProgress; |
386 AddProgress; |
385 |
387 |
386 s:= Pathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
388 s:= UserPathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
|
389 if not FileExists(s) then s:= Pathz[ptCurrTheme] + '/' + cThemeCFGFilename; |
387 WriteLnToConsole('Reading objects info...'); |
390 WriteLnToConsole('Reading objects info...'); |
388 Assign(f, s); |
391 Assign(f, s); |
389 {$I-} |
392 {$I-} |
390 filemode:= 0; // readonly |
393 filemode:= 0; // readonly |
391 Reset(f); |
394 Reset(f); |
467 begin |
470 begin |
468 inc(ThemeObjects.Count); |
471 inc(ThemeObjects.Count); |
469 with ThemeObjects.objs[Pred(ThemeObjects.Count)] do |
472 with ThemeObjects.objs[Pred(ThemeObjects.Count)] do |
470 begin |
473 begin |
471 i:= Pos(',', s); |
474 i:= Pos(',', s); |
472 Surf:= LoadImage(Pathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifCritical or ifTransparent or ifIgnoreCaps); |
475 Surf:= LoadImage(UserPathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps); |
|
476 if Surf = nil then LoadImage(Pathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifCritical or ifTransparent or ifIgnoreCaps); |
473 Width:= Surf^.w; |
477 Width:= Surf^.w; |
474 Height:= Surf^.h; |
478 Height:= Surf^.h; |
475 Delete(s, 1, i); |
479 Delete(s, 1, i); |
476 i:= Pos(',', s); |
480 i:= Pos(',', s); |
477 Maxcnt:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
481 Maxcnt:= StrToInt(Trim(Copy(s, 1, Pred(i)))); |
523 begin |
527 begin |
524 inc(SprayObjects.Count); |
528 inc(SprayObjects.Count); |
525 with SprayObjects.objs[Pred(SprayObjects.Count)] do |
529 with SprayObjects.objs[Pred(SprayObjects.Count)] do |
526 begin |
530 begin |
527 i:= Pos(',', s); |
531 i:= Pos(',', s); |
528 Surf:= LoadImage(Pathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifCritical or ifTransparent or ifIgnoreCaps); |
532 Surf:= LoadImage(UserPathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifTransparent or ifIgnoreCaps); |
|
533 if Surf = nil then Surf:= LoadImage(Pathz[ptCurrTheme] + '/' + Trim(Copy(s, 1, Pred(i))), ifCritical or ifTransparent or ifIgnoreCaps); |
529 Width:= Surf^.w; |
534 Width:= Surf^.w; |
530 Height:= Surf^.h; |
535 Height:= Surf^.h; |
531 Delete(s, 1, i); |
536 Delete(s, 1, i); |
532 Maxcnt:= StrToInt(Trim(s)); |
537 Maxcnt:= StrToInt(Trim(s)); |
533 end; |
538 end; |