fixes and cleanup

Author: alexvins

3rd_party/vcmi_fpjsonrtti.pas

@@ -319,7 +319,7 @@ function TJSONDeStreamer.JSONToVariant(Data: TJSONData): Variant;
         ntFloat   : Result:=Data.AsFloat;
         ntInteger : Result:=Data.AsInteger;
         ntInt64   : Result:=Data.Asint64;
-        //ntQWord   : Result:=Data.AsQWord;
+        ntQWord   : Result:=Data.AsQWord;
       end;
     jtString :
       Result:=Data.AsString;
@@ -528,7 +528,7 @@ procedure TJSONDeStreamer.DoRestoreProperty(AObject : TObject;PropInfo : PPropIn
     tkBool :
       SetOrdProp(AObject,PI,Ord(PropData.AsBoolean));
     tkQWord :
-      SetOrdProp(AObject,PI,PropData.AsInt64);
+      SetOrdProp(AObject,PI,PropData.AsQWord);
     tkObject,
     tkArray,
     tkRecord,
@@ -1163,7 +1163,7 @@ function TJSONStreamer.StreamProperty(Const AObject: TObject; PropertyInfo: PPro
     tkInt64 :
       Result:=TJSONInt64Number.Create(GetOrdProp(AObject,PropertyInfo));
     tkQWord :
-      Result:=TJSONFloatNumber.Create(GetOrdProp(AObject,PropertyInfo));
+      Result:=TJSONQWordNumber.Create(GetOrdProp(AObject,PropertyInfo));
     tkObject :
       Result:=ObjectToJSON(GetObjectProp(AObject,PropertyInfo));
     tkArray,

filesystem.pas

@@ -803,7 +803,6 @@ procedure TFSManager.OnTopLevelDirectoryFound(FileIterator: TFileIterator);
 
     if UpperCase(tld_name) <> 'MODS' then
     begin
-      DebugLn('TLD :', p);
       srch.Search(p, '', False);
     end;
   finally
@@ -1380,7 +1379,7 @@ procedure TFSManager.OnFileFound(FileIterator: TFileIterator);
 
   FResMap.Insert(res_id,res_loc);
 
-  DebugLn(rel_path, ' => ' , res_id.VFSPath, ' => ', FileIterator.FileName);
+  //DebugLn(rel_path, ' => ' , res_id.VFSPath, ' => ', FileIterator.FileName);
 end;
 
 procedure TFSManager.OnLodItemFound(Alod: TLod; constref AItem: TLodItem);
@@ -1530,7 +1529,7 @@ procedure TFSManager.ScanContentDir(const RelDir: string; ARootPath: TStrings);
 begin
   for root_path in ARootPath do
   begin
-    DebugLn('ScanContentDir: ', root_path, ' ', RelDir);
+    //DebugLn('ScanContentDir: ', root_path, ' ', RelDir);
     srch := TFileSearcher.Create;
     //srch.OnFileFound := @OnFileFound;
     srch.OnDirectoryFound:=@OnTopLevelDirectoryFound;

map.pas

@@ -2362,11 +2362,12 @@ procedure TMapObject.SetSubtype(AValue: AnsiString);
 
   if old_subtype=AValue then Exit;
 
-  Assert(Assigned(FMapObjectGroup));
-
   NotifyReferenced(old_subtype,AValue);
 
-  FMapObjectType := FMapObjectGroup.Types.FindItem(AValue);
+  if Assigned(FMapObjectGroup) then
+    FMapObjectType := FMapObjectGroup.Types.FindItem(AValue)
+  else
+    FMapObjectType := nil;
 
   RecreateOptions;
 end;