From dd1f33ab53c104cc14cde61b23d17397d0af3602 Mon Sep 17 00:00:00 2001 From: Yoshi2 Date: Sun, 19 Sep 2021 12:29:46 +0200 Subject: [PATCH] Fix variable names and return false if memory not found --- memorylib.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/memorylib.py b/memorylib.py index 844fda7..4eea7a3 100644 --- a/memorylib.py +++ b/memorylib.py @@ -116,7 +116,7 @@ SOFTWARE.""" class Dolphin(object): def __init__(self): self.pid = -1 - self.shmem = None + self.memory = None def reset(self): self.pid = -1 @@ -151,13 +151,17 @@ class Dolphin(object): return True def init_shared_memory(self): - self.mem = shared_memory.SharedMemory('dolphin-emu.'+str(self.pid)) - + try: + self.memory = shared_memory.SharedMemory('dolphin-emu.'+str(self.pid)) + return True + except FileNotFoundError: + return False + def read_ram(self, offset, size): - return self.mem.buf[offset:offset+size] + return self.memory.buf[offset:offset+size] def write_ram(self, offset, data): - self.mem.buf[offset:offset+len(data)] = data + self.memory.buf[offset:offset+len(data)] = data def read_uint32(self, addr): assert addr >= 0x80000000 @@ -198,11 +202,10 @@ if __name__ == "__main__": print(dolphin.pid) dolphin.init_shared_memory() - """ - if dolphin.get_emu_info(): - print("We found MEM1 and/or MEM2!", dolphin.address_start, dolphin.mem2_start) + if dolphin.init_shared_memory(): + print("We found MEM1 and/or MEM2!") else: - print("We didn't find it...")""" + print("We didn't find it...") import random randint = random.randint