hedgewars: comparison hedgewars/uLand.pas

equal deleted inserted replaced

-:2e836bebb518
+:453917e94e55
 procedure GenPreview(out Preview: TPreview);
 implementation
 uses uConsole, uStore, uRandom, uLandObjects, uIO, uLandTexture, SysUtils,
 uVariables, uUtils, uCommands, adler32, uDebug, uLandPainted, uTextures,
-uLandGenMaze, uLandOutline;
+uLandGenMaze, uLandOutline, uPhysFSLayer;
 var digest: shortstring;
 procedure ResizeLand(width, height: LongWord);
 var potW, potH: LongInt;
 BlitImageAndGenerateCollisionInfo(rightX - 150 - tmpsurf^.w, LAND_HEIGHT - tmpsurf^.h, tmpsurf^.w, tmpsurf);
 SDL_FreeSurface(tmpsurf);
 end;
 procedure LoadMapConfig;
-var f: textfile;
+var f: PFSFile;
 s: shortstring;
 begin
-// unC0Rr - should this be passed from the GUI? I am not sure which layer does what
+s:= cPathz[ptMapCurrent] + '/map.cfg';
-s:= UserPathz[ptMapCurrent] + '/map.cfg';
-if not FileExists(s) then
-s:= Pathz[ptMapCurrent] + '/map.cfg';
 WriteLnToConsole('Fetching map HH limit');
-{$I-}
-Assign(f, s);
+f:= pfsOpenRead(s);
-filemode:= 0; // readonly
+if f <> nil then
-Reset(f);
+begin
-if IOResult <> 0 then
+pfsReadLn(f, s);
-begin
+if not pfsEof(f) then
-s:= Pathz[ptMissionMaps] + '/' + ExtractFileName(Pathz[ptMapCurrent]) + '/map.cfg';
+begin
-Assign(f, s);
+pfsReadLn(f, s);
-Reset(f);
+val(s, MaxHedgehogs)
 end;
-Readln(f);
-if not eof(f) then
+pfsClose(f)
-Readln(f, MaxHedgehogs);
+end;
-{$I+}
 if (MaxHedgehogs = 0) then
 MaxHedgehogs:= 18;
 end;
 // Loads Land[] from an image, allowing overriding standard collision
 x, y, cpX, cpY: Longword;
 mapName: shortstring;
 begin
 tmpsurf:= LoadDataImage(ptMapCurrent, 'mask', ifAlpha or ifTransparent or ifIgnoreCaps);
 if tmpsurf = nil then
-tmpsurf:= LoadImage(Pathz[ptMapCurrent] + '/mask', ifAlpha or ifTransparent or ifIgnoreCaps);
+begin
-if tmpsurf = nil then
+mapName:= ExtractFileName(cPathz[ptMapCurrent]);
-begin
-mapName:= ExtractFileName(Pathz[ptMapCurrent]);
 tmpsurf:= LoadDataImage(ptMissionMaps, mapName + '/mask', ifAlpha or ifTransparent or ifIgnoreCaps);
 end;
 if (tmpsurf <> nil) and (tmpsurf^.format^.BytesPerPixel = 4) then
 WriteLnToConsole('Loading land from file...');
 AddProgress;
 tmpsurf:= LoadDataImage(ptMapCurrent, 'map', ifAlpha or ifTransparent or ifIgnoreCaps);
 if tmpsurf = nil then
 begin
-mapName:= ExtractFileName(Pathz[ptMapCurrent]);
+mapName:= ExtractFileName(cPathz[ptMapCurrent]);
 tmpsurf:= LoadDataImage(ptMissionMaps, mapName + '/map', ifAlpha or ifCritical or ifTransparent or ifIgnoreCaps);
 end;
 // (bare) Sanity check. Considering possible LongInt comparisons as well as just how much system memoery it would take
 TryDo((tmpsurf^.w < $40000000) and (tmpsurf^.h < $40000000) and (tmpsurf^.w * tmpsurf^.h < 6*1024*1024*1024), 'Map dimensions too big!', true);
 ResizeLand(tmpsurf^.w, tmpsurf^.h);
 LoadMapConfig;
-// unC0Rr - should this be passed from the GUI? I am not sure which layer does what
-s:= UserPathz[ptMapCurrent] + '/map.cfg';
-if not FileExists(s) then
-s:= Pathz[ptMapCurrent] + '/map.cfg';
-WriteLnToConsole('Fetching map HH limit');
-{$I-}
-Assign(f, s);
-filemode:= 0; // readonly
-Reset(f);
-if IOResult <> 0 then
-begin
-s:= Pathz[ptMissionMaps] + '/' + mapName + '/map.cfg';
-Assign(f, s);
-Reset(f);
-end;
-Readln(f);
-if not eof(f) then
-Readln(f, MaxHedgehogs);
-{$I+}
-if (MaxHedgehogs = 0) then
-MaxHedgehogs:= 18;
 playHeight:= tmpsurf^.h;
 playWidth:= tmpsurf^.w;
 leftX:= (LAND_WIDTH - playWidth) div 2;
 rightX:= (playWidth + ((LAND_WIDTH - playWidth) div 2)) - 1;
 LandPixels[(Longword(cWaterLine) - 1 - w) div 2, x div 2]:= c
 end
 end;
 procedure GenMap;
-var x, y, w, c : Longword;
+var x, y, w, c: Longword;
-usermap, usermask, map, mask: shortstring;
+map, mask: shortstring;
-maskOnly : boolean;
+maskOnly: boolean;
 begin
 hasBorder:= false;
 maskOnly:= false;
 LoadThemeConfig;
 // is this not needed any more? lets hope setlength sets also 0s
 //if ((GameFlags and gfForts) <> 0) or (Pathz[ptMapCurrent] <> '') then
 //    FillChar(Land,SizeOf(TCollisionArray),0);*)
 if (GameFlags and gfForts) = 0 then
-if Pathz[ptMapCurrent] <> '' then
+if cPathz[ptMapCurrent] <> '' then
 begin
-usermap:= UserPathz[ptMapCurrent] + '/map.png';
+map:= cPathz[ptMapCurrent] + '/map.png';
-usermask:= UserPathz[ptMapCurrent] + '/mask.png';
+mask:= cPathz[ptMapCurrent] + '/mask.png';
-map:= Pathz[ptMapCurrent] + '/map.png';
+if (not(FileExists(map)) and FileExists(mask)) then
-mask:= Pathz[ptMapCurrent] + '/mask.png';
-if (not(FileExists(usermap)) and FileExists(usermask)) or
-(not(FileExists(map)) and FileExists(mask)) then
 begin
 maskOnly:= true;
 LoadMask;
 GenLandSurface
 end
 DrawBottomBorder;
 if (GameFlags and gfDisableGirders) <> 0 then
 hasGirders:= false;
-if (GameFlags and gfForts = 0) and (maskOnly or (Pathz[ptMapCurrent] = '')) then
+if (GameFlags and gfForts = 0) and (maskOnly or (cPathz[ptMapCurrent] = '')) then
 AddObjects
 else
 AddProgress();
 and (Land[yy-oy, xx-ox] <> 0) then
 inc(t);
 if t > 8 then
 Preview[y, x]:= Preview[y, x] or ($80 shr bit);
 end;
-	end;
+end;
 end;
 procedure chLandCheck(var s: shortstring);
 begin
 else
 TryDo(s = digest, 'Different maps generated, sorry', true);
 end;
 procedure chSendLandDigest(var s: shortstring);
-var adler, i : LongInt;
+var adler, i: LongInt;
 begin
 adler:= 1;
 for i:= 0 to LAND_HEIGHT-1 do
 begin
 adler:= Adler32Update(adler, @Land[i,0], LAND_WIDTH);
 *)
 end;
 procedure freeModule;
 begin
+SetLength(Land, 0, 0);
 SetLength(LandPixels, 0, 0);
+SetLength(LandDirty, 0, 0);
-SetLength(Land, 0, 0);
-SetLength(LandDirty, 0, 0);
 end;
 end.

branch	webgl
changeset 8096	453917e94e55
parent 8026	4a4f21070479
parent 8060	341fa76d0749
child 8330	aaefa587e277