remove debugger hack from enterLocation. add sanity check to "room" c…

…ommand.
salty-horse · Apr 5, 2008 · 2945d32 · 2945d32
1 parent b538121
commit 2945d32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/debugger.cpp b/debugger.cpp
@@ -42,8 +42,13 @@ Debugger::Debugger(KomEngine *vm) : GUI::Debugger(), _vm(vm) {
 bool Debugger::Cmd_Room(int argc, const char **argv) {
 	if (argc == 2) {
 		uint16 roomNum = atoi(argv[1]);
+		if (roomNum == 0)
+			return false;
+
 		_vm->game()->settings()->currLocation = roomNum;
 		_vm->database()->getChar(0)->_locationId = roomNum;
+		_vm->database()->getChar(0)->_lastLocation = roomNum;
+
 		_vm->game()->enterLocation(roomNum);
 		return false;
 	}

diff --git a/game.cpp b/game.cpp
@@ -50,9 +50,6 @@ Game::~Game() {
 void Game::enterLocation(uint16 locId) {
 	char filename[50];
 
-	// FIXME - hack
-	_vm->database()->getChar(0)->_lastLocation = locId;
-
 	_vm->panel()->showLoading(true);
 
 	// Unload last room elements