[Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.15,1.16 misc.cpp,1.8,1.9 palette.cpp,1.5,1.6 rdwin.cpp,1.5,1.6

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv8907/driver

Modified Files:
	driver96.h misc.cpp palette.cpp rdwin.cpp 
Log Message:
remove bs2 specific osystem var

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- driver96.h	30 Jul 2003 19:25:30 -0000	1.15
+++ driver96.h	31 Jul 2003 15:24:23 -0000	1.16
@@ -1050,8 +1050,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "scummsys.h"
-#include "engine.h" // for warning()
+#include "common/scummsys.h"
+#include "common/engine.h" // for warning()
+#include "common/system.h"
 #include "system.h"
 #include "file.h"
 //#include "ddraw.h"

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- misc.cpp	30 Jul 2003 19:25:30 -0000	1.8
+++ misc.cpp	31 Jul 2003 15:24:23 -0000	1.9
@@ -22,7 +22,7 @@
 #include "../sword2.h"
 
 uint32 SVM_timeGetTime(void) {
-	return g_sword2->_syst->get_msecs();
+	return g_system->get_msecs();
 }
 
 void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) {

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palette.cpp	31 Jul 2003 14:51:02 -0000	1.5
+++ palette.cpp	31 Jul 2003 15:24:23 -0000	1.6
@@ -423,7 +423,7 @@
 			currentTime = SVM_timeGetTime();
 			if (currentTime >= fadeStartTime + fadeTotalTime) {
 				fadeStatus = RDFADE_NONE;
-				g_sword2->_syst->set_palette((const byte *) palCopy, 0, 256);
+				g_system->set_palette((const byte *) palCopy, 0, 256);
 			} else {
 				fadeMultiplier = (int16) (((int32) (currentTime - fadeStartTime) * 256) / fadeTotalTime);
 				for (i=0; i<256; i++) {
@@ -431,7 +431,7 @@
 					fadePalette[i][1] = (palCopy[i][1] * fadeMultiplier) >> 8;
 					fadePalette[i][2] = (palCopy[i][2] * fadeMultiplier) >> 8;
 				}
-				g_sword2->_syst->set_palette((const byte *) fadePalette, 0, 256);
+				g_system->set_palette((const byte *) fadePalette, 0, 256);
 			}
 			break;
 
@@ -448,7 +448,7 @@
 					fadePalette[i][2] = (palCopy[i][2] * fadeMultiplier) >> 8;
 				}
 			}
-			g_sword2->_syst->set_palette((const byte *) fadePalette, 0, 256);
+			g_system->set_palette((const byte *) fadePalette, 0, 256);
 			break;
 		}
 

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rdwin.cpp	30 Jul 2003 19:25:30 -0000	1.5
+++ rdwin.cpp	31 Jul 2003 15:24:23 -0000	1.6
@@ -168,7 +168,7 @@
 		case OSystem::EVENT_MOUSEMOVE:
 			mousex = event.mouse.x;
 			mousey = event.mouse.y;
-			_syst->set_mouse_pos(event.mouse.x, event.mouse.y);
+			_system->set_mouse_pos(event.mouse.x, event.mouse.y);
 			break;
 		case OSystem::EVENT_LBUTTONDOWN:
 			LogMouseEvent(RD_LEFTBUTTONDOWN);
@@ -537,7 +537,7 @@
 	DestroyWindow(hwnd);
 */
 	// just quit for now
-	g_sword2->_syst->quit();
+	g_system->quit();
 	return(RD_OK);
 
 }