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

[dkasak13 at users.sourceforge.net]

Revision: 42246
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42246&view=rev
Author:   dkasak13
Date:     2009-07-07 21:30:36 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
* Made Game::_variables private and, instead, added Game::{get,set}Variable() methods.
* Removed obsolete comment about the cyclic field not being used in Game::loadAnimation()

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

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-07 21:24:39 UTC (rev 42245)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-07 21:30:36 UTC (rev 42246)
@@ -211,7 +211,9 @@
 	// FIXME: handle these properly
 	animationReader.readByte(); // Memory logic field, not used
 	animationReader.readByte(); // Disable erasing field, not used
-	bool cyclic = animationReader.readByte(); // Cyclic field, not used
+	
+	bool cyclic = animationReader.readByte();
+
 	animationReader.readByte(); // Relative field, not used
 
 	Animation *anim = _vm->_anims->addAnimation(animNum, z, false);
@@ -339,6 +341,14 @@
 	return _currentRoom._roomNum;
 }
 
+int Game::getVariable(int numVar) {
+	return _variables[numVar];
+}
+
+void Game::setVariable(int numVar, int value) {
+	_variables[numVar] = value;
+}
+
 Game::~Game() {
 	delete[] _persons;
 	delete[] _variables;

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-07 21:24:39 UTC (rev 42245)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-07 21:30:36 UTC (rev 42246)
@@ -129,11 +129,12 @@
 
 	GameObject *getObject(uint objNum);
 
-	int *_variables;
+	int getVariable(int varNum);
+	void setVariable(int varNum, int value);	
 
 private:
 	DraciEngine *_vm;
-	
+	int *_variables;
 	GameInfo *_info;
 	Person *_persons;
 	uint16 *_dialogOffsets;

Modified: scummvm/branches/gsoc2009-draci/engines/draci/script.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/script.cpp	2009-07-07 21:24:39 UTC (rev 42245)
+++ scummvm/branches/gsoc2009-draci/engines/draci/script.cpp	2009-07-07 21:30:36 UTC (rev 42246)
@@ -303,10 +303,10 @@
 		case kMathVariable:
 			value = reader.readUint16LE();
 
-			stk.push(_vm->_game->_variables[value-1]);
+			stk.push(_vm->_game->getVariable(value-1));
 
 			debugC(3, kDraciBytecodeDebugLevel, "\t\tvariable: %d (%d)", value,
-				_vm->_game->_variables[value-1]);
+				_vm->_game->getVariable(value-1));
 			break;
 
 		case kMathFunctionCall:


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