[Scummvm-cvs-logs] scummvm master -> 35362716334b83e3af61280a1ffa79198c3285e6
bluegr
bluegr at gmail.com
Thu Feb 20 11:42:43 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3536271633 NEVERHOOD: Fix an off-by-one error in Klogg's letters
Commit: 35362716334b83e3af61280a1ffa79198c3285e6
https://github.com/scummvm/scummvm/commit/35362716334b83e3af61280a1ffa79198c3285e6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-02-20T02:28:35-08:00
Commit Message:
NEVERHOOD: Fix an off-by-one error in Klogg's letters
This fixes the buggy Willie letter appearing among the ones from Klogg
(bug #6513)
Changed paths:
engines/neverhood/modules/module1000.cpp
engines/neverhood/modules/module1000.h
diff --git a/engines/neverhood/modules/module1000.cpp b/engines/neverhood/modules/module1000.cpp
index cdeb457..a3b5bc6 100644
--- a/engines/neverhood/modules/module1000.cpp
+++ b/engines/neverhood/modules/module1000.cpp
@@ -609,7 +609,7 @@ uint32 Scene1005::getTextIndex() {
uint32 textIndex;
textIndex = getTextIndex1();
if (getGlobalVar(V_ENTRANCE_OPEN)) {
- textIndex = getTextIndex2();
+ textIndex = getKloggsTextIndex();
}
if (getGlobalVar(V_TEXT_FLAG1) && getGlobalVar(V_TEXT_INDEX) == textIndex) {
textIndex = getTextIndex3();
@@ -690,9 +690,9 @@ uint32 Scene1005::getTextIndex1() {
return textIndex;
}
-uint32 Scene1005::getTextIndex2() {
+uint32 Scene1005::getKloggsTextIndex() {
uint32 textIndex = getGlobalVar(V_TEXT_COUNTING_INDEX1);
- if (textIndex + 1 >= 10) {
+ if (textIndex + 1 > 10) {
setGlobalVar(V_TEXT_COUNTING_INDEX1, 0);
textIndex = 0;
} else {
diff --git a/engines/neverhood/modules/module1000.h b/engines/neverhood/modules/module1000.h
index d2afaf6..58aa92e 100644
--- a/engines/neverhood/modules/module1000.h
+++ b/engines/neverhood/modules/module1000.h
@@ -101,7 +101,7 @@ protected:
void drawTextToBackground();
uint32 getTextIndex();
uint32 getTextIndex1();
- uint32 getTextIndex2();
+ uint32 getKloggsTextIndex();
uint32 getTextIndex3();
};
More information about the Scummvm-git-logs
mailing list