thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
strangerke 2011-04-13 22:21:58 +02:00
parent 4e75a95f86
commit f9e9ecd454
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/tsage/ringworld_scenes1.cpp
View file

@ -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;

25
engines/tsage/ringworld_scenes1.h
View file

@ -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: