[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.110,1.111 simon.cpp,1.423,1.424

[Max Horn]

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

Modified Files:
	items.cpp simon.cpp 
Log Message:
the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- items.cpp	13 Feb 2004 06:06:29 -0000	1.110
+++ items.cpp	24 Feb 2004 22:39:39 -0000	1.111
@@ -731,22 +731,16 @@
 			break;
 
 		case 132:{									/* save game */
-				OSystem::Property prop;
-				prop.show_keyboard = true;
-				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+				_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 				o_save_game();
-				prop.show_keyboard = false;
-				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+				_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 			}
 			break;
 
 		case 133:{									/* load game */
-				OSystem::Property prop;
-				prop.show_keyboard = true;
-				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+				_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 				o_load_game();
-				prop.show_keyboard = false;
-				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+				_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 			}
 			break;
 
@@ -757,12 +751,9 @@
 			break;
 
 		case 135:{									/* quit if user presses y */
-				OSystem::Property prop;
-				prop.show_keyboard = true;
-				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+				_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 				o_quit_if_user_presses_y();
-				prop.show_keyboard = false;
-				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+				_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 			}
 			break;
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- simon.cpp	22 Feb 2004 14:11:15 -0000	1.423
+++ simon.cpp	24 Feb 2004 22:39:39 -0000	1.424
@@ -585,10 +585,10 @@
 	if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
 		_speed = ConfMan.getInt("slow_down");
 
-	_system->init_size(320, 200);
+	_system->initSize(320, 200);
 
 	// FIXME Use auto dirty rects cleanup code to reduce CPU usage
-	_system->property(OSystem::PROP_WANT_RECT_OPTIM,0);
+	g_system->setFeatureState(OSystem::kFeatureAutoComputeDirtyRects, true);
 }
 
 SimonEngine::~SimonEngine() {
@@ -2888,9 +2888,7 @@
 		delay(10);
 	} while (i == _timer_4);
 
-	OSystem::Property prop;
-        prop.show_keyboard = false;
-        g_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 }
 
 void SimonEngine::o_file_error(FillOrCopyStruct *fcs, bool save_error) {