Skip to content

reimplement: SHC_3BB0A8C1_0x00479AB0 100% #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TheRedDaemon wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

reimplement: SHC_3BB0A8C1_0x00479AB0 100% #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/OpenSHC/Audio/mss/SoundSystem/shouldSoundXNotBePlaying.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#include "OpenSHC/Audio/MSS/SoundSystem.hpp"

#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp"

#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp"

namespace OpenSHC {
namespace Audio {
namespace MSS {

// FUNCTION: STRONGHOLDCRUSADER 0x00479AB0
BOOLEnum SoundSystem::shouldSoundXNotBePlaying()
{
if (DAT_GameState::ptr->playerDataArray[DAT_GameSynchronyState::ptr->currentPlayerSlotID]
.playerDeathRelated) {
return FALSE;
}

if (MACRO_CALL_MEMBER(SoundSystem_Func::isSampleOrStreamPlaying, this)(enums::SND_STR_SPEECH_1)) {
return TRUE;
}
if (MACRO_CALL_MEMBER(SoundSystem_Func::isSampleOrStreamPlaying, this)(enums::SND_STR_SPEECH_2)) {
return TRUE;
}
return FALSE;
}

}
}
}
4 changes: 3 additions & 1 deletion src/OpenSHC/DirectPlay/EnumConnections.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
#include "OpenSHC/DirectPlay/IDirectPlay4A.hpp"
#include "WinDef.h"
#include "winnt.h"

namespace OpenSHC {
namespace DirectPlay {

using OpenSHC::DirectPlay::EnumConnectionsCallback;
using OpenSHC::DirectPlay::IDirectPlay4A;

struct IDirectPlay4A;

typedef HRESULT(__stdcall EnumConnections)(IDirectPlay4A*, LPCGUID, EnumConnectionsCallback*, LPVOID, DWORD);
} // namespace DirectPlay
Expand Down
1 change: 0 additions & 1 deletion src/OpenSHC/Synchrony/GameSynchronyState.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include "basetsd.h"
#include "crtdefs.h"
#include "guiddef.h"
#include "inaddr.h"
#include "mbstring.h"
#include "winnt.h"

Expand Down
2 changes: 1 addition & 1 deletion status/addresses-SHC-3BB0A8C1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10882,7 +10882,7 @@ SHC_3BB0A8C1_0x00479540 | 0.0% | Pending
SHC_3BB0A8C1_0x00479790 | 0.0% | Pending
SHC_3BB0A8C1_0x004799A0 | 0.0% | Pending
SHC_3BB0A8C1_0x00479A60 | 0.0% | Pending
SHC_3BB0A8C1_0x00479AB0 | 0.0% | Pending
SHC_3BB0A8C1_0x00479AB0 | 100.0% | Reimplemented
SHC_3BB0A8C1_0x00479AF0 | 0.0% | Pending
SHC_3BB0A8C1_0x00479B70 | 0.0% | Pending
SHC_3BB0A8C1_0x00479C20 | 0.0% | Pending
Expand Down