[Scummvm-cvs-logs] SF.net SVN: scummvm:[42101] scummvm/branches/gsoc2009-draci/engines/draci

[dkasak13 at users.sourceforge.net]

Revision: 42101
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42101&view=rev
Author:   dkasak13
Date:     2009-07-04 18:35:08 +0000 (Sat, 04 Jul 2009)

Log Message:
-----------
* Added Game::init() and moved some functionality from Game::Game to it (loading objects, changing rooms)
* Made Game::load*(), Game::getObject() and Game::changeRoom() methods public
* Stopped specifying Z coordinate when creating some Sprites (which I forgot in my previous commit)

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
    scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
    scummvm/branches/gsoc2009-draci/engines/draci/game.h
    scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-04 18:29:01 UTC (rev 42100)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-04 18:35:08 UTC (rev 42101)
@@ -92,8 +92,6 @@
 	_script = new Script(this);
 	_game = new Game(this);
 
-
-
 	// Load default font
 	_font->setFont(kFontBig);
 
@@ -139,6 +137,8 @@
  
 	debugC(2, kDraciGeneralDebugLevel, "Running graphics/animation test...");
 
+	_game->init();
+
 	_mouse->setCursorType(kNormalCursor);
 	_mouse->cursorOn();
 

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-04 18:29:01 UTC (rev 42100)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-04 18:35:08 UTC (rev 42101)
@@ -131,7 +131,9 @@
 	assert(numPersons == _info->_numPersons);
 	assert(numVariables == _info->_numVariables);
 	assert(numObjects == _info->_numObjects);	
+}
 
+void Game::init() {
 	loadObject(0);
 	
 	_vm->_script->run(getObject(0)->_program, getObject(0)->_init);
@@ -202,7 +204,7 @@
 
 		BAFile *spriteFile = _vm->_spritesArchive->getFile(spriteNum);
 
-		Sprite *sp = new Sprite(spriteFile->_data, spriteFile->_length, x, y, 1, true);
+		Sprite *sp = new Sprite(spriteFile->_data, spriteFile->_length, x, y, true);
 
 		if (mirror) 
 			sp->setMirrorOn();
@@ -275,7 +277,7 @@
  		z = overlayReader.readByte();
  
 		overlayFile = _vm->_overlaysArchive->getFile(num);
- 		Sprite *sp = new Sprite(overlayFile->_data, overlayFile->_length, x, y, z, true);
+ 		Sprite *sp = new Sprite(overlayFile->_data, overlayFile->_length, x, y, true);
  
  		_vm->_anims->addOverlay(sp, z);		
 	}

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-04 18:29:01 UTC (rev 42100)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-04 18:35:08 UTC (rev 42101)
@@ -99,6 +99,17 @@
 	Game(DraciEngine *vm);
 	~Game();
 
+	void init();
+
+	void changeRoom(uint roomNum);
+
+	void loadRoom(uint roomNum);
+	int loadAnimation(uint animNum);
+	void loadOverlays();
+	void loadObject(uint numObj);
+
+	GameObject *getObject(uint objNum);
+
 private:
 	DraciEngine *_vm;
 	
@@ -109,15 +120,6 @@
 	byte *_itemStatus;
 	GameObject *_objects;	
 	Room _currentRoom;	
-
-	void loadRoom(uint roomNum);
-	int loadAnimation(uint animNum);
-	void loadOverlays();
-	void loadObject(uint numObj);
-
-	GameObject *getObject(uint objNum);
-
-	void changeRoom(uint roomNum);
 };
 
 } // End of namespace Draci

Modified: scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp	2009-07-04 18:29:01 UTC (rev 42100)
+++ scummvm/branches/gsoc2009-draci/engines/draci/mouse.cpp	2009-07-04 18:35:08 UTC (rev 42101)
@@ -96,7 +96,7 @@
 		return;
 	}	
 
-	Sprite sp(f->_data, f->_length, 0, 0, 0);
+	Sprite sp(f->_data, f->_length, 0, 0, true);
 	CursorMan.replaceCursorPalette(_vm->_screen->getPalette(), 0, kNumColours);
 	CursorMan.replaceCursor(sp.getBuffer(), sp.getWidth(), sp.getHeight(), 
 			sp.getWidth() / 2, sp.getHeight() / 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.