[Scummvm-cvs-logs] scummvm master -> eb3167f5904dd077465bee40097d8d48f5efe300

[Strangerke]

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:
eb3167f590 TSAGE: R2R - Rename 5th parameter in actionDisplay(), scene 1337


Commit: eb3167f5904dd077465bee40097d8d48f5efe300
    https://github.com/scummvm/scummvm/commit/eb3167f5904dd077465bee40097d8d48f5efe300
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-08T09:05:27-08:00

Commit Message:
TSAGE: R2R - Rename 5th parameter in actionDisplay(), scene 1337

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index c491a5c..5a14da0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4524,7 +4524,7 @@ void Scene1337::dispatch() {
 	Scene::dispatch();
 }
 
-void Scene1337::actionDisplay(int resNum, int lineNum, int x, int y, int arg5, int width, int textMode, int fontNum, int colFG, int colBGExt, int colFGExt) {
+void Scene1337::actionDisplay(int resNum, int lineNum, int x, int y, int keepOnScreen, int width, int textMode, int fontNum, int colFG, int colBGExt, int colFGExt) {
 	// TODO: Check if it's normal that arg5 is unused and replaced by an hardcoded 0 value
 	// May hide an original bug
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 6edbd12..b93943e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -328,7 +328,7 @@ public:
 	Scene1337();
 	virtual void synchronize(Serializer &s);
 
-	void actionDisplay(int resNum, int lineNum, int x, int y, int arg5, int width, int textMode, int fontNum, int colFG, int colBGExt, int colFGExt);
+	void actionDisplay(int resNum, int lineNum, int x, int y, int keepOnScreen, int width, int textMode, int fontNum, int colFG, int colBGExt, int colFGExt);
 	void setAnimationInfo(Card *subObj);
 	void subC20E5();
 	void subC20F9();