From cfd57b391b504fa106caa643262e35c3f4a5e48c Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 11 Dec 2015 00:38:50 -0800 Subject: [PATCH] Revert "Revert "update for new readbyterange behaviour"" This reverts commit adab471173d5f70a11c6be22ef6482591680f65e. --- Lua/classes/Monitor.lua | 6 ++---- Lua/test chests.lua | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Lua/classes/Monitor.lua b/Lua/classes/Monitor.lua index 52b2118..bb4aaa8 100644 --- a/Lua/classes/Monitor.lua +++ b/Lua/classes/Monitor.lua @@ -12,12 +12,10 @@ function Monitor:init(name, a) end function Monitor:read() - -- bizhawk has an off-by-one bug where this returns length + 1 bytes - local raw = mainmemory.readbyterange(self.begin, self.len-1) + local raw = mainmemory.readbyterange(self.begin, self.len) local bytes = {} - local begin = self.begin for k, v in pairs(raw) do - bytes[k - begin] = v + bytes[k] = v end return bytes end diff --git a/Lua/test chests.lua b/Lua/test chests.lua index 52aa31a..0f20e96 100755 --- a/Lua/test chests.lua +++ b/Lua/test chests.lua @@ -43,7 +43,7 @@ function read_ascii(addr, len) -- so we'll set up a table we can use ipairs() on local ordered_bytes = {} for a, v in pairs(bytes) do - ordered_bytes[tonumber(a, 16) - begin + 1] = v + ordered_bytes[tonumber(a, 16) + 1] = v end local seq = false