Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-05-02 14:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vars: pull LsAdder, LsDivider

Browse source
This commit is contained in:
rr- 2021-10-31 19:57:27 +01:00 • committed by Marcin Kurczewski
parent efe77fa6cc
commit 099d289b3a
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/global/vars.c
View file

@ -100,7 +100,6 @@ int32_t RoomsToDrawNum;
int32_t NumberCameras; int32_t NumberCameras;
int32_t NumberSoundEffects; int32_t NumberSoundEffects;
OBJECT_VECTOR *SoundEffectsTable; OBJECT_VECTOR *SoundEffectsTable;
SHADOW_INFO ShadowInfo;
int16_t *TriggerIndex; int16_t *TriggerIndex;
int32_t FlipTimer = 0; int32_t FlipTimer = 0;
@ -113,6 +112,9 @@ int32_t InvExtraData[8];
int16_t InvChosen = -1; int16_t InvChosen = -1;
int8_t InvDisableResolutionSwitch = 0; int8_t InvDisableResolutionSwitch = 0;
int32_t LsAdder;
int32_t LsDivider;
SHADOW_INFO ShadowInfo;
int16_t BarOffsetY[6]; int16_t BarOffsetY[6];
HWR_Resolution AvailableResolutions[RESOLUTIONS_SIZE] = { HWR_Resolution AvailableResolutions[RESOLUTIONS_SIZE] = {

6
src/global/vars.h
View file

@ -45,8 +45,6 @@
#define IMMatrixPtr VAR_U_(0x00462BE4, PHD_MATRIX*) #define IMMatrixPtr VAR_U_(0x00462BE4, PHD_MATRIX*)
#define IMMatrixStack ARRAY_(0x00461F40, PHD_MATRIX, [MAX_NESTED_MATRICES]) #define IMMatrixStack ARRAY_(0x00461F40, PHD_MATRIX, [MAX_NESTED_MATRICES])
#define LsAdder VAR_U_(0x0068F3A0, int32_t)
#define LsDivider VAR_U_(0x006D7604, int32_t)
#define WibbleTable ARRAY_(0x006E8060, int32_t, [WIBBLE_SIZE]) #define WibbleTable ARRAY_(0x006E8060, int32_t, [WIBBLE_SIZE])
#define ShadeTable ARRAY_(0x006D4E00, int32_t, [WIBBLE_SIZE]) #define ShadeTable ARRAY_(0x006D4E00, int32_t, [WIBBLE_SIZE])
#define RandTable ARRAY_(0x006CAD20, int32_t, [WIBBLE_SIZE]) #define RandTable ARRAY_(0x006CAD20, int32_t, [WIBBLE_SIZE])
@ -246,7 +244,6 @@ extern int32_t RoomsToDrawNum;
extern int32_t NumberCameras; extern int32_t NumberCameras;
extern int32_t NumberSoundEffects; extern int32_t NumberSoundEffects;
extern OBJECT_VECTOR *SoundEffectsTable; extern OBJECT_VECTOR *SoundEffectsTable;
extern SHADOW_INFO ShadowInfo;
extern int16_t *TriggerIndex; extern int16_t *TriggerIndex;
extern int32_t FlipTimer; extern int32_t FlipTimer;
@ -283,6 +280,9 @@ extern int32_t InvExtraData[];
extern int16_t InvChosen; extern int16_t InvChosen;
extern int8_t InvDisableResolutionSwitch; extern int8_t InvDisableResolutionSwitch;
extern int32_t LsAdder;
extern int32_t LsDivider;
extern SHADOW_INFO ShadowInfo;
extern int16_t BarOffsetY[6]; extern int16_t BarOffsetY[6];
extern HWR_Resolution AvailableResolutions[RESOLUTIONS_SIZE]; extern HWR_Resolution AvailableResolutions[RESOLUTIONS_SIZE];