diff --git a/Source/Contents/Actors/ActorPickNode.cpp b/Source/Contents/Actors/ActorPickNode.cpp index b8696465d..0dfc2c0f1 100644 --- a/Source/Contents/Actors/ActorPickNode.cpp +++ b/Source/Contents/Actors/ActorPickNode.cpp @@ -70,14 +70,11 @@ void CActorPickNode::AddPickInfo(ActorPickInfo* info) { const int y = static_cast(info->top); const int centerX = node->bounds.right / 2; const int centerY = node->bounds.bottom / 2; - int quadrant; - if (x > centerX) { - quadrant = (y > centerY) + 1; + if (x <= centerX) { + node = node->children[y <= centerY ? 0 : 3]; } else { - quadrant = y <= centerY ? 0 : 3; + node = node->children[(y > centerY) + 1]; } - - node = node->children[quadrant]; } node->pickInfos.push_back(info); diff --git a/Source/Contents/Configuration/ScriptOptions.cpp b/Source/Contents/Configuration/ScriptOptions.cpp index 55c359a05..569ab2c0e 100644 --- a/Source/Contents/Configuration/ScriptOptions.cpp +++ b/Source/Contents/Configuration/ScriptOptions.cpp @@ -41,5 +41,8 @@ GUID CSession::GetOptionGuid(const char* key, const GUID& fallback) { float CSession::GetOptionFloat(const char* key, float fallback) { double value = -1.0; this->m_hotkeyScript->Call("l_GetOptionValue", "s>l", key, &value); - return value == -1.0 ? fallback : static_cast(value); + if (value == -1.0) { + return fallback; + } + return static_cast(value); } diff --git a/Source/Contents/Messenger/WhisperBlockMgr.cpp b/Source/Contents/Messenger/WhisperBlockMgr.cpp index d74b7ffd1..078bdd640 100644 --- a/Source/Contents/Messenger/WhisperBlockMgr.cpp +++ b/Source/Contents/Messenger/WhisperBlockMgr.cpp @@ -10,7 +10,8 @@ CWhisperBlockMgr* g_whisperBlockMgr; // OFFSET: 0x00610E60 // FUNCTION: fn_04322 -CWhisperBlockMgr::CWhisperBlockMgr() : m_enabled(true), m_tracking(false), m_changes(0) { +CWhisperBlockMgr::CWhisperBlockMgr() : m_tracking(false), m_changes(0) { + this->m_enabled = true; } // INLINED diff --git a/Source/Contents/Models/ModelPlayback.cpp b/Source/Contents/Models/ModelPlayback.cpp index f89a906ad..6886a6865 100644 --- a/Source/Contents/Models/ModelPlayback.cpp +++ b/Source/Contents/Models/ModelPlayback.cpp @@ -20,7 +20,7 @@ void C3dActorV1::Update() { switch (this->playback) { case 1: { const unsigned tick = GetTickCount(); - if (tick == this->lastTick) { + if (tick - this->lastTick == 0) { return; } @@ -35,7 +35,7 @@ void C3dActorV1::Update() { } case 2: { const unsigned tick = GetTickCount(); - if (tick == this->lastTick) { + if (tick - this->lastTick == 0) { return; } diff --git a/Source/Contents/Party/AdventurerAgencyMgr.cpp b/Source/Contents/Party/AdventurerAgencyMgr.cpp index 2832e7c4c..bb1ee13ed 100644 --- a/Source/Contents/Party/AdventurerAgencyMgr.cpp +++ b/Source/Contents/Party/AdventurerAgencyMgr.cpp @@ -22,7 +22,8 @@ CAdventurerAgencyMgr* g_adventurerAgencyMgr; // OFFSET: 0x005CA710 // FUNCTION: fn_03648 -CAdventurerAgencyMgr::CAdventurerAgencyMgr() : enabled(true), registered(false), masterAccountId(0), pending(0) { +CAdventurerAgencyMgr::CAdventurerAgencyMgr() : registered(false), masterAccountId(0), pending(0) { + this->enabled = true; } // OFFSET: 0x005CA880