Fixed variable access in the debugger

svn-id: r14523

3 files changed, 18 insertions, 10 deletions

diff --git a/common/debugger.cpp b/common/debugger.cpp
index 39460c863a..7f771ae2f6 100644
--- a/common/debugger.cpp
+++ b/common/debugger.cpp
@@ -186,10 +186,14 @@ bool Debugger<T>::RunCommand(const char *inputOrig) {
 				// Alright, we need to check the TYPE of the variable to deref and stuff... the array stuff is a bit ugly :)
 				switch(_dvars[i].type) {
 				// Integer
+				case DVAR_BYTE:
+					*(byte *)_dvars[i].variable = atoi(param[1]);
+					DebugPrintf("byte%s = %d\n", param[0], *(byte *)_dvars[i].variable);
+					break;
 				case DVAR_INT:
 					*(int *)_dvars[i].variable = atoi(param[1]);
 					DebugPrintf("(int)%s = %d\n", param[0], *(int *)_dvars[i].variable);
-				break;
+					break;
 				// Integer Array
 				case DVAR_INTARRAY: {
 					char *chr = strchr(param[0], '[');
@@ -198,15 +202,15 @@ bool Debugger<T>::RunCommand(const char *inputOrig) {
 					} else {
 						int element = atoi(chr+1);
 						int32 *var = *(int32 **)_dvars[i].variable;
-						if (element > _dvars[i].optional) {
+						if (element >= _dvars[i].optional) {
 							DebugPrintf("%s is out of range (array is %d elements big)\n", param[0], _dvars[i].optional);
 						} else {
 							var[element] = atoi(param[1]);
 							DebugPrintf("(int)%s = %d\n", param[0], var[element]);
 						}
 					}
-				}
-				break;
+					}
+					break;
 				default:
 					DebugPrintf("Failed to set variable %s to %s - unknown type\n", _dvars[i].name, param[1]);
 					break;
@@ -215,9 +219,12 @@ bool Debugger<T>::RunCommand(const char *inputOrig) {
 				// And again, type-dependent prints/defrefs. The array one is still ugly.
 				switch(_dvars[i].type) {
 				// Integer
+				case DVAR_BYTE:
+					DebugPrintf("(byte)%s = %d\n", param[0], *(byte *)_dvars[i].variable);
+					break;
 				case DVAR_INT:
 					DebugPrintf("(int)%s = %d\n", param[0], *(int *)_dvars[i].variable);
-				break;
+					break;
 				// Integer array
 				case DVAR_INTARRAY: {
 					char *chr = strchr(param[0], '[');
@@ -225,8 +232,8 @@ bool Debugger<T>::RunCommand(const char *inputOrig) {
 						DebugPrintf("You must access this array as %s[element]\n", param[0]);
 					} else {
 						int element = atoi(chr+1);
-						int16 *var = *(int16 **)_dvars[i].variable;
-						if (element > _dvars[i].optional) {
+						int32 *var = *(int32 **)_dvars[i].variable;
+						if (element >= _dvars[i].optional) {
 							DebugPrintf("%s is out of range (array is %d elements big)\n", param[0], _dvars[i].optional);
 						} else {
 							DebugPrintf("(int)%s = %d\n", param[0], var[element]);
diff --git a/common/debugger.h b/common/debugger.h
index 1f430668b7..2dab99c088 100644
--- a/common/debugger.h
+++ b/common/debugger.h
@@ -47,6 +47,7 @@ protected:
 	typedef bool (T::*DebugProc)(int argc, const char **argv);
 	
 	enum {
+		DVAR_BYTE,
 		DVAR_INT,
 		DVAR_BOOL,
 		DVAR_INTARRAY,
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index c4a0da71f5..0a537399ea 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -66,14 +66,14 @@ ScummDebugger::ScummDebugger(ScummEngine *s)
 	// Register variables
 	DVar_Register("debug_countdown", &_frame_countdown, DVAR_INT, 0);
 
-	DVar_Register("scumm_speed", &_vm->_fastMode, DVAR_INT, 0);
-	DVar_Register("scumm_room", &_vm->_currentRoom, DVAR_INT, 0);
+	DVar_Register("scumm_speed", &_vm->_fastMode, DVAR_BYTE, 0);
+	DVar_Register("scumm_room", &_vm->_currentRoom, DVAR_BYTE, 0);
 	DVar_Register("scumm_roomresource", &_vm->_roomResource, DVAR_INT, 0);
 	DVar_Register("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables);
 
 	DVar_Register("scumm_gamename", &_vm->_targetName, DVAR_STRING, 0);
 	DVar_Register("scumm_exename", &_vm->_gameName, DVAR_STRING, 0);
-	DVar_Register("scumm_gameid", &_vm->_gameId, DVAR_INT, 0);
+	DVar_Register("scumm_gameid", &_vm->_gameId, DVAR_BYTE, 0);
 
 	// Register commands
 	DCmd_Register("continue", &ScummDebugger::Cmd_Exit);