More aggressive sanitization. Loads of integer definition fixes
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
#include "MoveData.hpp"
|
||||
PkmnLib::Library::MoveData::MoveData(const ArbUt::StringView& name, uint8_t type,
|
||||
PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy,
|
||||
uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority,
|
||||
const CreatureLib::Library::SecondaryEffect* effect,
|
||||
std::unordered_set<uint32_t> flags)
|
||||
: AttackData(name, type, static_cast<CreatureLib::Library::AttackCategory>(category), power, accuracy, baseUsage,
|
||||
target, priority, effect, std::move(flags)) {}
|
||||
|
||||
PkmnLib::Library::MoveCategory PkmnLib::Library::MoveData::GetCategory() const {
|
||||
return static_cast<PkmnLib::Library::MoveCategory>(AttackData::GetCategory());
|
||||
}
|
||||
@@ -8,11 +8,15 @@ namespace PkmnLib::Library {
|
||||
class MoveData final : public CreatureLib::Library::AttackData {
|
||||
private:
|
||||
public:
|
||||
MoveData(const ArbUt::StringView& name, uint8_t type, PkmnLib::Library::MoveCategory category, uint8_t power,
|
||||
uint8_t accuracy, uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority,
|
||||
const CreatureLib::Library::SecondaryEffect* effect, std::unordered_set<uint32_t> flags);
|
||||
MoveData(const ArbUt::StringView& name, u8 type, PkmnLib::Library::MoveCategory category, u8 power, u8 accuracy,
|
||||
u8 baseUsage, CreatureLib::Library::AttackTarget target, i8 priority,
|
||||
const CreatureLib::Library::SecondaryEffect* nullable effect, std::unordered_set<u32> flags)
|
||||
: AttackData(name, type, static_cast<CreatureLib::Library::AttackCategory>(category), power, accuracy, baseUsage,
|
||||
target, priority, effect, std::move(flags)) {};
|
||||
|
||||
PkmnLib::Library::MoveCategory GetCategory() const;
|
||||
inline PkmnLib::Library::MoveCategory GetCategory() const {
|
||||
return static_cast<PkmnLib::Library::MoveCategory>(AttackData::GetCategory());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
#include "MoveLibrary.hpp"
|
||||
Reference in New Issue
Block a user