[Scummvm-cvs-logs] scummvm master -> 3f6f814c6a20e2eb745c9b03722ce3456685411c

Strangerke Strangerke at scummvm.org
Fri Feb 10 07:12:40 CET 2012


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:
9e6e286db7 TSAGE: R2R - Fix glitch in scene 180
3f6f814c6a TSAGE: R2R - Fix error in scene 1337


Commit: 9e6e286db7b8f0359a2517ee91d1c1257d557846
    https://github.com/scummvm/scummvm/commit/9e6e286db7b8f0359a2517ee91d1c1257d557846
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-02-09T22:11:20-08:00

Commit Message:
TSAGE: R2R - Fix glitch in scene 180

Thanks to LordHoto for reporting it

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index cacd074..1c924ba 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1885,7 +1885,7 @@ void Scene180::dispatch() {
 	if (_frameInc) {
 		uint32 frameNumber = R2_GLOBALS._events.getFrameNumber();
 
-		if (frameNumber >= frameNumber) {
+		if (frameNumber >= (uint32)_frameNumber) {
 			_frameInc = frameNumber - _frameNumber;
 			_frameNumber = frameNumber;
 


Commit: 3f6f814c6a20e2eb745c9b03722ce3456685411c
    https://github.com/scummvm/scummvm/commit/3f6f814c6a20e2eb745c9b03722ce3456685411c
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-02-09T22:12:11-08:00

Commit Message:
TSAGE: R2R - Fix error in scene 1337

Thanks to LordHoto for reporting it

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index ccc0c3d..b366c64 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -184,7 +184,7 @@ class Scene1337 : public SceneExt {
 	class unkObj1337_1: public SceneItem {
 	public:
 		unkObj1337sub1 _arr1[4];
-		unkObj1337sub1 _arr2[7];
+		unkObj1337sub1 _arr2[8];
 		unkObj1337sub1 _arr3[1];
 		unkObj1337sub1 _arr4[1];
 






More information about the Scummvm-git-logs mailing list