[Scummvm-cvs-logs] scummvm master -> 4dffd4c1db122553795390ffed9d7776e20bc329

Strangerke Strangerke at scummvm.org
Tue Jan 31 01:03:21 CET 2012


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:
4dffd4c1db TSAGE: R2R - Fix a couple of compilation errors not detected by MSVC


Commit: 4dffd4c1db122553795390ffed9d7776e20bc329
    https://github.com/scummvm/scummvm/commit/4dffd4c1db122553795390ffed9d7776e20bc329
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-01-30T16:02:37-08:00

Commit Message:
TSAGE: R2R - Fix a couple of compilation errors not detected by MSVC

Thanks Kirben for pointing those

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 51f7cd8..65fd762 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4518,7 +4518,7 @@ bool Scene600::Item4::startAction(CursorType action, Event &event) {
 	scene->_actor2.postInit();
 	
 	scene->_sceneMode = 612;
-	setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, R2_GLOBALS._player, NULL);
+	setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, &R2_GLOBALS._player, NULL);
 	return true;
 }
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 25940e7..518e876 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -586,7 +586,7 @@ public:
 
 	Scene600();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-	virtual void Scene600::remove();
+	virtual void remove();
 	virtual void signal();
 	virtual void process(Event &event);
 	virtual void dispatch();






More information about the Scummvm-git-logs mailing list