diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-20 10:12:26 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-20 10:12:26 +0100 |
| commit | aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc (patch) | |
| tree | 4cd0895a92119cd1aaedb81033661d7d456309f9 /src/control/Script.h | |
| parent | saves (diff) | |
| download | re3-aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc.tar re3-aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc.tar.gz re3-aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc.tar.bz2 re3-aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc.tar.lz re3-aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc.tar.xz re3-aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc.tar.zst re3-aa0f77043c6f90c36ddfdf91d608dacc7d8eafdc.zip | |
Diffstat (limited to 'src/control/Script.h')
| -rw-r--r-- | src/control/Script.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/control/Script.h b/src/control/Script.h index f2b5dda9..780440dd 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -568,16 +568,13 @@ public: return; } } - else if (m_nAndOrState >= ORS_1 && m_nAndOrState <= ORS_8) { + else { m_bCondResult |= flag; - if (m_nAndOrState == ORS_1) { + if (m_nAndOrState <= ORS_1) { m_nAndOrState = ANDOR_NONE; return; } } - else { - return; - } m_nAndOrState--; } int16 GetPadState(uint16, uint16); |