aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-08-07 22:04:01 -0400
committerPaul Gilbert2014-08-07 22:04:01 -0400
commit52721cf2cb666affa7ae7ab952987d51c35fe0e7 (patch)
treec1339cbd5104183d178df3a6344c67d0c689bd44 /engines
parent6715bb0864212edaf88076dce88e5df1138333da (diff)
downloadscummvm-rg350-52721cf2cb666affa7ae7ab952987d51c35fe0e7.tar.gz
scummvm-rg350-52721cf2cb666affa7ae7ab952987d51c35fe0e7.tar.bz2
scummvm-rg350-52721cf2cb666affa7ae7ab952987d51c35fe0e7.zip
ACCESS: General cleanup of Room class
Diffstat (limited to 'engines')
-rw-r--r--engines/access/room.cpp6
-rw-r--r--engines/access/room.h6
2 files changed, 2 insertions, 10 deletions
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 136d6027e6..de9a41c2d3 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -234,11 +234,6 @@ void Room::roomLoop() {
_vm->_scripts->executeCommand();
}
-
-void Room::doCommands() {
- // TODO
-}
-
void Room::setupRoom() {
_vm->_screen->setScaleTable(_vm->_scale);
_vm->_screen->setBufferScan();
@@ -374,5 +369,4 @@ RoomInfo::RoomInfo(const byte *data) {
}
};
-
} // End of namespace Access
diff --git a/engines/access/room.h b/engines/access/room.h
index a202e437bb..c01a753d0a 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -55,8 +55,6 @@ class Room: public Manager {
private:
void roomLoop();
protected:
- AccessEngine *_vm;
-
void loadRoomData(const byte *roomData);
void setupRoom();
void setWallCodes();
@@ -80,6 +78,8 @@ protected:
virtual void reloadRoom1() = 0;
virtual void setIconPalette() {}
+
+ virtual void doCommands() {}
public:
Plotter _plotter;
Common::Array<JetFrame> _jetFrame;
@@ -95,8 +95,6 @@ public:
void doRoom();
- void doCommands();
-
/**
* Clear all the data used by the room
*/