summaryrefslogtreecommitdiff
path: root/src/code/z_eventmgr.c
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2023-06-02 14:39:39 +1000
committerGitHub <noreply@github.com>2023-06-02 14:39:39 +1000
commit4b25b4d8e655c5280fd42e5c99f3971ae9b5326b (patch)
tree166fa44044ca69bc57e2f64ccb899365ec81df28 /src/code/z_eventmgr.c
parent0261dc0a5c99ab87fed760c0cb81d1f7c4f9dc3b (diff)
Misc Cleanup 2 (#1260)
* more misc cleanup * PR suggestions * more abs alt, csId * more cleanup, can't help it * fix incorrect sq * more fixes
Diffstat (limited to 'src/code/z_eventmgr.c')
-rw-r--r--src/code/z_eventmgr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/z_eventmgr.c b/src/code/z_eventmgr.c
index aec6fdbb0..e3defb402 100644
--- a/src/code/z_eventmgr.c
+++ b/src/code/z_eventmgr.c
@@ -371,7 +371,7 @@ s16 CutsceneManager_Start(s16 csId, Actor* actor) {
Camera* retCam;
s32 csType = 0;
- if ((csId < 0) || (sCutsceneMgr.csId != CS_ID_NONE)) {
+ if ((csId <= CS_ID_NONE) || (sCutsceneMgr.csId != CS_ID_NONE)) {
return csId;
}
@@ -437,7 +437,7 @@ s16 CutsceneManager_Start(s16 csId, Actor* actor) {
s16 CutsceneManager_Stop(s16 csId) {
ActorCutscene* csEntry;
- if (csId < 0) {
+ if (csId <= CS_ID_NONE) {
return csId;
}
@@ -468,28 +468,28 @@ ActorCutscene* CutsceneManager_GetCutsceneEntry(s16 csId) {
}
s16 CutsceneManager_GetAdditionalCsId(s16 csId) {
- if (csId < 0) {
+ if (csId <= CS_ID_NONE) {
return CS_ID_NONE;
}
return CutsceneManager_GetCutsceneEntryImpl(csId)->additionalCsId;
}
s16 CutsceneManager_GetLength(s16 csId) {
- if (csId < 0) {
+ if (csId <= CS_ID_NONE) {
return -1;
}
return CutsceneManager_GetCutsceneEntryImpl(csId)->length;
}
s16 CutsceneManager_GetCutsceneScriptIndex(s16 csId) {
- if (csId < 0) {
+ if (csId <= CS_ID_NONE) {
return -1;
}
return CutsceneManager_GetCutsceneEntryImpl(csId)->scriptIndex;
}
s16 CutsceneManager_GetCutsceneCustomValue(s16 csId) {
- if (csId < 0) {
+ if (csId <= CS_ID_NONE) {
return -1;
}
return CutsceneManager_GetCutsceneEntryImpl(csId)->customValue;