AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-14 07:26:09 +00:00
Code Issues Projects Releases Wiki Activity

Remove athena from Runtime, use raw zlib in bintoc rather than gzip

Browse Source
This commit is contained in:
Phillip Stephens
2022-02-21 22:59:47 -08:00
parent c33674b9ab
commit 15900053fa
25 changed files with 201 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Input/ControlMapper.cpp
View File

@@ -230,7 +230,7 @@ bool ControlMapper::GetPressInput(ECommands cmd, const CFinalInput& input) {
}
bool ret = false;
const auto func = EFunctionList(g_currentPlayerControl->GetMapping(atUint32(cmd)));
const auto func = EFunctionList(g_currentPlayerControl->GetMapping(u32(cmd)));
if (func < EFunctionList::MAX) {
if (BoolReturnFn fn = skPressFuncs[size_t(func)]) {
ret = (input.*fn)();
@@ -257,7 +257,7 @@ bool ControlMapper::GetDigitalInput(ECommands cmd, const CFinalInput& input) {
}
bool ret = false;
const auto func = EFunctionList(g_currentPlayerControl->GetMapping(atUint32(cmd)));
const auto func = EFunctionList(g_currentPlayerControl->GetMapping(u32(cmd)));
if (func < EFunctionList::MAX) {
if (BoolReturnFn fn = skDigitalFuncs[size_t(func)])
ret = (input.*fn)();
@@ -333,7 +333,7 @@ float ControlMapper::GetAnalogInput(ECommands cmd, const CFinalInput& input) {
}
float ret = 0.f;
const auto func = EFunctionList(g_currentPlayerControl->GetMapping(atUint32(cmd)));
const auto func = EFunctionList(g_currentPlayerControl->GetMapping(u32(cmd)));
if (func < EFunctionList::MAX) {
if (FloatReturnFn fn = skAnalogFuncs[size_t(func)]) {
ret = (input.*fn)();