sheepy-clone: comparison hedgewars/uLand.pas

equal deleted inserted replaced

-:7de85783b823
+:4a4f21070479
 playWidth:= Template.TemplateWidth;
 leftX:= ((LAND_WIDTH - playWidth) div 2);
 rightX:= (playWidth + ((LAND_WIDTH - playWidth) div 2)) - 1;
 topY:= LAND_HEIGHT - playHeight;
 // HACK: force to only cavern even if a cavern map is invertable if cTemplateFilter = 4 ?
 if (cTemplateFilter = 4)
 or (Template.canInvert and (getrandom(2) = 0))
 or (not Template.canInvert and Template.isNegative) then
 begin
 x, y, cpX, cpY: Longword;
 mapName: shortstring;
 begin
 tmpsurf:= LoadDataImage(ptMapCurrent, 'mask', ifAlpha or ifTransparent or ifIgnoreCaps);
 if tmpsurf = nil then
-begin
+tmpsurf:= LoadImage(Pathz[ptMapCurrent] + '/mask', ifAlpha or ifTransparent or ifIgnoreCaps);
+if tmpsurf = nil then
+begin
 mapName:= ExtractFileName(Pathz[ptMapCurrent]);
 tmpsurf:= LoadDataImage(ptMissionMaps, mapName + '/mask', ifAlpha or ifTransparent or ifIgnoreCaps);
 end;
 SDL_FreeSurface(tmpsurf);
 tmpsurf:= nil;
 end;
 procedure LoadMap;
-var tmpsurf: PSDL_Surface;
+var tmpsurf : PSDL_Surface;
-s: shortstring;
+s	    : shortstring;
-mapName: shortstring = '';
+f	    : textfile;
+mapName : shortstring = '';
 begin
 WriteLnToConsole('Loading land from file...');
 AddProgress;
 tmpsurf:= LoadDataImage(ptMapCurrent, 'map', ifAlpha or ifTransparent or ifIgnoreCaps);
 if tmpsurf = nil then
 // (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;
 BlitImageAndGenerateCollisionInfo(
 (LAND_WIDTH - tmpsurf^.w) div 2,
 LAND_HEIGHT - tmpsurf^.h,
 tmpsurf^.w,
 tmpsurf);
 SDL_FreeSurface(tmpsurf);
 LoadMask;
 end;
 procedure DrawBottomBorder; // broken out from other borders for doing a floor-only map, or possibly updating bottom during SD
 var x, w, c: Longword;
 begin
 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;
-maskOnly: boolean;
+maskOnly : boolean;
 begin
 hasBorder:= false;
 maskOnly:= false;
 LoadThemeConfig;
 end
 else
 MakeFortsMap;
 AddProgress;
 // check for land near top
 c:= 0;
 if (GameFlags and gfBorder) <> 0 then
 hasBorder:= true
 else
 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;
 s:= 'M' + IntToStr(adler) + cScriptName;
 chLandCheck(s);
 SendIPCRaw(@s[0], Length(s) + 1)
 end;
 *)
 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 8026	4a4f21070479
parent 8011	ffd5eba8f7c2
child 8096	453917e94e55