From 43d48119b807bc41f34223a81a659ba62f380d48 Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Thu, 14 Nov 2024 10:19:37 +0100 Subject: [PATCH] tr2/docs: fix syntax errors in symbol definitions --- docs/tr2/progress.txt | 6 +++--- src/tr2/global/vars_decomp.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/tr2/progress.txt b/docs/tr2/progress.txt index fea36fb74..02ba6ce8a 100644 --- a/docs/tr2/progress.txt +++ b/docs/tr2/progress.txt @@ -1247,6 +1247,7 @@ typedef struct __unaligned { // decompiled int16_t back_gun; int16_t flare_frame; union { + uint16_t flags; struct ___unaligned { uint16_t flare_control_left: 1; // 0x01 1 uint16_t flare_control_right: 1; // 0x02 2 @@ -1255,8 +1256,7 @@ typedef struct __unaligned { // decompiled uint16_t burn: 1; // 0x10 16 uint16_t pad: 11; }; - uint16_t flags; - } + }; int32_t water_surface_dist; XYZ_32 last_pos; FX *spaz_effect; @@ -4604,7 +4604,7 @@ typedef enum { 0x005261AC - int32_t g_OutsideTop; 0x00525B00 - int32_t g_OutsideBottom; 0x00525900 - int32_t g_BoundRooms[128]; // MAX_BOUND_ROOMS -0x005258C0 - DOOR_VBUF g_DoorVBuf[4]; +0x005258C0 - PORTAL_VBUF g_DoorVBuf[4]; 0x00464180 - int32_t g_BoxLines[12][2]; 0x00526190 - BOOL g_CameraUnderwater; 0x005263D0 - int32_t g_BoxCount; diff --git a/src/tr2/global/vars_decomp.h b/src/tr2/global/vars_decomp.h index c24fe4135..166007146 100644 --- a/src/tr2/global/vars_decomp.h +++ b/src/tr2/global/vars_decomp.h @@ -469,7 +469,7 @@ #define g_Outside (*(int32_t*)0x005252B4) #define g_DrawRoomsCount (*(int32_t*)0x005252B8) #define g_IMMatrixStack (*(MATRIX(*)[256])0x005252C0) -#define g_DoorVBuf (*(DOOR_VBUF(*)[4])0x005258C0) +#define g_DoorVBuf (*(PORTAL_VBUF(*)[4])0x005258C0) #define g_IMFrac (*(int32_t*)0x005258F0) #define g_Anims (*(ANIM **)0x005258F4) #define g_BoundRooms (*(int32_t(*)[128])0x00525900)