AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ControlMapper: Prevent array overrun cases 

These should be comparing with >=, not >.

The command table descriptions also weren't kept in sync with the
enumeration.
This commit is contained in:
Lioncash 2019-09-06 11:10:45 -04:00
parent fea7984f71
commit 5b1e783a90
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Runtime/Input/ControlMapper.cpp
View File

@ -7,18 +7,29 @@
namespace urde {
static const char* skCommandDescs[] = {
"Forward", "Backward", "Turn Left", "Turn Right", "Strafe Left", "Strafe Right",
"Look Left", "Look Right", "Look Up", "Look Down", "Jump/Boost", "Fire/Bomb",
"Missile/PowerBomb", "Morph", "Aim Up", "Aim Down", "Cycle Beam Up", "Cycle Beam Down",
"Cycle Item", "Power Beam", "Ice Beam", "Wave Beam", "Plasma Beam", "Toggle Holster",
"Orbit Close", "Orbit Far", "Orbit Object", "Orbit Select", "Orbit Confirm", "Orbit Left",
"Orbit Right", "Orbit Up", "Orbit Down", "Look Hold1", "Look Hold2", "Look Zoom In",
"Look Zoom Out", "Aim Hold", "Map Circle Up", "Map Circle Down", "Map Circle Left", "Map Circle Right",
"Map Move Forward", "Map Move Back", "Map Move Left", "Map Move Right", "Map Zoom In", "Map Zoom Out",
"SpiderBall", "Chase Camera", "XRay Visor", "Thermo Visor", "Enviro Visor", "No Visor",
"Visor Menu", "Visor Up", "Visor Down", "UNKNOWN", "UNKNOWN", "Use Shield",
"Scan Item", "UNKNOWN"
"Forward", "Backward", "Turn Left",
"Turn Right", "Strafe Left", "Strafe Right",
"Look Left", "Look Right", "Look Up",
"Look Down", "Jump/Boost", "Fire/Bomb",
"Missile/PowerBomb", "Morph", "Aim Up",
"Aim Down", "Cycle Beam Up", "Cycle Beam Down",
"Cycle Item", "Power Beam", "Ice Beam",
"Wave Beam", "Plasma Beam", "Toggle Holster",
"Orbit Close", "Orbit Far", "Orbit Object",
"Orbit Select", "Orbit Confirm", "Orbit Left",
"Orbit Right", "Orbit Up", "Orbit Down",
"Look Hold1", "Look Hold2", "Look Zoom In",
"Look Zoom Out", "Aim Hold", "Map Circle Up",
"Map Circle Down", "Map Circle Left", "Map Circle Right",
"Map Move Forward", "Map Move Back", "Map Move Left",
"Map Move Right", "Map Zoom In", "Map Zoom Out",
"SpiderBall", "Chase Camera", "XRay Visor",
"Thermo Visor", "Enviro Visor", "No Visor",
"Visor Menu", "Visor Up", "Visor Down",
"UNKNOWN", "UNKNOWN", "Use Shield",
"Scan Item", "UNKNOWN", "UNKNOWN",
"UNKNOWN", "UNKNOWN", "Previous Pause Screen",
"Next Pause Screen", "UNKNOWN", "None",
};
static const char* skFunctionDescs[] = {"None",
@ -359,14 +370,16 @@ float ControlMapper::GetAnalogInput(ECommands cmd, const CFinalInput& input) {
}
const char* ControlMapper::GetDescriptionForCommand(ECommands cmd) {
if (cmd > ECommands::MAX)
if (cmd >= ECommands::MAX) {
return nullptr;
}
return skCommandDescs[int(cmd)];
}
const char* ControlMapper::GetDescriptionForFunction(EFunctionList func) {
if (func > EFunctionList::MAX)
if (func >= EFunctionList::MAX) {
return nullptr;
}
return skFunctionDescs[int(func)];
}