[Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.50,1.51 interface.cpp,1.130,1.131 interface.h,1.71,1.72

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32437

Modified Files:
	input.cpp interface.cpp interface.h 
Log Message:
Fix bugs #1256398 "ITE: Clicking doesn't skip dialogue"


Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- input.cpp	7 Aug 2005 14:54:11 -0000	1.50
+++ input.cpp	11 Aug 2005 16:13:10 -0000	1.51
@@ -62,7 +62,8 @@
 				_interface->draw();
 				break;
 
-/*			case 269:
+#if 0
+			case 269:
 			case 270:
 			case 273:
 			case 274:
@@ -73,7 +74,8 @@
 					_vm->_isoMap->_viewScroll.y += (_vm->_isoMap->_viewDiff * (event.kbd.keycode == 274) - _vm->_isoMap->_viewDiff * (event.kbd.keycode == 273));
 					_vm->_isoMap->_viewScroll.x += (_vm->_isoMap->_viewDiff * (event.kbd.keycode == 275) - _vm->_isoMap->_viewDiff * (event.kbd.keycode == 276));
 				}
-				break;*/
+				break;
+#endif
 			case 282: // F1
 				_render->toggleFlag(RF_SHOW_FPS);
 				_actor->_handleActionDiv = (_actor->_handleActionDiv == 15) ? 50 : 15;
@@ -87,6 +89,10 @@
 			case 285: // F4
 				_render->toggleFlag(RF_OBJECTMAP_TEST);
 				break;
+			case 286: // F5
+				if (_interface->getSaveReminderState() > 0)
+					_interface->setMode(kPanelOption);
+				break;
 			case 287: // F6
 				_render->toggleFlag(RF_ACTOR_PATH_TEST);
 				break;

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- interface.cpp	10 Aug 2005 18:27:17 -0000	1.130
+++ interface.cpp	11 Aug 2005 16:13:10 -0000	1.131
@@ -1080,9 +1080,11 @@
 				fileName = _vm->calcSaveFileName(_vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber);
 				_vm->save(fileName, _textInputString);
 			}
+			_textInput = false;
 			setMode(kPanelOption);
 			break;
 		case kTextCancel:
+			_textInput = false;
 			setMode(kPanelOption);
 			break;
 	}
@@ -1258,6 +1260,9 @@
 
 void Interface::update(const Point& mousePoint, int updateFlag) {
 
+	if (!_active && _panelMode == kPanelNull && (updateFlag & UPDATE_MOUSECLICK))
+		_vm->_actor->abortSpeech();
+
 	if (_vm->_scene->isInDemo() || _fadeMode == kFadeOut || !_active) {
 		return;
 	}

Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- interface.h	10 Aug 2005 18:27:17 -0000	1.71
+++ interface.h	11 Aug 2005 16:13:10 -0000	1.72
@@ -195,6 +195,9 @@
 		_saveReminderState = state;
 		draw();
 	}
+	int getSaveReminderState() {
+		return _saveReminderState;
+	}
 	bool isActive() { return _active; }
 	void setMode(int mode);
 	int getMode(void) const { return _panelMode; }