evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for other compilers

Browse Source
This commit is contained in:
Kae 2023-07-21 12:22:26 +10:00
parent 4b0bc220e4
commit 643e8b15a1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/application/StarApplicationController.hpp
View File

@ -49,7 +49,7 @@ public:
virtual AudioFormat enableAudio() = 0; virtual AudioFormat enableAudio() = 0;
virtual void disableAudio() = 0; virtual void disableAudio() = 0;
typedef void (__cdecl* AudioCallback)(void* userdata, uint8_t* stream, int len); typedef void (*AudioCallback)(void* userdata, uint8_t* stream, int len);
virtual bool openAudioInputDevice(const char* name, int freq, int channels, void* userdata, AudioCallback callback) = 0; virtual bool openAudioInputDevice(const char* name, int freq, int channels, void* userdata, AudioCallback callback) = 0;
virtual bool closeAudioInputDevice() = 0; virtual bool closeAudioInputDevice() = 0;

2
source/extern/CMakeLists.txt vendored
View File

@ -3,10 +3,10 @@ SET (OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF)
SET (OPUS_X86_MAY_HAVE_AVX OFF) SET (OPUS_X86_MAY_HAVE_AVX OFF)
SET (OPUS_X86_MAY_HAVE_SSE4_1 OFF) SET (OPUS_X86_MAY_HAVE_SSE4_1 OFF)
SET (OPUS_ENABLE_FLOAT_API ON) SET (OPUS_ENABLE_FLOAT_API ON)
SET (OPUS_FLOAT_APPROX ON)
SET (OPUS_STACK_PROTECTOR OFF) SET (OPUS_STACK_PROTECTOR OFF)
SET (OPUS_NONTHREADSAFE_PSEUDOSTACK OFF) SET (OPUS_NONTHREADSAFE_PSEUDOSTACK OFF)
SET (OPUS_USE_ALLOCA ON) SET (OPUS_USE_ALLOCA ON)
ADD_SUBDIRECTORY (opus) ADD_SUBDIRECTORY (opus)
IF (OPUS_NONTHREADSAFE_PSEUDOSTACK) IF (OPUS_NONTHREADSAFE_PSEUDOSTACK)

12
source/game/StarWorldClient.cpp
View File

@ -795,7 +795,7 @@ void WorldClient::handleIncomingPackets(List<PacketPtr> const& packets) {
m_damageManager->pushRemoteDamageRequest(damage->remoteDamageRequest); m_damageManager->pushRemoteDamageRequest(damage->remoteDamageRequest);
} else if (auto damage = as<DamageNotificationPacket>(packet)) { } else if (auto damage = as<DamageNotificationPacket>(packet)) {
std::string_view view(damage->remoteDamageNotification.damageNotification.targetMaterialKind.utf8()); std::string_view view = damage->remoteDamageNotification.damageNotification.targetMaterialKind.utf8();
static const size_t FULL_SIZE = SECRET_BROADCAST_PREFIX.size() + Curve25519::SignatureSize; static const size_t FULL_SIZE = SECRET_BROADCAST_PREFIX.size() + Curve25519::SignatureSize;
static const std::string LEGACY_VOICE_PREFIX = "data\0voice\0"s; static const std::string LEGACY_VOICE_PREFIX = "data\0voice\0"s;
@ -824,14 +824,16 @@ void WorldClient::handleIncomingPackets(List<PacketPtr> const& packets) {
// (remove this and stop transmitting like this once most SE features are ported over) // (remove this and stop transmitting like this once most SE features are ported over)
if (auto player = m_entityMap->get<Player>(damage->remoteDamageNotification.sourceEntityId)) { if (auto player = m_entityMap->get<Player>(damage->remoteDamageNotification.sourceEntityId)) {
if (auto publicKey = player->effectsAnimator()->globalTagPtr("\0SE_VOICE_SIGNING_KEY"s)) { if (auto publicKey = player->effectsAnimator()->globalTagPtr("\0SE_VOICE_SIGNING_KEY"s)) {
auto rawData = view.substr(75); auto raw = view.substr(75);
if (m_broadcastCallback && Curve25519::verify( if (m_broadcastCallback && Curve25519::verify(
(uint8_t const*)view.data() + LEGACY_VOICE_PREFIX.size(), (uint8_t const*)view.data() + LEGACY_VOICE_PREFIX.size(),
(uint8_t const*)publicKey->utf8Ptr(), (uint8_t const*)publicKey->utf8Ptr(),
(void*)rawData.data(), (void*)raw.data(),
rawData.size() raw.size()
)) { )) {
m_broadcastCallback(player, "Voice\0"s + rawData); auto broadcastData = "Voice\0"s;
broadcastData.append(raw.data(), raw.size());
m_broadcastCallback(player, broadcastData);
} }
} }
} }