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

[dkasak13 at users.sourceforge.net]

Revision: 42449
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42449&view=rev
Author:   dkasak13
Date:     2009-07-13 19:24:22 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Renamed Game::_itemStatus to _iconStatus. Added an assert to check if the number of icons is correct.

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

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-13 19:11:24 UTC (rev 42448)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-13 19:24:22 UTC (rev 42449)
@@ -103,11 +103,12 @@
 		_variables[i] = variableData.readUint16LE();
 	}
 
-	// Read in item status
+	// Read in item icon status
 	
 	file = initArchive.getFile(1);
-	_itemStatus = new byte[file->_length];
-	memcpy(_itemStatus, file->_data, file->_length);
+	_iconStatus = new byte[file->_length];
+	memcpy(_iconStatus, file->_data, file->_length);
+	uint numIcons = file->_length;
 	
 	// Read in object status
 	
@@ -130,7 +131,8 @@
 	assert(numDialogs == _info->_numDialogs);
 	assert(numPersons == _info->_numPersons);
 	assert(numVariables == _info->_numVariables);
-	assert(numObjects == _info->_numObjects);	
+	assert(numObjects == _info->_numObjects);
+	assert(numIcons == _info->_numIcons);	
 }
 
 void Game::init() {
@@ -358,7 +360,7 @@
 	delete[] _persons;
 	delete[] _variables;
 	delete[] _dialogOffsets;
-	delete[] _itemStatus;
+	delete[] _iconStatus;
 	delete[] _objects;
 	delete _info;
 }

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-13 19:11:24 UTC (rev 42448)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-13 19:24:22 UTC (rev 42449)
@@ -148,7 +148,7 @@
 	GameInfo *_info;
 	Person *_persons;
 	uint16 *_dialogOffsets;
-	byte *_itemStatus;
+	byte *_iconStatus;
 	GameObject *_objects;
 	Room _currentRoom;	
 };


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