From fb1cd098ef3d2e7c72b31015c802a857aa238287 Mon Sep 17 00:00:00 2001 From: Jayden Kohlman <2236351+JKohlman@users.noreply.github.com> Date: Sat, 20 Jan 2024 21:38:23 -0700 Subject: [PATCH] Initial fungle door support attempt --- src/main/GameReader.ts | 12 ++++++++++-- src/main/offsetStore.ts | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/GameReader.ts b/src/main/GameReader.ts index b4c8d0f91..c70a88a74 100644 --- a/src/main/GameReader.ts +++ b/src/main/GameReader.ts @@ -348,8 +348,16 @@ export default class GameReader { 'ptr', allDoors + this.offsets.playerAddrPtr + doorNr * (this.is_64bit ? 0x8 : 0x4) ); - const doorOpen = this.readMemory('int', door + this.offsets.door_isOpen) === 1; - // const doorId = this.readMemory('int', door + this.offsets.door_doorId); + + let doorOpen: Boolean; + if (map === MapType.FUNGLE) { + doorOpen = this.readMemory('int', door + this.offsets.mushroomDoor_isOpen) === 1; + } + else { + doorOpen = this.readMemory('int', door + this.offsets.door_isOpen) === 1; + } + + // const doorId = this.readMemory('int', door + this.offsets.door_doorId); //console.log(doorId); if (!doorOpen) { closedDoors.push(doorNr); diff --git a/src/main/offsetStore.ts b/src/main/offsetStore.ts index 4a89a408a..8d0958d59 100644 --- a/src/main/offsetStore.ts +++ b/src/main/offsetStore.ts @@ -37,6 +37,7 @@ export interface IOffsets { shipstatus_allDoors: number[]; door_doorId: number; door_isOpen: number; + mushroomDoor_isOpen: number; deconDoorUpperOpen: number[]; deconDoorLowerOpen: number[]; hqHudSystemType_CompletedConsoles: number[];