[Scummvm-git-logs] scummvm master -> 23718d14abb79e3c69c446aed23653aef17bae7a
dreammaster
dreammaster at scummvm.org
Fri Sep 2 04:33:19 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
636f033175 TITANIC: Add room script field initialization
23718d14ab IMAGE: Fix decoding Starship Titanic video file z404.avi
Commit: 636f033175d28119583f6f2c0158b8583fb33d38
https://github.com/scummvm/scummvm/commit/636f033175d28119583f6f2c0158b8583fb33d38
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-01T22:32:17-04:00
Commit Message:
TITANIC: Add room script field initialization
Changed paths:
engines/titanic/true_talk/tt_room_script.cpp
diff --git a/engines/titanic/true_talk/tt_room_script.cpp b/engines/titanic/true_talk/tt_room_script.cpp
index b8fbca7..a49a5a5 100644
--- a/engines/titanic/true_talk/tt_room_script.cpp
+++ b/engines/titanic/true_talk/tt_room_script.cpp
@@ -34,7 +34,7 @@ TTroomScriptBase::TTroomScriptBase(int scriptId,
/*------------------------------------------------------------------------*/
TTroomScript::TTroomScript(int scriptId) :
- TTroomScriptBase(scriptId, "", "", 0, -1, -1, -1, 0, 0) {
+ TTroomScriptBase(scriptId, "", "", 0, -1, -1, -1, 0, 0), _field54(0) {
}
bool TTroomScript::proc8() const {
Commit: 23718d14abb79e3c69c446aed23653aef17bae7a
https://github.com/scummvm/scummvm/commit/23718d14abb79e3c69c446aed23653aef17bae7a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-01T22:33:12-04:00
Commit Message:
IMAGE: Fix decoding Starship Titanic video file z404.avi
Changed paths:
image/codecs/msrle.cpp
diff --git a/image/codecs/msrle.cpp b/image/codecs/msrle.cpp
index 89fe869..bb1125e 100644
--- a/image/codecs/msrle.cpp
+++ b/image/codecs/msrle.cpp
@@ -101,7 +101,10 @@ void MSRLEDecoder::decode8(Common::SeekableReadStream &stream) {
// Copy data
if (output + value > output_end) {
- stream.skip(value);
+ if (stream.pos() + value >= stream.size())
+ break;
+ else
+ stream.skip(value);
continue;
}
More information about the Scummvm-git-logs
mailing list