[Scummvm-git-logs] scummvm master -> 23452a512df002231e36927b4238bd83d097c604
dreammaster
dreammaster at scummvm.org
Sun Feb 12 00:58:28 CET 2017
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:
f66ead3074 TSAGE: R2R: Fix display of animations
23452a512d NEWS: Mention R2R display fix
Commit: f66ead3074505bda5d03d8b726cf6410c826176b
https://github.com/scummvm/scummvm/commit/f66ead3074505bda5d03d8b726cf6410c826176b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-11T18:50:44-05:00
Commit Message:
TSAGE: R2R: Fix display of animations
Changed paths:
engines/tsage/ringworld2/ringworld2_logic.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ecaa671..b41abe8 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1972,11 +1972,11 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
case 0:
// Draw from uncompressed source
for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
- for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+ for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, ++y) {
// TODO: Check of _subData._drawType was done for two different kinds of
// line slice drawing in original
const byte *pSrc = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
- byte *pDest = (byte *)dest.getBasePtr(0, y++);
+ byte *pDest = (byte *)dest.getBasePtr(0, y);
Common::copy(pSrc, pSrc + _subData._sliceSize, pDest);
}
@@ -1988,12 +1988,12 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
case 0xfe:
// Draw from uncompressed source with optional skipped rows
for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
- for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, playerBounds.top++) {
+ for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, ++y) {
int offset = READ_LE_UINT16(sliceData1 + sliceNum * 2);
if (offset) {
const byte *pSrc = (const byte *)sliceDataStart + offset;
- byte *pDest = (byte *)dest.getBasePtr(0, 0);
+ byte *pDest = (byte *)dest.getBasePtr(0, y);
//Common::copy(pSrc, pSrc + playerBounds.width(), pDest);
rleDecode(pSrc, pDest, playerBounds.width());
@@ -2004,11 +2004,11 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
case 0xff:
// Draw from RLE compressed source
for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
- for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, playerBounds.top++) {
+ for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, ++y) {
// TODO: Check of _subData._drawType was done for two different kinds of
// line slice drawing in original
const byte *pSrc = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
- byte *pDest = (byte *)dest.getBasePtr(0, 0);
+ byte *pDest = (byte *)dest.getBasePtr(0, y);
rleDecode(pSrc, pDest, _subData._sliceSize);
}
@@ -2020,10 +2020,10 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
byte *sliceData2 = &slices._pixelData[slice2._sliceOffset - 96];
for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
- for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+ for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, ++y) {
const byte *pSrc1 = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData2 + sliceNum * 2);
const byte *pSrc2 = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
- byte *pDest = (byte *)dest.getBasePtr(0, y++);
+ byte *pDest = (byte *)dest.getBasePtr(0, y);
if (slice2._drawMode == 0) {
// Uncompressed background, foreground compressed
Commit: 23452a512df002231e36927b4238bd83d097c604
https://github.com/scummvm/scummvm/commit/23452a512df002231e36927b4238bd83d097c604
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-11T18:51:08-05:00
Commit Message:
NEWS: Mention R2R display fix
Changed paths:
NEWS
diff --git a/NEWS b/NEWS
index 23c6fae..8badaed 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,9 @@ Drascula:
MADS:
- Fixed a bug that caused a crash after starting Rex Nebular and the Cosmic Gender Bender.
+ TsAGE:
+ - Fixed recently introduced bug preventing animations in Return to Ringworld from playing.
+
1.9.0 (2016-10-17)
New Games:
- Added support for Myst.
More information about the Scummvm-git-logs
mailing list