Merge
authorWuzzy <Wuzzy2@mail.ru>
Thu, 13 Dec 2018 21:35:26 +0100
changeset 14437 05ca0057d71f
parent 14436 6f6d9fe79830 (current diff)
parent 14429 2c4f71779302 (diff)
child 14438 a88c61d8976a
Merge
--- a/hedgewars/hwengine.pas	Thu Dec 13 21:34:04 2018 +0100
+++ b/hedgewars/hwengine.pas	Thu Dec 13 21:35:26 2018 +0100
@@ -140,12 +140,14 @@
     if flagMakeCapture then
         begin
         flagMakeCapture:= false;
-        {$IFNDEF PAS2C}
         if flagDumpLand then
              s:= '/Screenshots/mapdump_'
         else s:= '/Screenshots/hw_';
+        {$IFDEF PAS2C}
         s:= s + inttostr(GameTicks);
+        {$ELSE}
         s:= s + FormatDateTime('YYYY-MM-DD_HH-mm-ss', Now()) + inttostr(GameTicks);
+        {$ENDIF}
 
         // flash
         playSound(sndShutter);
@@ -161,7 +163,6 @@
             WriteLnToConsole('Screenshot failed.');
             AddChatString(#5 + 'screen capture failed (lack of memory or write permissions)');
             end
-        {$ENDIF}
         end;
 end;
 
--- a/project_files/hwc/rtl/fileio.c	Thu Dec 13 21:34:04 2018 +0100
+++ b/project_files/hwc/rtl/fileio.c	Thu Dec 13 21:35:26 2018 +0100
@@ -186,7 +186,8 @@
  */
 void fpcrtl_blockWrite__vars(File f, const void *buf, Integer count,
         Integer *result) {
-    assert(0);
+    assert(f->record_len > 0);
+    *result = fwrite(buf, f->record_len, count, f->fp);
 }
 
 bool fpcrtl_directoryExists(string255 dir) {