diff options
| author | Pepe20129 <72659707+Pepe20129@users.noreply.github.com> | 2024-01-15 16:33:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 09:33:21 -0600 |
| commit | db2ccd95b76031ef8842b515b805ad8232ddf1bd (patch) | |
| tree | 98486059bd500d9543307375e1ee7c1a61683676 /soh/src/code | |
| parent | ecdf74161b77a7d8966e04e27cc362e2b0ce8a02 (diff) | |
Add Collision Header XML parser (#3396)
* Add Collision Header XML parser
* Update CollisionHeaderFactory.cpp
* Remove "Num" attributes
* Fix crashes
Prevent crash when the camera setting is negative
Change some IntAttributes to UnsignedAttributes
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_camera.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index ed8b9c8f4..2b5281037 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -7933,7 +7933,8 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) { return -5; } - if (setting == CAM_SET_NONE || setting >= CAM_SET_MAX) { + //modified from "==" to "<=" to not crash when "setting" is a negative value + if (setting <= CAM_SET_NONE || setting >= CAM_SET_MAX) { osSyncPrintf(VT_COL(RED, WHITE) "camera: error: illegal camera set (%d) !!!!\n" VT_RST, setting); return -99; } |