[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.27,1.28 sky.h,1.19,1.20

[Joost Peters]

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

Modified Files:
	sky.cpp sky.h 
Log Message:
added loadFixedItems() and loadBase0()

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sky.cpp	29 Apr 2003 20:42:47 -0000	1.27
+++ sky.cpp	1 May 2003 14:10:41 -0000	1.28
@@ -92,7 +92,8 @@
 	if (!isDemo(_gameVersion) || isCDVersion(_gameVersion))
 		intro();
 
-	_skyGrid->loadGrids();
+	loadBase0();
+	
 	while (1) {
 		delay(100);
 		_skyLogic->engine();
@@ -116,6 +117,7 @@
 	initItemList();
 	//initScript();
 	//initialiseRouter();
+	loadFixedItems();
 	_skyGrid = new SkyGrid(_skyDisk);
 	_skyLogic = new SkyLogic(_skyDisk, _skyGrid, _skyText);
 }
@@ -140,6 +142,38 @@
 		_itemList[124] = (void **)SkyCompact::data_5; // Compacts - Section 5
 		_itemList[125] = (void **)SkyCompact::data_6; // Compacts - Section 6
 	}
+}
+
+void SkyState::loadBase0(void) {
+
+	//fnEnterSection(0);
+	_skyMusic->startMusic(2);
+	_skyGrid->loadGrids();
+	
+}
+
+void SkyState::loadFixedItems(void) {
+
+	if (!isDemo(_gameVersion))
+		_itemList[36] = (void **)_skyDisk->loadFile(26, NULL);
+
+	_itemList[49] = (void **)_skyDisk->loadFile(49, NULL);
+	_itemList[50] = (void **)_skyDisk->loadFile(50, NULL);
+	_itemList[73] = (void **)_skyDisk->loadFile(73, NULL);
+	_itemList[262] = (void **)_skyDisk->loadFile(262, NULL);
+
+	if (isDemo(_gameVersion)) 
+		return;
+	
+	_itemList[263] = (void **)_skyDisk->loadFile(263, NULL);
+	_itemList[264] = (void **)_skyDisk->loadFile(264, NULL);
+	_itemList[265] = (void **)_skyDisk->loadFile(265, NULL);
+	_itemList[266] = (void **)_skyDisk->loadFile(266, NULL);
+	_itemList[267] = (void **)_skyDisk->loadFile(267, NULL);
+	_itemList[269] = (void **)_skyDisk->loadFile(269, NULL);
+	_itemList[271] = (void **)_skyDisk->loadFile(271, NULL);
+	_itemList[272] = (void **)_skyDisk->loadFile(272, NULL);
+		
 }
 
 Compact *SkyState::fetchCompact(uint32 a) {

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sky.h	29 Apr 2003 20:13:00 -0000	1.19
+++ sky.h	1 May 2003 14:10:42 -0000	1.20
@@ -144,6 +144,8 @@
 	void startTimerSequence(byte *sequence);
 	static void timerHandler(void *ptr);
 	void doTimerSequence();
+	void loadFixedItems();
+	void loadBase0();
 	
 	static int CDECL game_thread_proc(void *param);