aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sword1/logic.cpp1
-rw-r--r--sword1/screen.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/sword1/logic.cpp b/sword1/logic.cpp
index f1b20454d7..fcac13143b 100644
--- a/sword1/logic.cpp
+++ b/sword1/logic.cpp
@@ -172,6 +172,7 @@ void SwordLogic::processLogic(BsObject *compact, uint32 id) {
break;
case LOGIC_start_talk:
logicRet = logicStartTalk(compact);
+ break;
case LOGIC_script:
_scriptVars[CUR_ID] = id;
logicRet = scriptManager(compact, id);
diff --git a/sword1/screen.cpp b/sword1/screen.cpp
index b331a9a22e..076aa3cbb5 100644
--- a/sword1/screen.cpp
+++ b/sword1/screen.cpp
@@ -115,7 +115,7 @@ void SwordScreen::refreshPalette(void) {
}
bool SwordScreen::stillFading(void) {
- return _fadingStep;
+ return (_fadingStep != 0);
}
void SwordScreen::updateScreen(void) {