[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.17,1.18 logic.h,1.8,1.9 sky.cpp,1.24,1.25

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv8605/sky

Modified Files:
	logic.cpp logic.h sky.cpp 
Log Message:
enabled lowTextManager

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- logic.cpp	29 Apr 2003 19:52:20 -0000	1.17
+++ logic.cpp	29 Apr 2003 20:05:46 -0000	1.18
@@ -48,9 +48,10 @@
 	&SkyLogic::simpleAnim,	 // 16 Module anim without x,y's
 };
 
-SkyLogic::SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid) {
+SkyLogic::SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText) {
 	_skyDisk = skyDisk;
 	_skyGrid = skyGrid;
+	_skyText = skyText;
 	_skyAutoRoute = new SkyAutoRoute(_skyGrid);
 
 	for (uint i = 0; i < sizeof(_moduleList)/sizeof(uint16*); i++)
@@ -952,8 +953,7 @@
 }
 
 uint32 SkyLogic::fnChooser(uint32 a, uint32 b, uint32 c) {
-	warning("fnChooser: lowTextManager unimplented");
-	return 1;
+	
 	// setup the text questions to be clicked on
 	// read from TEXT1 until 0
 
@@ -967,7 +967,9 @@
 	while (*p) {
 		uint32 textNum = *p++;
 
-		uint8 *data; // = lowTextManager(textNum, GAME_SCREEN_WIDTH, 0, 241, 0);
+		struct lowTextManager_t lowText = _skyText->lowTextManager(textNum, GAME_SCREEN_WIDTH, 0, 241, 0);
+		
+		uint8 *data = lowText.textData;
 
 		// stipple the text
 		uint16 height = ((dataFileHeader *)data)->s_height;

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- logic.h	29 Apr 2003 19:52:20 -0000	1.8
+++ logic.h	29 Apr 2003 20:05:46 -0000	1.9
@@ -29,7 +29,7 @@
 
 class SkyLogic {
 public:
-	SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid);
+	SkyLogic(SkyDisk *skyDisk, SkyGrid *skyGrid, SkyText *skyText);
 	void engine();
 
 	void lreturn();
@@ -167,7 +167,7 @@
 	uint32 fnUnPauseFx(uint32 a, uint32 b, uint32 c);
 	uint32 fnPrintf(uint32 a, uint32 b, uint32 c);
 
-	static uint16 SkyLogic::_screen;
+	static uint16 _screen;
 	
 protected:
 	void push(uint32);
@@ -185,6 +185,7 @@
 
 	SkyDisk *_skyDisk;
 	SkyGrid *_skyGrid;
+	SkyText *_skyText;
 	SkyAutoRoute *_skyAutoRoute;
 };
 

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- sky.cpp	29 Apr 2003 19:52:21 -0000	1.24
+++ sky.cpp	29 Apr 2003 20:05:47 -0000	1.25
@@ -106,7 +106,7 @@
 
 	_sound = new SkySound(_mixer);
 	_skyDisk = new SkyDisk(_gameDataPath);
-	_music = new SkyMusic(_mixer,_skyDisk);
+	_music = new SkyMusic(_mixer, _skyDisk);
 	_gameVersion = _skyDisk->determineGameVersion();
 	_skyText = getSkyText();
 	
@@ -116,9 +116,8 @@
 	initItemList();
 	//initScript();
 	//initialiseRouter();
-	_skyText = getSkyText();
 	_grid = new SkyGrid(_skyDisk);
-	_skyLogic = new SkyLogic(_skyDisk, _grid);
+	_skyLogic = new SkyLogic(_skyDisk, _grid, _skyText);
 }
 
 void SkyState::initItemList() {