[Scummvm-cvs-logs] SF.net SVN: scummvm:[41794] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Tue Jun 23 03:21:51 CEST 2009
Revision: 41794
http://scummvm.svn.sourceforge.net/scummvm/?rev=41794&view=rev
Author: drmccoy
Date: 2009-06-23 01:21:51 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
Added Script::getAnimDataSize()
Modified Paths:
--------------
scummvm/trunk/engines/gob/game_v1.cpp
scummvm/trunk/engines/gob/game_v2.cpp
scummvm/trunk/engines/gob/script.cpp
scummvm/trunk/engines/gob/script.h
Modified: scummvm/trunk/engines/gob/game_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v1.cpp 2009-06-23 01:21:06 UTC (rev 41793)
+++ scummvm/trunk/engines/gob/game_v1.cpp 2009-06-23 01:21:51 UTC (rev 41794)
@@ -160,8 +160,7 @@
loadImFile();
loadExtTable();
- _vm->_global->_inter_animDataSize =
- READ_LE_UINT16(_script->getData() + 0x38);
+ _vm->_global->_inter_animDataSize = _script->getAnimDataSize();
if (!_vm->_inter->_variables)
_vm->_inter->allocateVars(_script->getVariablesCount() & 0xFFFF);
Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp 2009-06-23 01:21:06 UTC (rev 41793)
+++ scummvm/trunk/engines/gob/game_v2.cpp 2009-06-23 01:21:51 UTC (rev 41794)
@@ -195,8 +195,7 @@
loadImFile();
loadExtTable();
- _vm->_global->_inter_animDataSize =
- READ_LE_UINT16(_script->getData() + 0x38);
+ _vm->_global->_inter_animDataSize = _script->getAnimDataSize();
if (!_vm->_inter->_variables)
_vm->_inter->allocateVars(_script->getVariablesCount() & 0xFFFF);
Modified: scummvm/trunk/engines/gob/script.cpp
===================================================================
--- scummvm/trunk/engines/gob/script.cpp 2009-06-23 01:21:06 UTC (rev 41793)
+++ scummvm/trunk/engines/gob/script.cpp 2009-06-23 01:21:51 UTC (rev 41794)
@@ -413,11 +413,13 @@
_variablesCount = READ_LE_UINT32(_totData + 44);
- _textsOffset = READ_LE_UINT32(_totData + 48);
+ _textsOffset = READ_LE_UINT32(_totData + 48);
_resourcesOffset = READ_LE_UINT32(_totData + 52);
- _imFileNumber = _totData[59];
- _exFileNumber = _totData[60];
+ _animDataSize = READ_LE_UINT16(_totData + 56);
+
+ _imFileNumber = _totData[59];
+ _exFileNumber = _totData[60];
_communHandling = _totData[61];
return true;
@@ -516,6 +518,10 @@
return _resourcesOffset;
}
+uint16 Script::getAnimDataSize() const {
+ return _animDataSize;
+}
+
uint8 Script::getImFileNumber() const {
return _imFileNumber;
}
Modified: scummvm/trunk/engines/gob/script.h
===================================================================
--- scummvm/trunk/engines/gob/script.h 2009-06-23 01:21:06 UTC (rev 41793)
+++ scummvm/trunk/engines/gob/script.h 2009-06-23 01:21:51 UTC (rev 41794)
@@ -122,6 +122,7 @@
uint32 getVariablesCount() const;
uint32 getTextsOffset() const;
uint32 getResourcesOffset() const;
+ uint16 getAnimDataSize() const;
uint8 getImFileNumber() const;
uint8 getExFileNumber() const;
uint8 getCommunHandling() const;
@@ -151,6 +152,7 @@
uint32 _variablesCount;
uint32 _textsOffset;
uint32 _resourcesOffset;
+ uint16 _animDataSize;
uint8 _imFileNumber;
uint8 _exFileNumber;
uint8 _communHandling;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list