[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.66,1.67 screen.cpp,1.56,1.57 sky.cpp,1.142,1.143

Max Horn fingolfin at users.sourceforge.net
Tue Feb 24 14:55:06 CET 2004


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

Modified Files:
	control.cpp screen.cpp sky.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: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- control.cpp	26 Jan 2004 20:28:32 -0000	1.66
+++ control.cpp	24 Feb 2004 22:39:40 -0000	1.67
@@ -803,11 +803,9 @@
 	uint16 cnt;
 	uint8 lookListLen;
 	if (allowSave) {
-		OSystem::Property prop;	
 		lookList = _savePanLookList;
 		lookListLen = 6;
-		prop.show_keyboard = true;
-		_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+		_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 	} else {
 		lookList = _restorePanLookList;
 		if (autoSaveExists())
@@ -915,9 +913,7 @@
 	free(saveGameTexts);
 
 	if (allowSave) {
-		OSystem::Property prop;
-		prop.show_keyboard = false;
-		_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
+		_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 	}
 		
 	return clickRes;

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- screen.cpp	6 Jan 2004 12:45:32 -0000	1.56
+++ screen.cpp	24 Feb 2004 22:39:40 -0000	1.57
@@ -57,7 +57,7 @@
 	int i;
 	uint8 tmpPal[1024];
 
-	_system->init_size(FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
+	_system->initSize(FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
 	_gameGrid = (uint8 *)malloc(GRID_X * GRID_Y * 2);
 	forceRefresh();
 

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- sky.cpp	13 Feb 2004 10:51:33 -0000	1.142
+++ sky.cpp	24 Feb 2004 22:39:40 -0000	1.143
@@ -127,7 +127,7 @@
 
 	_fastMode = 0;
 
-	_system->init_size(320, 200);
+	_system->initSize(320, 200);
 }
 
 SkyEngine::~SkyEngine() {





More information about the Scummvm-git-logs mailing list