a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 14:20:00 +00:00
Code Issues Projects Releases Wiki Activity

Enable GTA_BRIDGE

Browse source
This commit is contained in:
Sergeanur 2021-01-23 03:09:15 +02:00
parent 6b54d04bfc
commit b35b0c598d
4 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/audio/AudioLogic.cpp
View file

@ -9311,7 +9311,8 @@ cAudioManager::ProcessBridge()
void void
cAudioManager::ProcessBridgeWarning() cAudioManager::ProcessBridgeWarning()
{ {
if (CStats::CommercialPassed && m_sQueueSample.m_fDistance < 450.f) { // TODO: LCS
/* if (CStats::CommercialPassed && m_sQueueSample.m_fDistance < 450.f) {
m_sQueueSample.m_nVolume = ComputeVolume(100, 450.f, m_sQueueSample.m_fDistance); m_sQueueSample.m_nVolume = ComputeVolume(100, 450.f, m_sQueueSample.m_fDistance);
if (m_sQueueSample.m_nVolume != 0) { if (m_sQueueSample.m_nVolume != 0) {
m_sQueueSample.m_nCounter = 0; m_sQueueSample.m_nCounter = 0;
@ -9332,7 +9333,7 @@ cAudioManager::ProcessBridgeWarning()
m_sQueueSample.m_bRequireReflection = false; m_sQueueSample.m_bRequireReflection = false;
AddSampleToRequestedQueue(); AddSampleToRequestedQueue();
} }
} }*/
} }
void void

20
src/control/Bridge.cpp
View file

@ -161,3 +161,23 @@ bool CBridge::ThisIsABridgeObjectMovingUp(int index)
return false; return false;
#endif #endif
} }
void CBridge::ForceBridgeState(uint8 state)
{
#ifdef GTA_BRIDGE
State = state;
switch (state)
{
case STATE_BRIDGE_LOCKED:
case STATE_LIFT_PART_MOVING_DOWN:
case STATE_LIFT_PART_ABOUT_TO_MOVE_UP:
ThePaths.SetLinksBridgeLights(-330.0f, -230.0f, -700.0f, -588.0f, true);
break;
case STATE_BRIDGE_ALWAYS_UNLOCKED:
ThePaths.SetLinksBridgeLights(-330.0f, -230.0f, -700.0f, -588.0f, false);
break;
default:
break;
}
#endif
}

1
src/control/Bridge.h
View file

@ -26,4 +26,5 @@ public:
static bool ShouldLightsBeFlashing(); static bool ShouldLightsBeFlashing();
static void FindBridgeEntities(); static void FindBridgeEntities();
static bool ThisIsABridgeObjectMovingUp(int); static bool ThisIsABridgeObjectMovingUp(int);
static void ForceBridgeState(uint8 state);
}; };

2
src/core/config.h
View file

@ -198,7 +198,7 @@ enum Config {
//#define ANIM_COMPRESSION // only keep most recently used anims uncompressed //#define ANIM_COMPRESSION // only keep most recently used anims uncompressed
#define GTA_TRAIN #define GTA_TRAIN
//#define GTA_BRIDGE #define GTA_BRIDGE
#if defined GTA_PS2 #if defined GTA_PS2
# define GTA_PS2_STUFF # define GTA_PS2_STUFF