1 files changed, 5 insertions, 25 deletions

diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index bc61b0a749..48c7290249 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -69,29 +69,9 @@ Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene));
 	registerCmd("cheat", WRAP_METHOD(Debugger, Cmd_Cheat));
 	registerCmd("playmovie", WRAP_METHOD(Debugger, Cmd_PlayMovie));
-
-	switch (vm->getGameID()) {
-	case GType_Amazon:
-		_sceneNumb = Amazon::ROOM_NUMB;
-		_sceneDescr = new Common::String[_sceneNumb];
-		for (int i = 0; i < _sceneNumb; i++)
-			_sceneDescr[i] = Common::String(Amazon::ROOM_DESCR[i]);
-		break;
-	case GType_MartianMemorandum:
-		_sceneNumb = Martian::ROOM_NUMB;
-		_sceneDescr = new Common::String[_sceneNumb];
-		for (int i = 0; i < _sceneNumb; i++)
-			_sceneDescr[i] = Common::String(Martian::ROOM_DESCR[i]);
-		break;
-	default:
-		_sceneDescr = nullptr;
-		_sceneNumb = 0;
-		break;
-	}
 }
 
 Debugger::~Debugger() {
-	delete[] _sceneDescr;
 }
 
 bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
@@ -99,18 +79,18 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 	case 1:
 		debugPrintf("Current scene is: %d\n\n", _vm->_player->_roomNumber);
 
-		for (int i = 0; i < _sceneNumb; i++)
-			if (_sceneDescr[i].size())
-				debugPrintf("%d - %s\n", i, _sceneDescr[i].c_str());
+		for (uint i = 0; i < _vm->_res->ROOMTBL.size(); i++)
+			if (!_vm->_res->ROOMTBL[i]._desc.empty())
+				debugPrintf("%d - %s\n", i, _vm->_res->ROOMTBL[i]._desc.c_str());
 		return true;
 
 	case 2: {
 		int newRoom = strToInt(argv[1]);
-		if (newRoom < 0 || newRoom >= _sceneNumb) {
+		if (newRoom < 0 || newRoom >= (int)_vm->_res->ROOMTBL.size()) {
 			debugPrintf("Invalid Room Number\n");
 			return true;
 		}
-		if (!_sceneDescr[newRoom].size()) {
+		if (_vm->_res->ROOMTBL[newRoom]._desc.empty()) {
 			debugPrintf("Unused Room Number\n");
 			return true;
 		}