From fba2d121b4f590d2c4f4ee1dd0eb4e2d712181d2 Mon Sep 17 00:00:00 2001 From: "Bil Bas (Spooner)" Date: Mon, 16 Feb 2015 20:59:16 +0000 Subject: [PATCH 1/2] Corrected behaviour of File.READ_WRITE mode (fixes #378) --- drivers/unix/file_access_unix.cpp | 2 +- drivers/windows/file_access_windows.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 7f855268522..2f91eee90ed 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -74,7 +74,7 @@ Error FileAccessUnix::_open(const String& p_path, int p_mode_flags) { else if (p_mode_flags==WRITE) mode_string="wb"; else if (p_mode_flags==READ_WRITE) - mode_string="wb+"; + mode_string="rb+"; else return ERR_INVALID_PARAMETER; diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index a6073cbb297..50e2b1d9e6f 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -65,7 +65,7 @@ Error FileAccessWindows::_open(const String& p_filename, int p_mode_flags) { else if (p_mode_flags==WRITE) mode_string=L"wb"; else if (p_mode_flags==READ_WRITE) - mode_string=L"wb+"; + mode_string=L"rb+"; else return ERR_INVALID_PARAMETER; From e7024259e19c18411272ec7b8d2aabf16a93e926 Mon Sep 17 00:00:00 2001 From: "Bil Bas (Spooner)" Date: Wed, 25 Feb 2015 17:24:32 +0000 Subject: [PATCH 2/2] Fixed columns to have integer positions, so that they don't "jiggle" when moving the camera. --- demos/2d/isometric/dungeon.scn | Bin 4582 -> 4721 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/demos/2d/isometric/dungeon.scn b/demos/2d/isometric/dungeon.scn index 76532a44aa68dda3a763b79ef2390a3047290d13..58c530d5c53c67e0068b01fbf08759765d5251f8 100644 GIT binary patch literal 4721 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 literal 4582 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