summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-02-07 16:17:13 +0100
committerLéo Lam <leo@leolam.fr>2021-02-07 16:17:13 +0100
commit136bd63cbc4a8136944d9b5f17ae3e9bac8bec72 (patch)
treea280100ecc65a8616c98dbff4f52875a1a045dc1 /src
parent6699c1fb38549d66fea50ab3af1ca327ff32ca06 (diff)
ksys/evt: Rename members to match coding style
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/Event/evtOrderParam.cpp108
-rw-r--r--src/KingSystem/Event/evtOrderParam.h43
2 files changed, 74 insertions, 77 deletions
diff --git a/src/KingSystem/Event/evtOrderParam.cpp b/src/KingSystem/Event/evtOrderParam.cpp
index 5d174cb4..6561a91e 100644
--- a/src/KingSystem/Event/evtOrderParam.cpp
+++ b/src/KingSystem/Event/evtOrderParam.cpp
@@ -39,26 +39,26 @@ bool OrderParam::initialize(s32 entry_count) {
void OrderParam::uninitialize() {
for (s32 i = 0; i < mEntries.size(); i++) {
auto* e = &mEntries[i];
- auto* name_ptr = e->mName;
+ auto* name_ptr = e->name;
if (name_ptr)
delete (sead::FixedSafeString<0x20>*)name_ptr;
- auto* ptr = e->mPointer;
+ auto* ptr = e->data;
if (ptr) {
- switch (e->mType) {
- case OrderParamType::STRING:
+ switch (e->type) {
+ case OrderParamType::String:
delete (sead::FixedSafeString<0x40>*)ptr;
break;
- case OrderParamType::INT:
- case OrderParamType::INT_2:
+ case OrderParamType::Int:
+ case OrderParamType::Float:
delete (u32*)ptr;
break;
- case OrderParamType::BYTE:
+ case OrderParamType::Bool:
delete (char*)ptr;
break;
- case OrderParamType::ACTOR:
+ case OrderParamType::Actor:
delete (ksys::act::BaseProcLink*)ptr;
break;
- case OrderParamType::ARRAY:
+ case OrderParamType::Array:
mHeap->free(ptr);
break;
default:
@@ -97,37 +97,37 @@ bool OrderParam::doAssign(OrderParam* other) {
for (s32 i = 0; i < mEntries.size(); i++) {
auto* other_entry = other->getParam(i);
if (other_entry) {
- auto* other_ptr = other_entry->mPointer;
- auto* other_name = other_entry->mName;
+ auto* other_ptr = other_entry->data;
+ auto* other_name = other_entry->name;
ksys::act::BaseProcLink* link_ptr;
ksys::act::BaseProc* actor_ptr;
if (other_ptr && other_name) {
- switch (other_entry->mType) {
- case OrderParamType::INT:
+ switch (other_entry->type) {
+ case OrderParamType::Int:
if (!addParamInt(*static_cast<s32*>(other_ptr), *other_name))
return false;
break;
- case OrderParamType::INT_2:
+ case OrderParamType::Float:
if (!addParamInt2(*static_cast<s32*>(other_ptr), *other_name))
return false;
break;
- case OrderParamType::STRING:
+ case OrderParamType::String:
if (!addParamString(*static_cast<sead::SafeString*>(other_ptr), *other_name))
return false;
break;
- case OrderParamType::BYTE:
+ case OrderParamType::Bool:
if (!addParamByte(*static_cast<char*>(other_ptr), *other_name))
return false;
break;
- case OrderParamType::ACTOR:
+ case OrderParamType::Actor:
link_ptr = static_cast<ksys::act::BaseProcLink*>(other_ptr);
actor_ptr =
sead::DynamicCast<ksys::act::BaseProc>(link_ptr->getProc(nullptr, nullptr));
if (!addParamActor(actor_ptr, *other_name))
return false;
break;
- case OrderParamType::ARRAY:
- if (!addParamArray(static_cast<char*>(other_ptr), other_entry->mSize,
+ case OrderParamType::Array:
+ if (!addParamArray(static_cast<char*>(other_ptr), other_entry->size,
*other_name))
return false;
break;
@@ -141,7 +141,7 @@ bool OrderParam::doAssign(OrderParam* other) {
}
bool OrderParam::addParamInt(s32 val, const sead::SafeString& name) {
- auto* entry_ptr = tryAllocParam<s32>(name, OrderParamType::INT);
+ auto* entry_ptr = tryAllocParam<s32>(name, OrderParamType::Int);
if (!entry_ptr)
return false;
*entry_ptr = val;
@@ -150,7 +150,7 @@ bool OrderParam::addParamInt(s32 val, const sead::SafeString& name) {
}
bool OrderParam::addParamInt2(s32 val, const sead::SafeString& name) {
- auto* entry_ptr = tryAllocParam<s32>(name, OrderParamType::INT_2);
+ auto* entry_ptr = tryAllocParam<s32>(name, OrderParamType::Float);
if (!entry_ptr)
return false;
*entry_ptr = val;
@@ -158,7 +158,7 @@ bool OrderParam::addParamInt2(s32 val, const sead::SafeString& name) {
return true;
}
bool OrderParam::addParamString(const sead::SafeString& val, const sead::SafeString& name) {
- auto* entry_ptr = tryAllocParam<sead::BufferedSafeString>(name, OrderParamType::STRING);
+ auto* entry_ptr = tryAllocParam<sead::BufferedSafeString>(name, OrderParamType::String);
if (!entry_ptr)
return false;
entry_ptr->copy(val);
@@ -167,7 +167,7 @@ bool OrderParam::addParamString(const sead::SafeString& val, const sead::SafeStr
}
bool OrderParam::addParamByte(char val, const sead::SafeString& name) {
- auto* entry_ptr = tryAllocParam<char>(name, OrderParamType::BYTE);
+ auto* entry_ptr = tryAllocParam<char>(name, OrderParamType::Bool);
if (!entry_ptr)
return false;
*entry_ptr = val;
@@ -176,7 +176,7 @@ bool OrderParam::addParamByte(char val, const sead::SafeString& name) {
}
bool OrderParam::addParamActor(ksys::act::BaseProc* actor, sead::SafeString& name) {
- auto* entry_ptr = tryAllocParam<ksys::act::BaseProcLink>(name, OrderParamType::ACTOR);
+ auto* entry_ptr = tryAllocParam<ksys::act::BaseProcLink>(name, OrderParamType::Actor);
if (!entry_ptr)
return false;
if (!entry_ptr->acquire(actor, false))
@@ -186,7 +186,7 @@ bool OrderParam::addParamActor(ksys::act::BaseProc* actor, sead::SafeString& nam
}
bool OrderParam::addParamArray(char* array, u32 size, sead::SafeString& name) {
- auto* entry_ptr = tryAllocParam<ksys::act::BaseProcLink>(name, OrderParamType::ARRAY, size);
+ auto* entry_ptr = tryAllocParam<ksys::act::BaseProcLink>(name, OrderParamType::Array, size);
if (!entry_ptr)
return false;
std::memcpy(entry_ptr, array, size);
@@ -195,20 +195,20 @@ bool OrderParam::addParamArray(char* array, u32 size, sead::SafeString& name) {
}
bool OrderParam::getIntByName(const sead::SafeString& name, u32** out_ptr) {
- return getPointerByName(name, out_ptr, OrderParamType::INT);
+ return getPointerByName(name, out_ptr, OrderParamType::Int);
}
bool OrderParam::getStringByName(const sead::SafeString& name, sead::SafeString** out_ptr) {
- return getPointerByName(name, out_ptr, OrderParamType::STRING);
+ return getPointerByName(name, out_ptr, OrderParamType::String);
}
bool OrderParam::getArrayByName(const sead::SafeString& name, void** out_ptr, u32* out_size) {
- return getPointerByName(name, out_ptr, OrderParamType::ARRAY, out_size);
+ return getPointerByName(name, out_ptr, OrderParamType::Array, out_size);
}
OrderParamEntry* OrderParam::getFreeEntry() {
for (s32 i = 0; i < mEntries.size(); i++) {
auto* entry = &mEntries[i];
- if (!entry->mPointer) {
+ if (!entry->data) {
return entry;
}
}
@@ -229,42 +229,42 @@ OrderParamEntry* OrderParam::tryAlloc(OrderParamType type, u32 size, const sead:
if (!heap)
return nullptr;
- entry->mName = new (heap, std::nothrow_t()) sead::FixedSafeString<0x20>(name);
+ entry->name = new (heap, std::nothrow_t()) sead::FixedSafeString<0x20>(name);
switch (type) {
- case OrderParamType::INT:
- case OrderParamType::INT_2:
- entry->mPointer = new (heap, std::nothrow_t()) s32();
- entry->mSize = sizeof(s32);
+ case OrderParamType::Int:
+ case OrderParamType::Float:
+ entry->data = new (heap, std::nothrow_t()) s32();
+ entry->size = sizeof(s32);
break;
- case OrderParamType::STRING:
- entry->mPointer = new (heap, std::nothrow_t()) sead::FixedSafeString<0x40>;
- entry->mSize = sizeof(sead::FixedSafeString<0x40>);
+ case OrderParamType::String:
+ entry->data = new (heap, std::nothrow_t()) sead::FixedSafeString<0x40>;
+ entry->size = sizeof(sead::FixedSafeString<0x40>);
break;
- case OrderParamType::BYTE:
- entry->mPointer = new (heap, std::nothrow_t()) bool();
- entry->mSize = sizeof(bool);
+ case OrderParamType::Bool:
+ entry->data = new (heap, std::nothrow_t()) bool();
+ entry->size = sizeof(bool);
break;
- case OrderParamType::ACTOR:
- entry->mPointer = new (heap, std::nothrow_t()) ksys::act::BaseProcLink;
- entry->mSize = sizeof(act::BaseProcLink);
+ case OrderParamType::Actor:
+ entry->data = new (heap, std::nothrow_t()) ksys::act::BaseProcLink;
+ entry->size = sizeof(act::BaseProcLink);
break;
- case OrderParamType::ARRAY:
- entry->mPointer = new (heap, std::nothrow_t()) char[size];
- entry->mSize = size;
+ case OrderParamType::Array:
+ entry->data = new (heap, std::nothrow_t()) char[size];
+ entry->size = size;
break;
default:
break;
}
- auto* ptr = entry->mPointer;
+ auto* ptr = entry->data;
if (ptr) {
- entry->mHash = sead::HashCRC32::calcStringHash(*entry->mName);
- entry->mType = type;
+ entry->hash = sead::HashCRC32::calcStringHash(*entry->name);
+ entry->type = type;
} else {
- if (entry->mName)
- delete entry->mName;
+ if (entry->name)
+ delete entry->name;
clearEntry(entry);
entry = nullptr;
}
@@ -275,10 +275,10 @@ void* OrderParam::getPointerByName(const sead::SafeString& name, OrderParamType
u32* out_size) const {
const u32 hash = sead::HashCRC32::calcStringHash(name);
for (s32 i = 0; i < mEntries.size(); i++) {
- if (mEntries[i].mHash == hash && mEntries[i].mType == type) {
+ if (mEntries[i].hash == hash && mEntries[i].type == type) {
if (out_size)
- *out_size = mEntries[i].mSize;
- return mEntries[i].mPointer;
+ *out_size = mEntries[i].size;
+ return mEntries[i].data;
}
}
return nullptr;
diff --git a/src/KingSystem/Event/evtOrderParam.h b/src/KingSystem/Event/evtOrderParam.h
index f031e6db..cfacb699 100644
--- a/src/KingSystem/Event/evtOrderParam.h
+++ b/src/KingSystem/Event/evtOrderParam.h
@@ -9,28 +9,25 @@
namespace ksys::evt {
enum class OrderParamType : u16 {
- INVALID = 0,
- INT = 1,
- INT_2 = 2,
- STRING = 3,
- BYTE = 4,
- ACTOR = 5,
- ARRAY = 6
-
+ Invalid = 0,
+ Int = 1,
+ Float = 2,
+ String = 3,
+ Bool = 4,
+ Actor = 5,
+ Array = 6,
};
struct OrderParamEntry {
- u32 mHash;
- // u32 _4; alignment gap
- sead::SafeString* mName;
- void* mPointer; //_10
- u32 mSize; //_18
- OrderParamType mType;
- // u16 _1e; alignment gap
+ u32 hash;
+ sead::SafeString* name;
+ void* data;
+ u32 size;
+ OrderParamType type;
};
class OrderParam {
- OrderParam(sead::ExpHeap* mHeap);
+ OrderParam(sead::ExpHeap* heap);
virtual ~OrderParam();
public:
@@ -74,17 +71,17 @@ private:
return nullptr;
auto* entry = tryAlloc(type, size, name);
- if (!entry || !(entry->mPointer))
+ if (!entry || !(entry->data))
return nullptr;
- return static_cast<T*>(entry->mPointer);
+ return static_cast<T*>(entry->data);
}
inline void clearEntry(OrderParamEntry* e) {
- e->mHash = 0;
- e->mSize = 0;
- e->mType = OrderParamType::INVALID;
- e->mName = nullptr;
- e->mPointer = nullptr;
+ e->hash = 0;
+ e->size = 0;
+ e->type = OrderParamType::Invalid;
+ e->name = nullptr;
+ e->data = nullptr;
}
sead::ExpHeap* mHeap;