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

Strangerke arnaud.boutonne at gmail.com
Wed Apr 13 22:22:46 CEST 2011


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:
f9e9ecd454 TSAGE: Move two functions from .h to .cpp (thanks fuzzie for reporting that)


Commit: f9e9ecd454057f27a2352a936eec955e6906ebcb
    https://github.com/scummvm/scummvm/commit/f9e9ecd454057f27a2352a936eec955e6906ebcb
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-13T13:21:58-07:00

Commit Message:
TSAGE: Move two functions from .h to .cpp (thanks fuzzie for reporting that)

Changed paths:
    engines/tsage/ringworld_scenes1.cpp
    engines/tsage/ringworld_scenes1.h



diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 4497d6a..c78bc12 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -622,6 +622,29 @@ void Scene20::signal() {
  *
  *--------------------------------------------------------------------------*/
 
+void Scene30::BeamObject::doAction(int action) {
+	if (action == OBJECT_SCANNER)
+		display(30, 14, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
+	else if (action == CURSOR_LOOK)
+		display(30, 2, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
+	else if (action == CURSOR_USE) {
+		Scene30 *parent = (Scene30 *)_globals->_sceneManager._scene;
+		parent->setAction(&parent->_beamAction);
+	} else
+		SceneObject::doAction(action);
+}
+
+void Scene30::DoorObject::doAction(int action) {
+	if (action == OBJECT_SCANNER)
+		display(30, 13, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
+	else if (action == CURSOR_LOOK)
+		display(30, 1, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
+	else if (action == CURSOR_USE)
+		display(30, 7, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
+	else
+		SceneObject::doAction(action);
+}
+
 void Scene30::BeamAction::signal() {
 	Scene30 *scene = (Scene30 *)_globals->_sceneManager._scene;
 
diff --git a/engines/tsage/ringworld_scenes1.h b/engines/tsage/ringworld_scenes1.h
index b567aee..66f7282 100644
--- a/engines/tsage/ringworld_scenes1.h
+++ b/engines/tsage/ringworld_scenes1.h
@@ -114,34 +114,13 @@ class Scene30 : public Scene {
 	// Doorway beam sensor
 	class BeamObject : public SceneObject {
 	public:
-		virtual void doAction(int action) {
-			if (action == OBJECT_SCANNER)
-				display(30, 14, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_LOOK)
-				display(30, 2, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_USE) {
-				Scene30 *parent = (Scene30 *)_globals->_sceneManager._scene;
-				parent->setAction(&parent->_beamAction);
-			} else
-				SceneObject::doAction(action);
-		}
+		virtual void doAction(int action);
 	};
-
 	// Doorway object
 	class DoorObject : public SceneObject {
 	public:
-		virtual void doAction(int action) {
-			if (action == OBJECT_SCANNER)
-				display(30, 13, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_LOOK)
-				display(30, 1, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else if (action == CURSOR_USE)
-				display(30, 7, SET_WIDTH, 200, SET_EXT_BGCOLOUR, 7, LIST_END);
-			else
-				SceneObject::doAction(action);
-		}
+		virtual void doAction(int action);
 	};
-
 	// Kzin object
 	class KzinObject : public SceneObject {
 	public:






More information about the Scummvm-git-logs mailing list