mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-28 08:27:22 +00:00
53877a0bc3
* Rewrite AMF and behavior logic to use smart pointers, references, and string_views over raw pointers and std::string& * fix m_BehaviorID initialization * Fix BlockDefinition member naming * remove redundant reset()s * Replace UB forward template declarations with header include * remove unneeded comment * remove non-const ref getters * simplify default behavior id initialization * Fix invalidated use of Getter to set a value * Update AddStripMessage.cpp - change push_back to emplace_back * fix pointer to ref conversion mistake (should not have directly grabbed from the other branch commit) * deref * VERY experimental testing of forward declaration of templates - probably will revert * Revert changes (as expected) * Update BlockDefinition.h - remove extraneous semicolons * Update BlockDefinition.h - remove linebreak * Update Amf3.h member naming scheme * fix duplicated code * const iterators * const pointers * reviving this branch * update read switch cases
28 lines
1.0 KiB
C++
28 lines
1.0 KiB
C++
#include "BehaviorMessageBase.h"
|
|
|
|
#include "Amf3.h"
|
|
#include "BehaviorStates.h"
|
|
#include "dCommonVars.h"
|
|
|
|
int32_t BehaviorMessageBase::GetBehaviorIdFromArgument(const AMFArrayValue& arguments) {
|
|
static constexpr std::string_view key = "BehaviorID";
|
|
const auto* const behaviorIDValue = arguments.Get<std::string>(key);
|
|
int32_t behaviorId = DefaultBehaviorId;
|
|
|
|
if (behaviorIDValue && behaviorIDValue->GetValueType() == eAmf::String) {
|
|
behaviorId =
|
|
GeneralUtils::TryParse<int32_t>(behaviorIDValue->GetValue()).value_or(behaviorId);
|
|
} else if (arguments.Get(key) && arguments.Get(key)->GetValueType() != eAmf::Undefined) {
|
|
throw std::invalid_argument("Unable to find behavior ID");
|
|
}
|
|
|
|
return behaviorId;
|
|
}
|
|
|
|
int32_t BehaviorMessageBase::GetActionIndexFromArgument(const AMFArrayValue& arguments, const std::string_view keyName) const {
|
|
const auto* const actionIndexAmf = arguments.Get<double>(keyName);
|
|
if (!actionIndexAmf) throw std::invalid_argument("Unable to find actionIndex");
|
|
|
|
return static_cast<int32_t>(actionIndexAmf->GetValue());
|
|
}
|