X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Ftools%2Fmapgen.dpr;h=dd1cfa7c2b2517b7c7bf7eca6c2c4b361fc423ea;hb=6fdaf7454535407de0331bdc6b96e538919525a6;hp=27c718306e114e612f526d1aa0831983a32952bb;hpb=ae649f7ffbf9dae5ec6d307b9580d57b844cc0b1;p=d2df-sdl.git

diff --git a/src/tools/mapgen.dpr b/src/tools/mapgen.dpr
index 27c7183..dd1cfa7 100644
--- a/src/tools/mapgen.dpr
+++ b/src/tools/mapgen.dpr
@@ -101,7 +101,7 @@ function TDynRecordHelper.trigTlpDir (): Byte; inline; begin result := Byte(getF
     write(foimpl, #10'// ');
     write(fohlp, #10'// ');
     needComma := false;
-    trec := dfmapdef.trigType[tidx];
+    trec := dfmapdef.trigTypeAt[tidx];
     for nidx := 0 to trec.forTrigCount-1 do
     begin
       if needComma then write(fohlp, ', ');
@@ -129,8 +129,8 @@ function TDynRecordHelper.trigTlpDir (): Byte; inline; begin result := Byte(getF
       knownfld := nil;
       if fldknown.get(toLowerCase1251(palias), knownfld) then
       begin
-        if (fld.name <> knownfld.name) then raise Exception.Create(formatstrf('field ''%s'' of record ''%s'' conflicts with other field ''%s''', [fld.name, trec.name, knownfld.name]));
-        if (fld.baseType <> knownfld.baseType) then raise Exception.Create(formatstrf('field ''%s'' of record ''%s'' conflicts with other field ''%s'' by type', [fld.name, trec.name, knownfld.name]));
+        if (fld.name <> knownfld.name) then raise Exception.Create(formatstrf('field ''%s'' of record ''%s'' conflicts with other field ''%s''', [fld.name, trec.typeName, knownfld.name]));
+        if (fld.baseType <> knownfld.baseType) then raise Exception.Create(formatstrf('field ''%s'' of record ''%s'' conflicts with other field ''%s'' by type', [fld.name, trec.typeName, knownfld.name]));
         writeln('skipped duplicate field ''', fld.name, '''');
         continue;
       end;